Skip to content
Snippets Groups Projects
Unverified Commit ddedb8a6 authored by Michael Lee's avatar Michael Lee Committed by GitHub
Browse files

Merge pull request #489 from ASCWebServices/canini-3 

style updates
parents 659ccce9 0f02f84f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 37 deletions
web/themes/asc_bootstrap/assets/sass/components/_events.scss
+ 5
− 2
View file @ ddedb8a6
......@@ -18,11 +18,15 @@
}
.news-row {
display: flex;
flex: 1;
color: $gray-6;
max-width: 30%;
@media (max-width: 768px) {
display: block;
max-width: 100%;
flex: none;
}
.inner-news-grid {
......@@ -30,7 +34,6 @@
height: 100%;
@media (max-width: 768px) {
flex: none;
margin-bottom: 20px
}
}
......
web/themes/asc_bootstrap/assets/sass/components/_news.scss
+ 3
− 0
View file @ ddedb8a6
......@@ -27,9 +27,12 @@
padding-right: 0;
margin-left: 15px;
margin-right: 15px;
max-width: 30%;
@media (max-width: 768px) {
display: block;
max-width: 100%;
flex: none;
}
.inner-news-grid {
......
web/themes/asc_bootstrap/assets/sass/components/_newsletter.scss
+ 16
− 16
View file @ ddedb8a6
......@@ -65,27 +65,27 @@
margin-bottom: 40px;
@media (max-width: 768px) {
display: block;
display: block;
}
}
.news-row {
display: flex;
flex: 1;
color: $gray-6;
max-width: 30%;
@media (max-width: 768px) {
display: block;
display: block;
max-width: 100%;
flex: none;
}
.inner-news-grid {
border: #979797 solid 1px;
flex: 1;
background: $white;
@media (max-width: 768px) {
flex: none;
margin-bottom: 20px;
}
margin-bottom: 20px;
}
}
.views-field-title {
......@@ -158,27 +158,27 @@
margin-bottom: 40px;
@media (max-width: 768px) {
display: block;
display: block;
}
}
.news-row {
display: flex;
flex: 1;
color: $gray-6;
max-width: 30%;
@media (max-width: 768px) {
display: block;
display: block;
max-width: 100%;
flex: none;
}
.inner-news-grid {
border: #979797 solid 1px;
flex: 1;
background: $white;
@media (max-width: 768px) {
flex: none;
margin-bottom: 20px;
}
margin-bottom: 20px;
}
}
.views-field-title {
......
web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+ 8
− 0
View file @ ddedb8a6
......@@ -117,6 +117,14 @@
margin-bottom: 20px;
}
}
.sec-title {
margin-top: 20px;
@media (max-width: 768px) {
padding: 0 20px;
}
}
}
......
web/themes/asc_bootstrap/css/style.css
+ 28
− 18
View file @ ddedb8a6
......@@ -7262,17 +7262,19 @@ figcaption {
.view-events .row {
display: block; } }
.view-events .news-row {
display: flex;
color: #666666; }
flex: 1;
color: #666666;
max-width: 30%; }
@media (max-width: 768px) {
.view-events .news-row {
display: block; } }
display: block;
max-width: 100%;
flex: none; } }
.view-events .news-row .inner-news-grid {
overflow: hidden;
height: 100%; }
@media (max-width: 768px) {
.view-events .news-row .inner-news-grid {
flex: none;
margin-bottom: 20px; } }
.view-events .news-row .views-field-field-evt-date-range {
padding: 10px;
......@@ -8329,10 +8331,13 @@ article .field--name-body {
padding-left: 0;
padding-right: 0;
margin-left: 15px;
margin-right: 15px; }
margin-right: 15px;
max-width: 30%; }
@media (max-width: 768px) {
.news-row {
display: block; } }
display: block;
max-width: 100%;
flex: none; } }
.news-row .inner-news-grid {
overflow: hidden; }
@media (max-width: 768px) {
......@@ -8431,18 +8436,18 @@ article.news-story {
.block-views-blocknewsletter-directory-block-1 .row {
display: block; } }
.block-views-blocknewsletter-directory-block-1 .news-row {
display: flex;
color: #666666; }
flex: 1;
color: #666666;
max-width: 30%; }
@media (max-width: 768px) {
.block-views-blocknewsletter-directory-block-1 .news-row {
display: block; } }
display: block;
max-width: 100%;
flex: none; } }
.block-views-blocknewsletter-directory-block-1 .news-row .inner-news-grid {
border: #979797 solid 1px;
flex: 1;
background: #ffffff; }
@media (max-width: 768px) {
.block-views-blocknewsletter-directory-block-1 .news-row .inner-news-grid {
flex: none;
margin-bottom: 20px; } }
.block-views-blocknewsletter-directory-block-1 .news-row .views-field-title {
padding: 15px 10px;
......@@ -8485,18 +8490,18 @@ article.news-story {
.block-views-blocknewsletter-article-directory-block-1 .row {
display: block; } }
.block-views-blocknewsletter-article-directory-block-1 .news-row {
display: flex;
color: #666666; }
flex: 1;
color: #666666;
max-width: 30%; }
@media (max-width: 768px) {
.block-views-blocknewsletter-article-directory-block-1 .news-row {
display: block; } }
display: block;
max-width: 100%;
flex: none; } }
.block-views-blocknewsletter-article-directory-block-1 .news-row .inner-news-grid {
border: #979797 solid 1px;
flex: 1;
background: #ffffff; }
@media (max-width: 768px) {
.block-views-blocknewsletter-article-directory-block-1 .news-row .inner-news-grid {
flex: none;
margin-bottom: 20px; } }
.block-views-blocknewsletter-article-directory-block-1 .news-row .views-field-title {
padding: 15px 10px 10px;
......@@ -8616,6 +8621,11 @@ article.news-story {
@media (max-width: 768px) {
.paragraph__column .col-xs-12 {
margin-bottom: 20px; } }
.paragraph__column .sec-title {
margin-top: 20px; }
@media (max-width: 768px) {
.paragraph__column .sec-title {
padding: 0 20px; } }
.paragraph--type--accordion .field {
padding: 20px; }
......
web/themes/asc_bootstrap/css/style.css.map
+ 1
− 1
View file @ ddedb8a6
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment