update main branch #47

Merged
jorge merged 166 commits from develop into main 2021-12-01 11:20:13 +01:00
2 changed files with 309 additions and 305 deletions
Showing only changes of commit 89bff62c56 - Show all commits

File diff suppressed because one or more lines are too long

View File

@ -1,22 +1,21 @@
//content {
// general styles // general styles
//---------------- //----------------
// //
// mods on fonts and typography // mods on fonts and typography
// not in foundation variables // not in foundation variables
// ----------------------------- // -----------------------------
h1,h2,h3,h4,h5,h6, h1,h2,h3,h4,h5,h6,
.h1,.h2,.h3,.h4,.h5,.h6, .h1,.h2,.h3,.h4,.h5,.h6,
button,.button, button,.button,
header nav { header nav {
font-variant:all-small-caps; font-variant:all-small-caps;
a { a {
color: $body-font-color; color: $body-font-color;
} }
} }
.excerpt,.post-excerpt{ .excerpt,.post-excerpt{
a { a {
color: $body-font-color; color: $body-font-color;
&:hover { &:hover {
@ -25,14 +24,14 @@
} }
} }
} }
} }
// //
// main block // main block
//-------------- //--------------
main { main {
article { article {
@include xy-grid; @include xy-grid;
header { header {
@ -63,14 +62,14 @@
} }
} }
} }
} }
// //
// news category // news category
//-------------- //--------------
.news,.news-category { .news,.news-category {
@include xy-grid; @include xy-grid;
header,main,aside { header,main,aside {
@include breakpoint(small){ @include breakpoint(small){
@ -139,15 +138,15 @@
} }
} }
} }
// end news category // end news category
// //
// collections category // collections category
//-------------- //--------------
.collections-list { .collections-list {
@include xy-grid; @include xy-grid;
header,main{ header,main{
@include xy-cell(12); @include xy-cell(12);
@ -189,12 +188,12 @@
@include xy-cell(6); @include xy-cell(6);
} }
} }
} }
// end collections category // end collections category
// partners // partners
// for big announcemnts // for big announcemnts
//--------------------- //---------------------
.partners { .partners {
.entry-content { .entry-content {
@ -221,15 +220,15 @@
margin: 0; margin: 0;
} }
} }
} }
// //
// hero // hero
// for big announcemnts // for big announcemnts
//--------------------- //---------------------
.hero { .hero {
border-top: 2px solid $primary-color; border-top: 2px solid $primary-color;
.slides { .slides {
@include xy-grid(); @include xy-grid();
@ -354,8 +353,13 @@
} }
} }
} }
} }
//end hero //end hero
//} // omeka specific styles
// end content #user-bar {
width: 100%;
}
//end omeka specific styles