Compare commits

..

No commits in common. "5c05c0f1e370010fc8935405b61a0f0fdec52296" and "64ced756d85cb32c66e8ebab464b7b6b8f471f86" have entirely different histories.

9 changed files with 117 additions and 230 deletions

File diff suppressed because one or more lines are too long

View File

@ -63,15 +63,13 @@ button,.button {
border-color: $anchor-color; border-color: $anchor-color;
} }
} }
} &.hero-middle,&.hero-last,&.hero-announcement{
.hero-middle,.hero-last,.hero-announcement{
:not(.search-form),:not(.search){ :not(.search-form),:not(.search){
button,.button { button,.button {
font-size: $global-font-size; font-size: $global-font-size;
border-color: $white; border-color: $white;
padding: $global-padding $global-padding*2; padding: $global-padding $global-padding*2;
min-width: unset; min-width: unset;
color:$white;
&:hover{ &:hover{
color: scale-color($anchor-color, $lightness: 90%); color: scale-color($anchor-color, $lightness: 90%);
background-color: scale-color($white, $alpha: -60%); background-color: scale-color($white, $alpha: -60%);
@ -79,6 +77,7 @@ button,.button {
} }
} }
} }
}
.search { .search {
.button { .button {

View File

@ -304,7 +304,6 @@ main {
} }
&.widget_media_image { &.widget_media_image {
overflow: hidden; overflow: hidden;
// max-height: 40vh;
img { img {
width:100%; width:100%;
} }
@ -314,6 +313,7 @@ main {
&.widget_text p{ &.widget_text p{
max-width: 50rem; max-width: 50rem;
margin:auto; margin:auto;
padding: $global-padding * 2;
} }
} }
@include breakpoint(large){ @include breakpoint(large){
@ -321,11 +321,13 @@ main {
padding: 0; padding: 0;
margin: 0; margin: 0;
overflow:hidden; overflow:hidden;
// button,.button {
// @include flex;
// @include flex-align (center,middle);
// }
&.widget_text p{ &.widget_text p{
font-size: $global-font-size*1.2; font-size: $global-font-size*1.2;
} padding: $global-padding * 2;
&.widget_media_image {
// max-height: unset;
} }
} }
@include breakpoint(xlarge){ @include breakpoint(xlarge){
@ -357,11 +359,11 @@ main {
} }
} }
} }
// &.secondary { &.secondary {
// .slide,.slide:nth-child(odd) { .slide,.slide:nth-child(odd) {
// background-color: $white; background-color: $white;
// } }
// } }
&.announcement { &.announcement {
.slide { .slide {
width: 100%; width: 100%;
@ -383,13 +385,13 @@ main {
overflow: visible; overflow: visible;
} }
} }
// &.top.secondary { &.top.secondary {
// align-content: center; align-content: center;
// justify-content: center; justify-content: center;
// ul { ul {
// margin: 2rem 0; margin: 2rem 0;
// } }
// } }
} }
aside { aside {
@include xy-grid(); @include xy-grid();
@ -417,74 +419,43 @@ main {
} }
} }
} }
&.hero-main {
aside {
background-color: $secondary-color;
.slides {
.slide {
&:nth-child(odd) {
background-color: $secondary-color;
}
}
}
}
}
&.hero-middle{
.slides {
background-color: $forest-green;
* {
color: $white;
}
}
}
&.hero-last{
.slides {
background-color: $raspberry-purple;
* {
color: $white;
}
}
}
&.hero-announcement {
}
//hero secondary //hero secondary
// &.secondary { &.secondary {
// border-top: none; border-top: none;
// background-color: $secondary-color;
// .slide{
// figure {
// background-color: unset;
// }
// }
// }
}
.hero-main {
.slide {
@include breakpoint(medium){
&.widget_media_image {
max-height: 35vh;
}
}
@include breakpoint(large){
&.widget_media_image {
max-height: unset;
}
}
}
aside {
background-color: $secondary-color; background-color: $secondary-color;
.slides { .slide{
// &.top.secondary { figure {
align-content: center; background-color: unset;
justify-content: center;
ul {
margin: 2rem 0;
}
// }
// background-color: $secondary-color;
.slide {
&:nth-child(odd) {
background-color: $secondary-color;
}
}
}
}
}
.hero-middle{
.slides {
background-color: $forest-green;
* {
color: $white;
}
}
}
.hero-last{
.slides {
background-color: $raspberry-purple;
* {
color: $white;
}
}
}
.hero-announcement {
&.resources{
.slides {
&.announcement.middle {
margin-top: 0;
// .widget_nav_menu,.widget_tag_cloud {
// width: auto;
// overflow: visible;
// }
} }
} }
} }

