Merge branch 'develop' into fix/print-pdf-css
This commit is contained in:
commit
f66e1fd99d
File diff suppressed because one or more lines are too long
|
@ -23,7 +23,9 @@
|
|||
content: 'Collection';
|
||||
}
|
||||
&.tech-document-link:before {
|
||||
content: 'Keywords';
|
||||
//content: 'Keywords';
|
||||
display:inline;
|
||||
width: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
//@include foundation-switch;
|
||||
@include foundation-table;
|
||||
// Basic components
|
||||
@include foundation-badge;
|
||||
//@include foundation-badge;
|
||||
@include foundation-breadcrumbs;
|
||||
@include foundation-callout;
|
||||
@include foundation-card;
|
||||
|
@ -82,6 +82,7 @@
|
|||
|
||||
// global project styles
|
||||
|
||||
@import "global/print-pdf";
|
||||
@import "global/wp-overrides"; //errors
|
||||
@import "global/wp-admin"; //errors
|
||||
@import "global/typography";
|
||||
|
|
|
@ -69,6 +69,25 @@ main {
|
|||
|
||||
|
||||
|
||||
//
|
||||
// .index max-width
|
||||
//--------------
|
||||
.index {
|
||||
.entry-content,.omekas-entry-content {
|
||||
@include breakpoint(small){
|
||||
}
|
||||
@include breakpoint(medium){
|
||||
max-width: unset;
|
||||
}
|
||||
@include breakpoint(xlarge){
|
||||
max-width: unset;
|
||||
}
|
||||
@include breakpoint(xxlarge){
|
||||
max-width: 60 rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
// .contain selector for max-width
|
||||
|
@ -177,9 +196,11 @@ main {
|
|||
@include flex-align(center,top);
|
||||
}
|
||||
header {
|
||||
margin-top: 2*$global-margin;
|
||||
border-top: 1px solid $body-font-color;
|
||||
padding: $global-padding*2 0;
|
||||
display: none;
|
||||
|
||||
// margin-top: 2*$global-margin;
|
||||
// border-top: 1px solid $body-font-color;
|
||||
// padding: $global-padding*2 0;
|
||||
}
|
||||
main {
|
||||
@include xy-grid;
|
||||
|
|
|
@ -17,14 +17,6 @@
|
|||
</main>
|
||||
<nav>
|
||||
<menu class="">
|
||||
<ul>
|
||||
<li>
|
||||
Este menu no lo genera Omeka.
|
||||
</li>
|
||||
<li>
|
||||
Creo que emula el menu del wordpress.
|
||||
</li>
|
||||
</ul>
|
||||
<?php /*
|
||||
echo $site->publicNav()
|
||||
->menu()
|
||||
|
|
Loading…
Reference in New Issue