From 189f7dd08558d7438f8938359fe8af96015b0072 Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Fri, 7 Sep 2018 12:07:36 -0400
Subject: [PATCH] asc_bootstrap - sass updates, removing commented out code
from .theme, adding link to footer
---
web/themes/asc_bootstrap/asc_bootstrap.theme | 17 -----
.../assets/sass/layout/_header.scss | 11 ++--
.../assets/sass/pages/_landing-page.scss | 18 ++++++
web/themes/asc_bootstrap/css/style.css | 64 +++++++++++--------
.../templates/system/includes/_footer.twig | 2 +-
5 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/web/themes/asc_bootstrap/asc_bootstrap.theme b/web/themes/asc_bootstrap/asc_bootstrap.theme
index 91bca01e69..d15004453d 100755
--- a/web/themes/asc_bootstrap/asc_bootstrap.theme
+++ b/web/themes/asc_bootstrap/asc_bootstrap.theme
@@ -37,23 +37,6 @@ function asc_bootstrap_theme_suggestions_page_alter(array &$suggestions, array $
}
}
-/*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
*/
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_header.scss b/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
index a5989ffd9a..f80e17aff6 100644
--- a/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
@@ -12,24 +12,21 @@
}
#header-logos {
- padding: 15px;
+ padding: 0 15px;
width: 100%;
float: left;
+ height: 150px;
+ line-height: 150px;
.dep-logo {
float: left;
width: 60%;
- padding: 20px 20px 5px 0;
}
.osu-logo {
float: right;
width: 30%;
- padding: 40px 0;
-
- img {
- float: right;
- }
+ text-align: right;
}
@media (max-width: 768px) {
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 013a808d83..6a4109675a 100644
--- a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
+++ b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss
@@ -260,3 +260,21 @@
}
}
+.views-field-field-evt-image {
+ .field--name-field-media-image {
+ padding-bottom: 0;
+ }
+}
+
+.views-field-field-news-image2 {
+ .field--name-field-media-image {
+ padding-bottom: 0;
+ }
+}
+
+.inner-people-grid {
+ .views-field-nothing-1 {
+ margin-bottom: 10px;
+ }
+}
+
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index 4aef318077..781837a361 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -1967,25 +1967,22 @@ aside .col-sm-3 {
/* line 14, ../assets/sass/layout/_header.scss */
#header-logos {
- padding: 15px;
+ padding: 0 15px;
width: 100%;
float: left;
+ height: 150px;
+ line-height: 150px;
}
-/* line 19, ../assets/sass/layout/_header.scss */
+/* line 21, ../assets/sass/layout/_header.scss */
#header-logos .dep-logo {
float: left;
width: 60%;
- padding: 20px 20px 5px 0;
}
-/* line 25, ../assets/sass/layout/_header.scss */
+/* line 26, ../assets/sass/layout/_header.scss */
#header-logos .osu-logo {
float: right;
width: 30%;
- padding: 40px 0;
-}
-/* line 30, ../assets/sass/layout/_header.scss */
-#header-logos .osu-logo img {
- float: right;
+ text-align: right;
}
@media (max-width: 768px) {
/* line 14, ../assets/sass/layout/_header.scss */
@@ -1994,52 +1991,52 @@ aside .col-sm-3 {
}
}
-/* line 40, ../assets/sass/layout/_header.scss */
+/* line 37, ../assets/sass/layout/_header.scss */
#header-logos-mobile {
display: none;
text-align: center;
}
-/* line 46, ../assets/sass/layout/_header.scss */
+/* line 43, ../assets/sass/layout/_header.scss */
#header-logos-mobile .dep-logo img {
margin: 0 0 30px;
}
-/* line 53, ../assets/sass/layout/_header.scss */
+/* line 50, ../assets/sass/layout/_header.scss */
#header-logos-mobile .osu-logo img {
margin: 20px 0 30px;
}
@media (max-width: 768px) {
- /* line 40, ../assets/sass/layout/_header.scss */
+ /* line 37, ../assets/sass/layout/_header.scss */
#header-logos-mobile {
display: block;
}
}
-/* line 63, ../assets/sass/layout/_header.scss */
+/* line 60, ../assets/sass/layout/_header.scss */
.logo2 {
margin-top: 5px;
}
-/* line 73, ../assets/sass/layout/_header.scss */
+/* line 70, ../assets/sass/layout/_header.scss */
.search-block-form {
display: none;
width: 50%;
float: right;
}
-/* line 78, ../assets/sass/layout/_header.scss */
+/* line 75, ../assets/sass/layout/_header.scss */
.search-block-form .input-group {
width: 100%;
}
-/* line 81, ../assets/sass/layout/_header.scss */
+/* line 78, ../assets/sass/layout/_header.scss */
.search-block-form .input-group .form-control:first-child {
border-bottom-right-radius: 4px;
border-top-right-radius: 4px;
}
-/* line 87, ../assets/sass/layout/_header.scss */
+/* line 84, ../assets/sass/layout/_header.scss */
.search-block-form .button {
display: none;
}
@media (max-width: 768px) {
- /* line 73, ../assets/sass/layout/_header.scss */
+ /* line 70, ../assets/sass/layout/_header.scss */
.search-block-form {
width: 100%;
padding: 15px 10px 0px;
@@ -2048,41 +2045,41 @@ aside .col-sm-3 {
}
}
-/* line 99, ../assets/sass/layout/_header.scss */
+/* line 96, ../assets/sass/layout/_header.scss */
.search-icon {
float: right !important;
cursor: pointer;
}
-/* line 103, ../assets/sass/layout/_header.scss */
+/* line 100, ../assets/sass/layout/_header.scss */
.search-icon .active-search {
min-height: 40px;
}
@media (max-width: 768px) {
- /* line 99, ../assets/sass/layout/_header.scss */
+ /* line 96, ../assets/sass/layout/_header.scss */
.search-icon {
display: none;
}
}
-/* line 112, ../assets/sass/layout/_header.scss */
+/* line 109, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: none;
float: right;
font-size: 24px;
margin: 5px 15px;
}
-/* line 118, ../assets/sass/layout/_header.scss */
+/* line 115, ../assets/sass/layout/_header.scss */
.search-icon-mobile a {
color: #ffffff;
}
@media (max-width: 768px) {
- /* line 112, ../assets/sass/layout/_header.scss */
+ /* line 109, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: block;
}
}
-/* line 132, ../assets/sass/layout/_header.scss */
+/* line 129, ../assets/sass/layout/_header.scss */
.breadcrumb {
background-color: transparent;
}
@@ -11117,6 +11114,21 @@ button.close {
background: #ffffff;
}
+/* line 264, ../assets/sass/pages/_landing-page.scss */
+.views-field-field-evt-image .field--name-field-media-image {
+ padding-bottom: 0;
+}
+
+/* line 270, ../assets/sass/pages/_landing-page.scss */
+.views-field-field-news-image2 .field--name-field-media-image {
+ padding-bottom: 0;
+}
+
+/* line 276, ../assets/sass/pages/_landing-page.scss */
+.inner-people-grid .views-field-nothing-1 {
+ margin-bottom: 10px;
+}
+
/* line 10, ../assets/sass/pages/_basic-page.scss */
.page-node-type-page .carousel {
height: auto;
diff --git a/web/themes/asc_bootstrap/templates/system/includes/_footer.twig b/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
index 7361dc94c9..6779d75750 100644
--- a/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
+++ b/web/themes/asc_bootstrap/templates/system/includes/_footer.twig
@@ -46,7 +46,7 @@
</a>
</li>
<li>
- <a href="#">
+ <a href="https://artsandsciences.osu.edu/privacy-policy">
Privacy Policy
</a>
</li>
--
GitLab