From b8a03ebf05a0304f665bfa779736522b46eb2630 Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Thu, 6 Sep 2018 14:19:09 -0400
Subject: [PATCH] asc_bootstrap - adding function to .theme for creating var of
content type that can be used by paragraph temps, updating mobile menu
styles, updating paragraph temps that are used for landing pages so they're
positioned appropriately on both land and basic pages
---
web/themes/asc_bootstrap/asc_bootstrap.theme | 25 ++
.../assets/sass/components/_menu.scss | 111 +++---
.../assets/sass/components/_paragraphs.scss | 28 ++
.../assets/sass/layout/_default.scss | 2 +-
.../assets/sass/pages/_landing-page.scss | 1 -
web/themes/asc_bootstrap/css/style.css | 362 +++++++++---------
web/themes/asc_bootstrap/js/scripts.js | 12 +-
.../paragraph--call-out-boxes-three.html.twig | 4 +-
.../paragraph--call-out-boxes-two.html.twig | 4 +-
.../paragraph/paragraph--column_one.html.twig | 6 +
.../paragraph--columns_three.html.twig | 8 +
.../paragraph--columns_two.html.twig | 7 +
12 files changed, 332 insertions(+), 238 deletions(-)
diff --git a/web/themes/asc_bootstrap/asc_bootstrap.theme b/web/themes/asc_bootstrap/asc_bootstrap.theme
index d201b66d32..91bca01e69 100755
--- a/web/themes/asc_bootstrap/asc_bootstrap.theme
+++ b/web/themes/asc_bootstrap/asc_bootstrap.theme
@@ -36,3 +36,28 @@ function asc_bootstrap_theme_suggestions_page_alter(array &$suggestions, array $
$suggestions[] = 'page__'.$content_type;
}
}
+
+/*function asc_bootstrap_preprocess_node(&$variables) {
+ switch ($variables['node']->getType()) {
+ case "landing_page":
+ $variables['is_landing_page'] = TRUE;
+ break;
+ }
+
+ if (isset($variables['node']) && $variables['node'] instanceof NodeInterface) {
+ $node = $variables['node'];
+ $title = $node->getTitle();
+ $type = $node->getType();
+ // more code...
+ }
+
+ dump($variables);
+}*/
+
+/*
+* adds content type to variable to be used in paragraph twig files
+*/
+function asc_bootstrap_preprocess_paragraph(&$variables) {
+ $node = \Drupal::request()->attributes->get('node');
+ $variables['page_content_type'] = $node->getType();
+}
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_menu.scss b/web/themes/asc_bootstrap/assets/sass/components/_menu.scss
index 81de62631b..cab69b8739 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_menu.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_menu.scss
@@ -129,6 +129,60 @@
}
}
+.search-box{
+ background: #E8E8E4;
+ position: absolute;
+ top: 54px;
+ right: 28.7%;
+ width: 350px;
+ height: 60px;
+ line-height: 60px;
+ box-shadow: 0 0 10px rgba(0,0,0,0.5);
+ border-top:4px solid #D80B15;
+ display: none;
+
+ &:before{
+ content: "";
+ position: absolute;
+ top: -32px;
+ right: 13px;
+ border-left: 12px solid transparent;
+ border-right: 12px solid transparent;
+ border-top: 14px solid transparent;
+ border-bottom: 14px solid #D80B15;
+ }
+
+ input[type="text"]{
+ width: 200px;
+ padding: 5px 10px;
+ margin-left: 23px;
+ border: 1px solid #D80B15;
+ outline: none;
+ }
+
+ input[type="button"]{
+ width: 80px;
+ padding: 5px 0;
+ background: #D80B15;
+ color: #fff;
+ margin-left: -6px;
+ border: 1px solid #D80B15;
+ outline: none;
+ cursor: $point;
+ }
+}
+
+#superfish-main {
+ width: 100%;
+}
+
+
+
+// --------------------------------------------------
+
+//## Mobile styles.
+
+
@media (max-width: 768px) {
#main-nav .container {
padding-left: 0;
@@ -213,7 +267,8 @@
.sf-accordion-button {
padding: 5px 15px 0;
- background: transparent !important;
+ border-left: solid 1px #979797 !important;
+ background: $menu-gray !important;
svg, i {
font-size: 18px;
@@ -227,57 +282,3 @@
}
}
-
-.search-box{
- background: #E8E8E4;
- position: absolute;
- top: 54px;
- right: 28.7%;
- width: 350px;
- height: 60px;
- line-height: 60px;
- box-shadow: 0 0 10px rgba(0,0,0,0.5);
- border-top:4px solid #D80B15;
- display: none;
-}
-
-.search-box:before{
- content: "";
- position: absolute;
- top: -32px;
- right: 13px;
- border-left: 12px solid transparent;
- border-right: 12px solid transparent;
- border-top: 14px solid transparent;
- border-bottom: 14px solid #D80B15;
-}
-
-.search-box input[type="text"]{
- width: 200px;
- padding: 5px 10px;
- margin-left: 23px;
- border: 1px solid #D80B15;
- outline: none;
-}
-
-.search-box input[type="button"]{
- width: 80px;
- padding: 5px 0;
- background: #D80B15;
- color: #fff;
- margin-left: -6px;
- border: 1px solid #D80B15;
- outline: none;
- cursor: $point;
-}
-
-
-#superfish-main {
- width: 100%;
-}
-
-
-#superfish-main {
- width: 100%;
-}
-
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss b/web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
index db93e13ec1..3911f41b77 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_paragraphs.scss
@@ -135,6 +135,10 @@
background-color: $brand-gray;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -152,6 +156,10 @@
background-color: #830000;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -169,6 +177,10 @@
background-color: #5d1542;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -186,6 +198,10 @@
background-color: #1b494c;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -203,6 +219,10 @@
background-color: #442369;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -220,6 +240,10 @@
background-color: #565b22;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
@@ -237,6 +261,10 @@
background-color: #953d1c;
color: $white;
+ p {
+ color: $white;
+ }
+
a {
color: $white;
}
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_default.scss b/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
index 258f14727c..e669ad7492 100755
--- a/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
@@ -177,7 +177,7 @@ p {
font-family: $font-family-sans-serif;
font-weight: 400;
font-size: 16px;
- color: $gray-6 !important;
+ color: $gray-6;
}
diff --git a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
index 9e0971aa4f..013a808d83 100644
--- a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
+++ b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
@@ -104,7 +104,6 @@
a {
color: $black-base;
font-size: 20px;
- line-height: 2;
padding-top: 5px;
font-weight: 600;
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index d00c80d5d1..4aef318077 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -1895,7 +1895,7 @@ p {
font-family: "proximanova", Helvetica, Arial, sans-serif;
font-weight: 400;
font-size: 16px;
- color: #666666 !important;
+ color: #666666;
}
/* line 188, ../assets/sass/layout/_default.scss */
@@ -5453,173 +5453,166 @@ input[type="button"].btn-block {
float: right;
}
+/* line 132, ../assets/sass/components/_menu.scss */
+.search-box {
+ background: #E8E8E4;
+ position: absolute;
+ top: 54px;
+ right: 28.7%;
+ width: 350px;
+ height: 60px;
+ line-height: 60px;
+ box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+ border-top: 4px solid #D80B15;
+ display: none;
+}
+/* line 144, ../assets/sass/components/_menu.scss */
+.search-box:before {
+ content: "";
+ position: absolute;
+ top: -32px;
+ right: 13px;
+ border-left: 12px solid transparent;
+ border-right: 12px solid transparent;
+ border-top: 14px solid transparent;
+ border-bottom: 14px solid #D80B15;
+}
+/* line 155, ../assets/sass/components/_menu.scss */
+.search-box input[type="text"] {
+ width: 200px;
+ padding: 5px 10px;
+ margin-left: 23px;
+ border: 1px solid #D80B15;
+ outline: none;
+}
+/* line 163, ../assets/sass/components/_menu.scss */
+.search-box input[type="button"] {
+ width: 80px;
+ padding: 5px 0;
+ background: #D80B15;
+ color: #fff;
+ margin-left: -6px;
+ border: 1px solid #D80B15;
+ outline: none;
+ cursor: pointer;
+}
+
+/* line 175, ../assets/sass/components/_menu.scss */
+#superfish-main {
+ width: 100%;
+}
+
@media (max-width: 768px) {
- /* line 133, ../assets/sass/components/_menu.scss */
+ /* line 187, ../assets/sass/components/_menu.scss */
#main-nav .container {
padding-left: 0;
padding-right: 0;
}
- /* line 137, ../assets/sass/components/_menu.scss */
+ /* line 191, ../assets/sass/components/_menu.scss */
#main-nav .container:after {
content: "";
display: none;
}
- /* line 141, ../assets/sass/components/_menu.scss */
+ /* line 195, ../assets/sass/components/_menu.scss */
#main-nav .container .clearfix:after {
content: "";
display: none;
}
- /* line 147, ../assets/sass/components/_menu.scss */
+ /* line 201, ../assets/sass/components/_menu.scss */
div.sf-accordion-toggle.sf-style-white > a:after {
content: "";
display: none;
}
- /* line 151, ../assets/sass/components/_menu.scss */
+ /* line 205, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-accordion.sf-accordion-with-buttons li.sf-expanded > .sf-accordion-button:after {
content: "";
display: none;
}
- /* line 156, ../assets/sass/components/_menu.scss */
+ /* line 210, ../assets/sass/components/_menu.scss */
#block-dummyheader img {
width: 100%;
}
- /* line 160, ../assets/sass/components/_menu.scss */
+ /* line 214, ../assets/sass/components/_menu.scss */
div.sf-accordion-toggle.sf-style-white a {
background: transparent;
border: none;
font-size: 30px;
}
- /* line 165, ../assets/sass/components/_menu.scss */
+ /* line 219, ../assets/sass/components/_menu.scss */
div.sf-accordion-toggle.sf-style-white a span {
display: none;
}
- /* line 170, ../assets/sass/components/_menu.scss */
+ /* line 224, ../assets/sass/components/_menu.scss */
div.sf-accordion-toggle.sf-style-white a.sf-expanded {
background: transparent;
}
- /* line 174, ../assets/sass/components/_menu.scss */
+ /* line 228, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-accordion.sf-accordion-with-buttons .sf-accordion-button:after {
content: "";
margin: 0;
}
- /* line 179, ../assets/sass/components/_menu.scss */
+ /* line 233, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-style-white.sf-accordion li.sf-expanded {
background: #F5F5F5;
}
- /* line 183, ../assets/sass/components/_menu.scss */
+ /* line 237, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-style-white li, ul.sf-menu.sf-style-white.sf-navbar {
border: solid 1px #979797;
}
- /* line 187, ../assets/sass/components/_menu.scss */
+ /* line 241, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-style-white.sf-accordion li li a, ul.sf-menu.sf-style-white.sf-accordion li li span.nolink {
background: #E0E0E0;
}
- /* line 191, ../assets/sass/components/_menu.scss */
+ /* line 245, ../assets/sass/components/_menu.scss */
ul.sf-menu.sf-style-white a, ul.sf-menu.sf-style-white a:visited, ul.sf-menu.sf-style-white span.nolink {
color: #373735;
}
- /* line 196, ../assets/sass/components/_menu.scss */
+ /* line 250, ../assets/sass/components/_menu.scss */
.sf-menu .sf-depth-1 a {
text-transform: uppercase;
font-weight: 600;
font-size: 18px;
}
- /* line 202, ../assets/sass/components/_menu.scss */
+ /* line 256, ../assets/sass/components/_menu.scss */
.sf-menu .sf-depth-2 a {
text-transform: capitalize;
font-weight: 400;
}
- /* line 207, ../assets/sass/components/_menu.scss */
+ /* line 261, ../assets/sass/components/_menu.scss */
.sf-menu .hidetxt {
position: absolute;
left: -99999999px;
width: 0;
height: 0;
}
- /* line 214, ../assets/sass/components/_menu.scss */
+ /* line 268, ../assets/sass/components/_menu.scss */
.sf-menu .sf-accordion-button {
padding: 5px 15px 0;
- background: transparent !important;
+ border-left: solid 1px #979797 !important;
+ background: #E0E0E0 !important;
}
- /* line 218, ../assets/sass/components/_menu.scss */
+ /* line 273, ../assets/sass/components/_menu.scss */
.sf-menu .sf-accordion-button svg, .sf-menu .sf-accordion-button i {
font-size: 18px;
color: #BB0000;
}
- /* line 225, ../assets/sass/components/_menu.scss */
+ /* line 280, ../assets/sass/components/_menu.scss */
div.sf-accordion-toggle.sf-style-white a {
padding: .05em .5em;
}
}
-/* line 231, ../assets/sass/components/_menu.scss */
-.search-box {
- background: #E8E8E4;
- position: absolute;
- top: 54px;
- right: 28.7%;
- width: 350px;
- height: 60px;
- line-height: 60px;
- box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
- border-top: 4px solid #D80B15;
- display: none;
-}
-
-/* line 244, ../assets/sass/components/_menu.scss */
-.search-box:before {
- content: "";
- position: absolute;
- top: -32px;
- right: 13px;
- border-left: 12px solid transparent;
- border-right: 12px solid transparent;
- border-top: 14px solid transparent;
- border-bottom: 14px solid #D80B15;
-}
-
-/* line 255, ../assets/sass/components/_menu.scss */
-.search-box input[type="text"] {
- width: 200px;
- padding: 5px 10px;
- margin-left: 23px;
- border: 1px solid #D80B15;
- outline: none;
-}
-
-/* line 263, ../assets/sass/components/_menu.scss */
-.search-box input[type="button"] {
- width: 80px;
- padding: 5px 0;
- background: #D80B15;
- color: #fff;
- margin-left: -6px;
- border: 1px solid #D80B15;
- outline: none;
- cursor: pointer;
-}
-
-/* line 275, ../assets/sass/components/_menu.scss */
-#superfish-main {
- width: 100%;
-}
-
-/* line 280, ../assets/sass/components/_menu.scss */
-#superfish-main {
- width: 100%;
-}
-
/* line 1, ../assets/sass/components/_cbpmenu.scss */
.cbp-hrmenu {
width: 100%;
@@ -6044,193 +6037,221 @@ body {
color: #ffffff;
}
/* line 138, ../assets/sass/components/_paragraphs.scss */
-.dgray-bg a {
+.dgray-bg p {
color: #ffffff;
}
/* line 142, ../assets/sass/components/_paragraphs.scss */
+.dgray-bg a {
+ color: #ffffff;
+}
+/* line 146, ../assets/sass/components/_paragraphs.scss */
.dgray-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 146, ../assets/sass/components/_paragraphs.scss */
+/* line 150, ../assets/sass/components/_paragraphs.scss */
.dgray-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 151, ../assets/sass/components/_paragraphs.scss */
+/* line 155, ../assets/sass/components/_paragraphs.scss */
.dscarlet-bg {
background-color: #830000;
color: #ffffff;
}
-/* line 155, ../assets/sass/components/_paragraphs.scss */
+/* line 159, ../assets/sass/components/_paragraphs.scss */
+.dscarlet-bg p {
+ color: #ffffff;
+}
+/* line 163, ../assets/sass/components/_paragraphs.scss */
.dscarlet-bg a {
color: #ffffff;
}
-/* line 159, ../assets/sass/components/_paragraphs.scss */
+/* line 167, ../assets/sass/components/_paragraphs.scss */
.dscarlet-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 163, ../assets/sass/components/_paragraphs.scss */
+/* line 171, ../assets/sass/components/_paragraphs.scss */
.dscarlet-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 168, ../assets/sass/components/_paragraphs.scss */
+/* line 176, ../assets/sass/components/_paragraphs.scss */
.dviolet-bg {
background-color: #5d1542;
color: #ffffff;
}
-/* line 172, ../assets/sass/components/_paragraphs.scss */
+/* line 180, ../assets/sass/components/_paragraphs.scss */
+.dviolet-bg p {
+ color: #ffffff;
+}
+/* line 184, ../assets/sass/components/_paragraphs.scss */
.dviolet-bg a {
color: #ffffff;
}
-/* line 176, ../assets/sass/components/_paragraphs.scss */
+/* line 188, ../assets/sass/components/_paragraphs.scss */
.dviolet-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 180, ../assets/sass/components/_paragraphs.scss */
+/* line 192, ../assets/sass/components/_paragraphs.scss */
.dviolet-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 185, ../assets/sass/components/_paragraphs.scss */
+/* line 197, ../assets/sass/components/_paragraphs.scss */
.dteal-bg {
background-color: #1b494c;
color: #ffffff;
}
-/* line 189, ../assets/sass/components/_paragraphs.scss */
+/* line 201, ../assets/sass/components/_paragraphs.scss */
+.dteal-bg p {
+ color: #ffffff;
+}
+/* line 205, ../assets/sass/components/_paragraphs.scss */
.dteal-bg a {
color: #ffffff;
}
-/* line 193, ../assets/sass/components/_paragraphs.scss */
+/* line 209, ../assets/sass/components/_paragraphs.scss */
.dteal-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 197, ../assets/sass/components/_paragraphs.scss */
+/* line 213, ../assets/sass/components/_paragraphs.scss */
.dteal-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 202, ../assets/sass/components/_paragraphs.scss */
+/* line 218, ../assets/sass/components/_paragraphs.scss */
.dpurple-bg {
background-color: #442369;
color: #ffffff;
}
-/* line 206, ../assets/sass/components/_paragraphs.scss */
+/* line 222, ../assets/sass/components/_paragraphs.scss */
+.dpurple-bg p {
+ color: #ffffff;
+}
+/* line 226, ../assets/sass/components/_paragraphs.scss */
.dpurple-bg a {
color: #ffffff;
}
-/* line 210, ../assets/sass/components/_paragraphs.scss */
+/* line 230, ../assets/sass/components/_paragraphs.scss */
.dpurple-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 214, ../assets/sass/components/_paragraphs.scss */
+/* line 234, ../assets/sass/components/_paragraphs.scss */
.dpurple-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 219, ../assets/sass/components/_paragraphs.scss */
+/* line 239, ../assets/sass/components/_paragraphs.scss */
.dgreen-bg {
background-color: #565b22;
color: #ffffff;
}
-/* line 223, ../assets/sass/components/_paragraphs.scss */
+/* line 243, ../assets/sass/components/_paragraphs.scss */
+.dgreen-bg p {
+ color: #ffffff;
+}
+/* line 247, ../assets/sass/components/_paragraphs.scss */
.dgreen-bg a {
color: #ffffff;
}
-/* line 227, ../assets/sass/components/_paragraphs.scss */
+/* line 251, ../assets/sass/components/_paragraphs.scss */
.dgreen-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 231, ../assets/sass/components/_paragraphs.scss */
+/* line 255, ../assets/sass/components/_paragraphs.scss */
.dgreen-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 236, ../assets/sass/components/_paragraphs.scss */
+/* line 260, ../assets/sass/components/_paragraphs.scss */
.dorange-bg {
background-color: #953d1c;
color: #ffffff;
}
-/* line 240, ../assets/sass/components/_paragraphs.scss */
+/* line 264, ../assets/sass/components/_paragraphs.scss */
+.dorange-bg p {
+ color: #ffffff;
+}
+/* line 268, ../assets/sass/components/_paragraphs.scss */
.dorange-bg a {
color: #ffffff;
}
-/* line 244, ../assets/sass/components/_paragraphs.scss */
+/* line 272, ../assets/sass/components/_paragraphs.scss */
.dorange-bg .paragraph--type--tabs a:hover {
color: #555555;
}
-/* line 248, ../assets/sass/components/_paragraphs.scss */
+/* line 276, ../assets/sass/components/_paragraphs.scss */
.dorange-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
-/* line 258, ../assets/sass/components/_paragraphs.scss */
+/* line 286, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--columns-1 {
width: 90%;
margin: 0 auto;
margin-top: 30px;
}
-/* line 264, ../assets/sass/components/_paragraphs.scss */
+/* line 292, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--columns-2 {
margin-top: 30px;
}
-/* line 268, ../assets/sass/components/_paragraphs.scss */
+/* line 296, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--columns-3 {
margin-top: 30px;
}
-/* line 272, ../assets/sass/components/_paragraphs.scss */
+/* line 300, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .field, .paragraph--type--tabs .field {
padding: 20px;
}
-/* line 276, ../assets/sass/components/_paragraphs.scss */
+/* line 304, ../assets/sass/components/_paragraphs.scss */
.paragraph__column {
width: 100%;
float: left;
padding: 20px;
}
@media (max-width: 768px) {
- /* line 281, ../assets/sass/components/_paragraphs.scss */
+ /* line 309, ../assets/sass/components/_paragraphs.scss */
.paragraph__column .container {
padding: 0;
}
- /* line 286, ../assets/sass/components/_paragraphs.scss */
+ /* line 314, ../assets/sass/components/_paragraphs.scss */
.paragraph__column .container .call-out-container {
margin: 15px 0;
}
}
@media (max-width: 768px) {
- /* line 292, ../assets/sass/components/_paragraphs.scss */
+ /* line 320, ../assets/sass/components/_paragraphs.scss */
.paragraph__column .col-xs-12 {
margin-bottom: 20px;
}
}
-/* line 306, ../assets/sass/components/_paragraphs.scss */
+/* line 334, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .field {
padding: 20px;
}
-/* line 309, ../assets/sass/components/_paragraphs.scss */
+/* line 337, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .field p {
margin: 0 0 11px;
}
-/* line 314, ../assets/sass/components/_paragraphs.scss */
+/* line 342, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .panel-default {
border: none;
}
-/* line 318, ../assets/sass/components/_paragraphs.scss */
+/* line 346, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .panel-heading {
border: none;
}
-/* line 322, ../assets/sass/components/_paragraphs.scss */
+/* line 350, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .card-header {
margin: 0 0 10px;
background: #f5f5f5;
}
-/* line 326, ../assets/sass/components/_paragraphs.scss */
+/* line 354, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .card-header .panel-title {
color: #b00;
padding: 3px 15px;
@@ -6242,41 +6263,41 @@ body {
text-align: left;
outline: none;
}
-/* line 338, ../assets/sass/components/_paragraphs.scss */
+/* line 366, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .card-header svg, .paragraph--type--accordion .card-header i {
float: right;
margin-top: 5px;
color: #787878;
}
-/* line 346, ../assets/sass/components/_paragraphs.scss */
+/* line 374, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--accordion .panel div:nth-last-child(2) {
margin-bottom: 0 !important;
}
-/* line 354, ../assets/sass/components/_paragraphs.scss */
+/* line 382, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tabs .field {
padding: 20px;
}
-/* line 363, ../assets/sass/components/_paragraphs.scss */
+/* line 391, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--video iframe {
width: 100% !important;
}
-/* line 372, ../assets/sass/components/_paragraphs.scss */
+/* line 400, ../assets/sass/components/_paragraphs.scss */
.para_1_col .field--name-field-media-twitter {
margin: 0 auto;
width: 60%;
}
-/* line 382, ../assets/sass/components/_paragraphs.scss */
+/* line 410, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--tagline {
margin: 20px 0;
float: left;
}
-/* line 392, ../assets/sass/components/_paragraphs.scss */
+/* line 420, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container {
width: 100%;
position: absolute;
@@ -6285,7 +6306,7 @@ body {
z-index: 100;
height: 100%;
}
-/* line 400, ../assets/sass/components/_paragraphs.scss */
+/* line 428, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt {
background-color: rgba(255, 255, 255, 0.7);
padding: 20px;
@@ -6297,14 +6318,14 @@ body {
transform: perspective(1px) translateY(-50%);
}
@media (max-width: 768px) {
- /* line 400, ../assets/sass/components/_paragraphs.scss */
+ /* line 428, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt {
width: 80%;
top: 45%;
height: 100%;
}
}
-/* line 416, ../assets/sass/components/_paragraphs.scss */
+/* line 444, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt h2 {
font-size: 36px;
text-transform: uppercase;
@@ -6312,29 +6333,29 @@ body {
color: #333333;
}
@media (max-width: 768px) {
- /* line 416, ../assets/sass/components/_paragraphs.scss */
+ /* line 444, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt h2 {
font-size: 18px;
}
}
-/* line 427, ../assets/sass/components/_paragraphs.scss */
+/* line 455, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt p {
font-size: 18px;
margin: 25px 0;
}
@media (max-width: 768px) {
- /* line 427, ../assets/sass/components/_paragraphs.scss */
+ /* line 455, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt p {
display: none;
}
}
-/* line 436, ../assets/sass/components/_paragraphs.scss */
+/* line 464, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
-/* line 441, ../assets/sass/components/_paragraphs.scss */
+/* line 469, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper {
width: 25%;
margin: 0 10px;
@@ -6344,16 +6365,16 @@ body {
color: #ffffff;
text-transform: uppercase;
}
-/* line 450, ../assets/sass/components/_paragraphs.scss */
+/* line 478, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-19 .btn-wrapper i {
padding-top: 1px;
}
-/* line 454, ../assets/sass/components/_paragraphs.scss */
+/* line 482, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
- /* line 441, ../assets/sass/components/_paragraphs.scss */
+ /* line 469, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-19 .btn-wrapper {
display: block;
width: 100%;
@@ -6361,13 +6382,13 @@ body {
font-weight: 700;
}
}
-/* line 467, ../assets/sass/components/_paragraphs.scss */
+/* line 495, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
-/* line 472, ../assets/sass/components/_paragraphs.scss */
+/* line 500, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper {
width: 40%;
margin: 0 10px;
@@ -6377,16 +6398,16 @@ body {
color: #ffffff;
text-transform: uppercase;
}
-/* line 481, ../assets/sass/components/_paragraphs.scss */
+/* line 509, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-18 .btn-wrapper i {
padding-top: 1px;
}
-/* line 485, ../assets/sass/components/_paragraphs.scss */
+/* line 513, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
- /* line 472, ../assets/sass/components/_paragraphs.scss */
+ /* line 500, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-18 .btn-wrapper {
display: block;
width: 100%;
@@ -6394,13 +6415,13 @@ body {
font-weight: 700;
}
}
-/* line 498, ../assets/sass/components/_paragraphs.scss */
+/* line 526, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 {
width: 100%;
margin: 0 auto;
font-size: 18px;
}
-/* line 503, ../assets/sass/components/_paragraphs.scss */
+/* line 531, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper {
width: 50%;
margin: 0 10px;
@@ -6410,16 +6431,16 @@ body {
color: #ffffff;
text-transform: uppercase;
}
-/* line 512, ../assets/sass/components/_paragraphs.scss */
+/* line 540, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper svg, .slide-txt-container .slide-txt .btn-links-17 .btn-wrapper i {
padding-top: 1px;
}
-/* line 516, ../assets/sass/components/_paragraphs.scss */
+/* line 544, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper:hover {
background: #8E0101;
}
@media (max-width: 768px) {
- /* line 503, ../assets/sass/components/_paragraphs.scss */
+ /* line 531, ../assets/sass/components/_paragraphs.scss */
.slide-txt-container .slide-txt .btn-links-17 .btn-wrapper {
display: block;
width: 100%;
@@ -10942,17 +10963,16 @@ button.close {
.call-out-container .field--name-field-image-link a {
color: #000000;
font-size: 20px;
- line-height: 2;
padding-top: 5px;
font-weight: 600;
}
-/* line 111, ../assets/sass/pages/_landing-page.scss */
+/* line 110, ../assets/sass/pages/_landing-page.scss */
.call-out-container .field--name-field-image-link a:hover {
color: #BB0000;
text-decoration: underline;
}
-/* line 129, ../assets/sass/pages/_landing-page.scss */
+/* line 128, ../assets/sass/pages/_landing-page.scss */
.dgray-bg .call-out-container a,
.dscarlet-bg .call-out-container a,
.dviolet-bg .call-out-container a,
@@ -10962,7 +10982,7 @@ button.close {
.dorange-bg .call-out-container a {
color: #ffffff;
}
-/* line 132, ../assets/sass/pages/_landing-page.scss */
+/* line 131, ../assets/sass/pages/_landing-page.scss */
.dgray-bg .call-out-container a:hover,
.dscarlet-bg .call-out-container a:hover,
.dviolet-bg .call-out-container a:hover,
@@ -10973,7 +10993,7 @@ button.close {
color: #ffffff;
}
-/* line 141, ../assets/sass/pages/_landing-page.scss */
+/* line 140, ../assets/sass/pages/_landing-page.scss */
.page-node-type-landing-page #half-t-left {
position: absolute;
z-index: 2;
@@ -10984,12 +11004,12 @@ button.close {
border-right: 20px solid transparent;
}
@media (max-width: 768px) {
- /* line 141, ../assets/sass/pages/_landing-page.scss */
+ /* line 140, ../assets/sass/pages/_landing-page.scss */
.page-node-type-landing-page #half-t-left {
bottom: -2px;
}
}
-/* line 154, ../assets/sass/pages/_landing-page.scss */
+/* line 153, ../assets/sass/pages/_landing-page.scss */
.page-node-type-landing-page #half-t-right {
position: absolute;
z-index: 2;
@@ -11001,18 +11021,18 @@ button.close {
border-left: 20px solid transparent;
}
@media (max-width: 768px) {
- /* line 154, ../assets/sass/pages/_landing-page.scss */
+ /* line 153, ../assets/sass/pages/_landing-page.scss */
.page-node-type-landing-page #half-t-right {
bottom: -2px;
}
}
-/* line 175, ../assets/sass/pages/_landing-page.scss */
+/* line 174, ../assets/sass/pages/_landing-page.scss */
.block-bg-color {
background: #F5F5F5;
}
-/* line 180, ../assets/sass/pages/_landing-page.scss */
+/* line 179, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header {
text-transform: uppercase;
float: left;
@@ -11021,48 +11041,48 @@ button.close {
padding-bottom: 0;
border-bottom: 1px solid #979797;
}
-/* line 188, ../assets/sass/pages/_landing-page.scss */
+/* line 187, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news {
text-align: left;
padding: 0;
}
-/* line 192, ../assets/sass/pages/_landing-page.scss */
+/* line 191, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-re-news h2 {
color: #851E5E;
font-size: 22px;
}
-/* line 198, ../assets/sass/pages/_landing-page.scss */
+/* line 197, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head {
text-align: right;
padding: 0;
}
-/* line 202, ../assets/sass/pages/_landing-page.scss */
+/* line 201, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3, .view-display-id-block_1 .view-header .txt-more-news-head a {
color: #851E5E;
font-size: 22px;
}
-/* line 206, ../assets/sass/pages/_landing-page.scss */
+/* line 205, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head h3 svg, .view-display-id-block_1 .view-header .txt-more-news-head a svg {
font-size: 20px;
}
@media (max-width: 768px) {
- /* line 198, ../assets/sass/pages/_landing-page.scss */
+ /* line 197, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-header .txt-more-news-head {
display: none;
}
}
-/* line 217, ../assets/sass/pages/_landing-page.scss */
+/* line 216, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content {
float: left;
width: 100%;
}
@media (max-width: 768px) {
- /* line 222, ../assets/sass/pages/_landing-page.scss */
+ /* line 221, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-content .row {
margin-bottom: 0;
}
}
-/* line 228, ../assets/sass/pages/_landing-page.scss */
+/* line 227, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer {
text-transform: uppercase;
float: left;
@@ -11071,28 +11091,28 @@ button.close {
border-bottom: 1px solid #979797;
display: none;
}
-/* line 236, ../assets/sass/pages/_landing-page.scss */
+/* line 235, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot {
text-align: right;
padding: 0;
}
-/* line 240, ../assets/sass/pages/_landing-page.scss */
+/* line 239, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3, .view-display-id-block_1 .view-footer .txt-more-news-foot a {
color: #851E5E;
font-size: 22px;
}
-/* line 244, ../assets/sass/pages/_landing-page.scss */
+/* line 243, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer .txt-more-news-foot h3 svg, .view-display-id-block_1 .view-footer .txt-more-news-foot a svg {
font-size: 20px;
}
@media (max-width: 768px) {
- /* line 228, ../assets/sass/pages/_landing-page.scss */
+ /* line 227, ../assets/sass/pages/_landing-page.scss */
.view-display-id-block_1 .view-footer {
display: block;
}
}
-/* line 259, ../assets/sass/pages/_landing-page.scss */
+/* line 258, ../assets/sass/pages/_landing-page.scss */
#views-bootstrap-people-directory-block-1 .people-row .inner-people-grid {
background: #ffffff;
}
diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js
index 5052f50be4..d3a3f5edf7 100644
--- a/web/themes/asc_bootstrap/js/scripts.js
+++ b/web/themes/asc_bootstrap/js/scripts.js
@@ -17,20 +17,20 @@ jQuery(document).ready(function(){
//check if menu in mobile view
if (jQuery('#superfish-main-accordion')[0]){
jQuery('.sf-accordion-button .svg-inline--fa').empty().replaceWith(function(){
- return jQuery("<i class='fa fa-angle-up' aria-hidden='true' />").append(jQuery(this).contents());
+ return jQuery("<i class='fa fa-angle-down' aria-hidden='true' />").append(jQuery(this).contents());
});
//change arrow direction on click
jQuery('.sf-accordion-button').click(function(){
- if ( jQuery(this).find("svg").hasClass('fa-angle-up') ) {
+ if ( jQuery(this).find("svg").hasClass('fa-angle-down') ) {
jQuery(this).find("svg").addClass( 'fa-angle-right' );
} else {
- jQuery(this).find("svg").removeClass( 'fa-angle-right' ).addClass( 'fa-angle-up' );
+ jQuery(this).find("svg").removeClass( 'fa-angle-right' ).addClass( 'fa-angle-down' );
}
- if ( jQuery(this).find("i").hasClass('fa-angle-up') ) {
- jQuery(this).find("i").removeClass('fa-angle-up').addClass( 'fa-angle-right' );
+ if ( jQuery(this).find("i").hasClass('fa-angle-down') ) {
+ jQuery(this).find("i").removeClass('fa-angle-down').addClass( 'fa-angle-right' );
} else {
- jQuery(this).find("i").removeClass( 'fa-angle-right' ).addClass( 'fa-angle-up' );
+ jQuery(this).find("i").removeClass( 'fa-angle-right' ).addClass( 'fa-angle-down' );
}
});
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-three.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-three.html.twig
index 223c94b7ec..9cd08d52f6 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-three.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-three.html.twig
@@ -48,7 +48,7 @@
{% for item in content|without('field_background_color') %}
{% set thecont = thecont|merge(item) %}
{% endfor %}
- {% if is_front %}<div class="container">{% endif %}
+ <div class="container">
<div class="col-xs-12 col-md-4 call-out-container">
{{ thecont[0] }}
{# {{ thecont[0]['#paragraph'].field_image_text.value }} #}
@@ -62,7 +62,7 @@
{{ thecont[2] }}
</div>
- {% if is_front %}</div>{% endif %}
+ </div>
</div>
</div>
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-two.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-two.html.twig
index b55e299dcc..f7162e14b8 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-two.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--call-out-boxes-two.html.twig
@@ -49,7 +49,7 @@
{% for item in content|without('field_background_color') %}
{% set thecont = thecont|merge(item) %}
{% endfor %}
- {% if is_front %}<div class="container">{% endif %}
+ <div class="container">
<div class="col-xs-12 col-md-6 call-out-container">
{{ thecont[0] }}
</div>
@@ -57,6 +57,6 @@
<div class="col-xs-12 col-md-6 call-out-container">
{{ thecont[1] }}
</div>
- {% if is_front %}</div>{% endif %}
+ </div>
</div>
</div>
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--column_one.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--column_one.html.twig
index 310cd00e8a..df917b639e 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--column_one.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--column_one.html.twig
@@ -44,8 +44,14 @@
{# Prints div with classes, and content without Width and Background. #}
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }} para_1_col">
+ {% if page_content_type == 'landing_page' %}
+ <div class="container">
+ {% endif %}
<div class="col-xs-12">
{{ content.field_column_content_1 }}
</div>
+ {% if page_content_type == 'landing_page' %}
+ </div>
+ {% endif %}
</div>
</div>
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
index 7528fc7366..624eb01a71 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_three.html.twig
@@ -80,6 +80,10 @@
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }}">
+{% if page_content_type == 'landing_page' %}
+ <div class="container">
+ {% endif %}
+
{% set thecont = [] %}
{% for item in content|without('field_column_style_3')|without('field_background_color') %}
{% set thecont = thecont|merge(item) %}
@@ -97,5 +101,9 @@
{{ thecont[2] }}
</div>
+ {% if page_content_type == 'landing_page' %}
+ </div>
+ {% endif %}
+
</div>
</div>
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
index 561298488b..0fdedb4f1e 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--columns_two.html.twig
@@ -72,6 +72,9 @@
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }}">
+ {% if page_content_type == 'landing_page' %}
+ <div class="container">
+ {% endif %}
{# content.field_column_content_2[0]['#paragraph'].field_text.value #}
{# for key in content.field_column_content_2|keys %}
{{ key }}
@@ -90,5 +93,9 @@
{{ thecont[1] }}
</div>
+ {% if page_content_type == 'landing_page' %}
+ </div>
+ {% endif %}
+
</div>
</div>
--
GitLab