From 6ed3fc4d38987d7c01c79fe05aaff9101058dcac Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Wed, 19 Jun 2019 10:00:54 -0400
Subject: [PATCH] asc_bootstrap - adding padding to search box, setting up col
1 to work with pub/unpub
---
.../assets/sass/layout/_header.scss | 4 ++++
web/themes/asc_bootstrap/css/style.css | 16 ++++++++++------
.../paragraph/paragraph--column_one.html.twig | 6 +++++-
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_header.scss b/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
index 1070bfef32..2c4617d16e 100644
--- a/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_header.scss
@@ -104,6 +104,10 @@
display: none;
}
+ .form-type-search {
+ margin: 15px 0;
+ }
+
@media (max-width: 768px) {
width: 100%;
padding: 15px 10px 0px;
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index be961c3ea7..9e117edff5 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -9396,6 +9396,10 @@ h6 {
.search-block-form .help-block {
display: none;
}
+/* line 107, ../assets/sass/layout/_header.scss */
+.search-block-form .form-type-search {
+ margin: 15px 0;
+}
@media (max-width: 768px) {
/* line 85, ../assets/sass/layout/_header.scss */
.search-block-form {
@@ -9406,35 +9410,35 @@ h6 {
}
}
-/* line 115, ../assets/sass/layout/_header.scss */
+/* line 119, ../assets/sass/layout/_header.scss */
.search-icon {
float: right !important;
cursor: pointer;
}
-/* line 119, ../assets/sass/layout/_header.scss */
+/* line 123, ../assets/sass/layout/_header.scss */
.search-icon .active-search {
min-height: 40px;
}
@media (max-width: 768px) {
- /* line 115, ../assets/sass/layout/_header.scss */
+ /* line 119, ../assets/sass/layout/_header.scss */
.search-icon {
display: none;
}
}
-/* line 128, ../assets/sass/layout/_header.scss */
+/* line 132, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: none;
float: right;
font-size: 24px;
margin: 5px 15px;
}
-/* line 134, ../assets/sass/layout/_header.scss */
+/* line 138, ../assets/sass/layout/_header.scss */
.search-icon-mobile a {
color: #ffffff;
}
@media (max-width: 768px) {
- /* line 128, ../assets/sass/layout/_header.scss */
+ /* line 132, ../assets/sass/layout/_header.scss */
.search-icon-mobile {
display: block;
}
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 8b5da739b0..1ddac5b409 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
@@ -51,8 +51,12 @@
{% if page_content_type == 'landing_page' %}
<div class="container">
{% endif %}
+ {% set thecont = [] %}
+ {% for item in content|without('field_column_style_2')|without('field_background_color') %}
+ {% set thecont = thecont|merge(item) %}
+ {% endfor %}
<div class="col-xs-12 col-f">
- {{ content.field_column_content_1 }}
+ {{ thecont[0] }}
</div>
{% if page_content_type == 'landing_page' %}
</div>
--
GitLab