From 81c45b91b4ca2a9a97323b17e0885d8e54218c48 Mon Sep 17 00:00:00 2001 From: Canini <canini.16@tso-nc201335.bcd.it.osu.edu> Date: Thu, 30 May 2019 15:20:46 -0400 Subject: [PATCH] asc_bootstrap - newsletter styles, fixing zindex bug on sidebar menu --- .../assets/sass/components/_newsletter.scss | 109 +++++++++++++ .../assets/sass/components/_sidebar-menu.scss | 4 + .../asc_bootstrap/assets/sass/style.scss | 1 + web/themes/asc_bootstrap/css/style.css | 144 ++++++++++++++---- 4 files changed, 231 insertions(+), 27 deletions(-) create mode 100644 web/themes/asc_bootstrap/assets/sass/components/_newsletter.scss diff --git a/web/themes/asc_bootstrap/assets/sass/components/_newsletter.scss b/web/themes/asc_bootstrap/assets/sass/components/_newsletter.scss new file mode 100644 index 0000000000..99cc1a5e8d --- /dev/null +++ b/web/themes/asc_bootstrap/assets/sass/components/_newsletter.scss @@ -0,0 +1,109 @@ +@import "../helpers/mixins"; +@import "../helpers/variables"; +@import "../helpers/functions"; +// +// News +// -------------------------------------------------- + +//## News grid. + +.view-newsletter-block { + .row { + display: flex; + margin-bottom: 40px; + + @media (max-width: 768px) { + display: block; + } + } +} + +.news-row { + display: flex; + color: $gray-6; + + @media (max-width: 768px) { + display: block; + } + + .inner-news-grid { + border: #979797 solid 1px; + flex: 1; + background: $white; + + @media (max-width: 768px) { + flex: none; + margin-bottom: 20px; + } + } + + .views-field-created { + padding: 10px 10px 0; + text-transform: uppercase; + font-weight: 700; + font-size: $font-size-h6; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + } + + .views-field-title { + padding: 0 10px; + + a { + color: $gray-6; + } + } + + .views-field-body { + padding: 0 10px 40px; + font-weight: 300; + } +} + + +// -------------------------------------------------- + +//## Newsletter Landing Page. + +.newsletter-landing-page { + + nav { + display: none; + } +} + + +// -------------------------------------------------- + +//## Newsletter. + +.newsletter { + + nav { + display: none; + } +} + + +// -------------------------------------------------- + +//## Book Page. + +.book { + + nav { + display: none; + } +} + + +.view-newsletter-articles-block { + .row { + display: flex; + margin-bottom: 40px; + + @media (max-width: 768px) { + display: block; + } + } +} diff --git a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss index 10710e00b6..2f1e04b378 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss @@ -4,6 +4,10 @@ #block-mainnavigation-2 { + .dropdown-menu { + z-index: 20; + } + .navbar-nav { li { diff --git a/web/themes/asc_bootstrap/assets/sass/style.scss b/web/themes/asc_bootstrap/assets/sass/style.scss index 18b8097d30..2e1b07e25c 100644 --- a/web/themes/asc_bootstrap/assets/sass/style.scss +++ b/web/themes/asc_bootstrap/assets/sass/style.scss @@ -72,6 +72,7 @@ @import "components/filters"; @import "components/menu"; @import "components/news"; +@import "components/newsletter"; @import "components/paragraphs"; @import "components/people"; @import "components/people-styles"; diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 30cf99a6e3..7e1558363b 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -10864,6 +10864,92 @@ article.news-story { font-size: 18px; } +/* line 11, ../assets/sass/components/_newsletter.scss */ +.view-newsletter-block .row { + display: flex; + margin-bottom: 40px; +} +@media (max-width: 768px) { + /* line 11, ../assets/sass/components/_newsletter.scss */ + .view-newsletter-block .row { + display: block; + } +} + +/* line 21, ../assets/sass/components/_newsletter.scss */ +.news-row { + display: flex; + color: #666666; +} +@media (max-width: 768px) { + /* line 21, ../assets/sass/components/_newsletter.scss */ + .news-row { + display: block; + } +} +/* line 29, ../assets/sass/components/_newsletter.scss */ +.news-row .inner-news-grid { + border: #979797 solid 1px; + flex: 1; + background: #ffffff; +} +@media (max-width: 768px) { + /* line 29, ../assets/sass/components/_newsletter.scss */ + .news-row .inner-news-grid { + flex: none; + margin-bottom: 20px; + } +} +/* line 40, ../assets/sass/components/_newsletter.scss */ +.news-row .views-field-created { + padding: 10px 10px 0; + text-transform: uppercase; + font-weight: 700; + font-size: 14px; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +/* line 49, ../assets/sass/components/_newsletter.scss */ +.news-row .views-field-title { + padding: 0 10px; +} +/* line 52, ../assets/sass/components/_newsletter.scss */ +.news-row .views-field-title a { + color: #666666; +} +/* line 57, ../assets/sass/components/_newsletter.scss */ +.news-row .views-field-body { + padding: 0 10px 40px; + font-weight: 300; +} + +/* line 70, ../assets/sass/components/_newsletter.scss */ +.newsletter-landing-page nav { + display: none; +} + +/* line 82, ../assets/sass/components/_newsletter.scss */ +.newsletter nav { + display: none; +} + +/* line 94, ../assets/sass/components/_newsletter.scss */ +.book nav { + display: none; +} + +/* line 101, ../assets/sass/components/_newsletter.scss */ +.view-newsletter-articles-block .row { + display: flex; + margin-bottom: 40px; +} +@media (max-width: 768px) { + /* line 101, ../assets/sass/components/_newsletter.scss */ + .view-newsletter-articles-block .row { + display: block; + } +} + /* line 10, ../assets/sass/components/_paragraphs.scss */ .paragraph--type--columns-1 { width: 90%; @@ -11782,24 +11868,28 @@ body { display: flex; } -/* line 9, ../assets/sass/components/_sidebar-menu.scss */ +/* line 7, ../assets/sass/components/_sidebar-menu.scss */ +#block-mainnavigation-2 .dropdown-menu { + z-index: 20; +} +/* line 13, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li { border-top: 1px #979797 dotted; line-height: 1.15; } -/* line 13, ../assets/sass/components/_sidebar-menu.scss */ +/* line 17, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li .link-wrapper { padding: 8px 0; } -/* line 17, ../assets/sass/components/_sidebar-menu.scss */ +/* line 21, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li .active-link { padding-left: 5px; } -/* line 21, ../assets/sass/components/_sidebar-menu.scss */ +/* line 25, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav li a { display: inline; } -/* line 27, ../assets/sass/components/_sidebar-menu.scss */ +/* line 31, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul { display: none; position: inherit; @@ -11809,95 +11899,95 @@ body { padding: 0; list-style-type: none; } -/* line 38, ../assets/sass/components/_sidebar-menu.scss */ +/* line 42, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li .link-wrapper { padding-left: 17px; } -/* line 42, ../assets/sass/components/_sidebar-menu.scss */ +/* line 46, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li a { color: #000000; } -/* line 46, ../assets/sass/components/_sidebar-menu.scss */ +/* line 50, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li i { padding: 0 10px; } -/* line 52, ../assets/sass/components/_sidebar-menu.scss */ +/* line 56, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li li .link-wrapper { padding-left: 27px; } -/* line 58, ../assets/sass/components/_sidebar-menu.scss */ +/* line 62, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li li li .link-wrapper { padding-left: 37px; } -/* line 64, ../assets/sass/components/_sidebar-menu.scss */ +/* line 68, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li li li li .link-wrapper { padding-left: 47px; } -/* line 70, ../assets/sass/components/_sidebar-menu.scss */ +/* line 74, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li li li li li .link-wrapper { padding-left: 57px; } -/* line 76, ../assets/sass/components/_sidebar-menu.scss */ +/* line 80, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav ul li li li li li li .link-wrapper { padding-left: 67px; } -/* line 88, ../assets/sass/components/_sidebar-menu.scss */ +/* line 92, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav .active-trail ul { display: inherit; } -/* line 93, ../assets/sass/components/_sidebar-menu.scss */ +/* line 97, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav .active-link-li ul { display: block; } -/* line 96, ../assets/sass/components/_sidebar-menu.scss */ +/* line 100, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav .active-link-li ul ul { display: none; } -/* line 102, ../assets/sass/components/_sidebar-menu.scss */ +/* line 106, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav i { float: right; padding: 2px 10px; cursor: pointer; } -/* line 108, ../assets/sass/components/_sidebar-menu.scss */ +/* line 112, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .navbar-nav:nth-last-child(1) { border-bottom: 1px #979797 dotted; border-top: none; } -/* line 115, ../assets/sass/components/_sidebar-menu.scss */ +/* line 119, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .nav > li > a:hover, #block-mainnavigation-2 .nav > li > a:focus { background-color: transparent; } -/* line 121, ../assets/sass/components/_sidebar-menu.scss */ +/* line 125, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .sidebar-nav .active-link { background-color: #ffffff; border-left: solid #D0021B 3px; padding-left: 5px; margin-left: -8px; } -/* line 129, ../assets/sass/components/_sidebar-menu.scss */ +/* line 133, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .sidebar-nav ul .active-link { margin-left: -5px; } -/* line 134, ../assets/sass/components/_sidebar-menu.scss */ +/* line 138, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .sidebar-nav ul ul .active-link { margin-left: -2px; } -/* line 139, ../assets/sass/components/_sidebar-menu.scss */ +/* line 143, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .sidebar-nav ul ul ul .active-link { margin-left: 0; } -/* line 149, ../assets/sass/components/_sidebar-menu.scss */ +/* line 153, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 .link-wrapper:hover { background-color: #ffffff; } -/* line 154, ../assets/sass/components/_sidebar-menu.scss */ +/* line 158, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 h2.active-link { background-color: transparent; border-left: none; padding-left: 0; } -/* line 162, ../assets/sass/components/_sidebar-menu.scss */ +/* line 166, ../assets/sass/components/_sidebar-menu.scss */ #block-mainnavigation-2 h2 a { color: #000000; } @@ -11909,7 +11999,7 @@ body { } @media (max-width: 768px) { - /* line 173, ../assets/sass/components/_sidebar-menu.scss */ + /* line 177, ../assets/sass/components/_sidebar-menu.scss */ .region-sidebar-menu { display: none; } -- GitLab