View File

@ -53,45 +53,20 @@
} }
} }
} }
@include breakpoint(medium) { @include breakpoint(large) {
@include xy-cell(auto); @include xy-cell(auto);
@include flex; @include flex;
// @include flex-align(right, middle); @include flex-align(right, middle);
padding-bottom: 0;//$global-padding; padding-bottom: 0;//$global-padding;
menu { menu {
margin: inherit; margin: inherit;
padding: inherit; padding: inherit;
// padding-bottom:0;
.menu { .menu {
&.dropdown { &.dropdown {
justify-content: end; justify-content: end;
li,.button {
font-size: $global-font-size*1.1;//$header-menu-font-size;
}
.button {
margin-left: $global-margin/2;
}
}
}
}
}
@include breakpoint(xlarge) {
// @include xy-cell(auto);
// @include flex;
@include flex-align(right, middle);
padding-bottom: 0;//$global-padding;
menu {
// margin: inherit;
// padding: inherit;
.menu {
&.dropdown {
// justify-content: end;
li,.button { li,.button {
font-size: $global-font-size*1.4;//$header-menu-font-size; font-size: $global-font-size*1.4;//$header-menu-font-size;
} }
.button {
margin-left: $global-margin;
}
} }
} }
} }

View File

@ -63,15 +63,13 @@ button,.button {
border-color: $anchor-color; border-color: $anchor-color;
} }
} }
} &.hero-middle,&.hero-last,&.hero-announcement{
.hero-middle,.hero-last,.hero-announcement{
:not(.search-form),:not(.search){ :not(.search-form),:not(.search){
button,.button { button,.button {
font-size: $global-font-size; font-size: $global-font-size;
border-color: $white; border-color: $white;
padding: $global-padding $global-padding*2; padding: $global-padding $global-padding*2;
min-width: unset; min-width: unset;
color:$white;
&:hover{ &:hover{
color: scale-color($anchor-color, $lightness: 90%); color: scale-color($anchor-color, $lightness: 90%);
background-color: scale-color($white, $alpha: -60%); background-color: scale-color($white, $alpha: -60%);
@ -79,6 +77,7 @@ button,.button {
} }
} }
} }
}
.search { .search {
.button { .button {

View File

@ -304,7 +304,6 @@ main {
} }
&.widget_media_image { &.widget_media_image {
overflow: hidden; overflow: hidden;
// max-height: 40vh;
img { img {
width:100%; width:100%;
} }
@ -314,6 +313,7 @@ main {
&.widget_text p{ &.widget_text p{
max-width: 50rem; max-width: 50rem;
margin:auto; margin:auto;
padding: $global-padding * 2;
} }
} }
@include breakpoint(large){ @include breakpoint(large){
@ -321,11 +321,13 @@ main {
padding: 0; padding: 0;
margin: 0; margin: 0;
overflow:hidden; overflow:hidden;
// button,.button {
// @include flex;
// @include flex-align (center,middle);
// }
&.widget_text p{ &.widget_text p{
font-size: $global-font-size*1.2; font-size: $global-font-size*1.2;
} padding: $global-padding * 2;
&.widget_media_image {
// max-height: unset;
} }
} }
@include breakpoint(xlarge){ @include breakpoint(xlarge){
@ -357,11 +359,11 @@ main {
} }
} }
} }
// &.secondary { &.secondary {
// .slide,.slide:nth-child(odd) { .slide,.slide:nth-child(odd) {
// background-color: $white; background-color: $white;
// } }
// } }
&.announcement { &.announcement {
.slide { .slide {
width: 100%; width: 100%;
@ -383,13 +385,13 @@ main {
overflow: visible; overflow: visible;
} }
} }
// &.top.secondary { &.top.secondary {
// align-content: center; align-content: center;
// justify-content: center; justify-content: center;
// ul { ul {
// margin: 2rem 0; margin: 2rem 0;
// } }
// } }
} }
aside { aside {
@include xy-grid(); @include xy-grid();
@ -417,74 +419,43 @@ main {
} }
} }
} }
&.hero-main {
aside {
background-color: $secondary-color;
.slides {
.slide {
&:nth-child(odd) {
background-color: $secondary-color;
}
}
}
}
}
&.hero-middle{
.slides {
background-color: $forest-green;
* {
color: $white;
}
}
}
&.hero-last{
.slides {
background-color: $raspberry-purple;
* {
color: $white;
}
}
}
&.hero-announcement {
}
//hero secondary //hero secondary
// &.secondary { &.secondary {
// border-top: none; border-top: none;
// background-color: $secondary-color;
// .slide{
// figure {
// background-color: unset;
// }
// }
// }
}
.hero-main {
.slide {
@include breakpoint(medium){
&.widget_media_image {
max-height: 35vh;
}
}
@include breakpoint(large){
&.widget_media_image {
max-height: unset;
}
}
}
aside {
background-color: $secondary-color; background-color: $secondary-color;
.slides { .slide{
// &.top.secondary { figure {
align-content: center; background-color: unset;
justify-content: center;
ul {
margin: 2rem 0;
}
// }
// background-color: $secondary-color;
.slide {
&:nth-child(odd) {
background-color: $secondary-color;
}
}
}
}
}
.hero-middle{
.slides {
background-color: $forest-green;
* {
color: $white;
}
}
}
.hero-last{
.slides {
background-color: $raspberry-purple;
* {
color: $white;
}
}
}
.hero-announcement {
&.resources{
.slides {
&.announcement.middle {
margin-top: 0;
// .widget_nav_menu,.widget_tag_cloud {
// width: auto;
// overflow: visible;
// }
} }
} }
} }

View File

@ -53,45 +53,20 @@
} }
} }
} }
@include breakpoint(medium) { @include breakpoint(large) {
@include xy-cell(auto); @include xy-cell(auto);
@include flex; @include flex;
// @include flex-align(right, middle); @include flex-align(right, middle);
padding-bottom: 0;//$global-padding; padding-bottom: 0;//$global-padding;
menu { menu {
margin: inherit; margin: inherit;
padding: inherit; padding: inherit;
// padding-bottom:0;
.menu { .menu {
&.dropdown { &.dropdown {
justify-content: end; justify-content: end;
li,.button {
font-size: $global-font-size*1.1;//$header-menu-font-size;
}
.button {
margin-left: $global-margin/2;
}
}
}
}
}
@include breakpoint(xlarge) {
// @include xy-cell(auto);
// @include flex;
@include flex-align(right, middle);
padding-bottom: 0;//$global-padding;
menu {
// margin: inherit;
// padding: inherit;
.menu {
&.dropdown {
// justify-content: end;
li,.button { li,.button {
font-size: $global-font-size*1.4;//$header-menu-font-size; font-size: $global-font-size*1.4;//$header-menu-font-size;
} }
.button {
margin-left: $global-margin;
}
} }
} }
} }

View File

@ -10,7 +10,8 @@
<section class="hero hero-announcement resources"> <section class="hero hero-announcement resources">
<?php dynamic_sidebar( 'announcement-resources-top-widgets' ); ?> <?php dynamic_sidebar( 'announcement-resources-top-widgets' ); ?>
<aside> <aside>
<?php //dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?> <?php dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?>
<?php //insert menu here; ?> <?php //insert menu here; ?>
<?php //foundationpress_announcement_bar(); ?>
</aside> </aside>
</section> </section>

View File

@ -18,7 +18,6 @@
$paged = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1; $paged = ( get_query_var( 'paged' ) ) ? get_query_var( 'paged' ) : 1;
?> ?>
<section class="archive-posts resources"> <section class="archive-posts resources">
<header> <header>
<h2> <h2>
@ -29,9 +28,6 @@
?> ?>
</h2> </h2>
</header> </header>
<aside class="hero hero-announcement resources">
<?php dynamic_sidebar( 'announcement-resources-middle-widgets' ); ?>
</aside>
<main class=""> <main class="">
<?php $the_query = new WP_Query( array( 'post_type' => get_post_type( get_the_ID() ), 'posts_per_page' => '10' , 'paged' => $paged ) ); ?> <?php $the_query = new WP_Query( array( 'post_type' => get_post_type( get_the_ID() ), 'posts_per_page' => '10' , 'paged' => $paged ) ); ?>
<?php if ( $the_query->have_posts() ) : ?> <?php if ( $the_query->have_posts() ) : ?>