From fa1b44a90438a1227eb18446bd8bcc54c1273478 Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Thu, 18 Apr 2019 11:08:16 -0400
Subject: [PATCH] asc_bootstrap - if statement for fun facts so that no extra
space shows if fun facts are blank, removed old js commented out code that's
no longer needed, updating styles for event card
---
.../assets/sass/components/_events.scss | 8 ++--
web/themes/asc_bootstrap/css/style.css | 40 ++++++++++---------
web/themes/asc_bootstrap/js/scripts.js | 4 --
.../paragraph/paragraph--fun-facts.html.twig | 7 +++-
4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_events.scss b/web/themes/asc_bootstrap/assets/sass/components/_events.scss
index f3d3782481..39c4fa70b8 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_events.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_events.scss
@@ -44,8 +44,9 @@
}
.views-field-title {
- padding: 0 10px 10px;
+ padding: 10px 10px 3px;
font-size: 18px;
+ font-weight: 700;
a {
color: $gray-6;
@@ -53,9 +54,10 @@
}
.views-field-field-evt-location-2 {
- padding: 10px 10px 3px;
+ padding: 10px;
color: #26686D;
- font-weight: 700;
+ font-weight: 600;
+ background: #F5F5F5;
}
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index bd2dbb9dc7..8787062531 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -10154,35 +10154,37 @@ h6 {
}
/* line 46, ../assets/sass/components/_events.scss */
.view-events .news-row .views-field-title {
- padding: 0 10px 10px;
+ padding: 10px 10px 3px;
font-size: 18px;
+ font-weight: 700;
}
-/* line 50, ../assets/sass/components/_events.scss */
+/* line 51, ../assets/sass/components/_events.scss */
.view-events .news-row .views-field-title a {
color: #666666;
}
-/* line 55, ../assets/sass/components/_events.scss */
+/* line 56, ../assets/sass/components/_events.scss */
.view-events .news-row .views-field-field-evt-location-2 {
- padding: 10px 10px 3px;
+ padding: 10px;
color: #26686D;
- font-weight: 700;
+ font-weight: 600;
+ background: #F5F5F5;
}
-/* line 71, ../assets/sass/components/_events.scss */
+/* line 73, ../assets/sass/components/_events.scss */
article.event {
margin-bottom: 16px;
}
-/* line 75, ../assets/sass/components/_events.scss */
+/* line 77, ../assets/sass/components/_events.scss */
.news-cont {
padding-left: 0;
}
-/* line 78, ../assets/sass/components/_events.scss */
+/* line 80, ../assets/sass/components/_events.scss */
.news-cont .field--name-body {
margin: 20px 0 40px;
}
-/* line 83, ../assets/sass/components/_events.scss */
+/* line 85, ../assets/sass/components/_events.scss */
.news-date {
text-transform: uppercase;
font-weight: 700;
@@ -10191,12 +10193,12 @@ article.event {
-moz-osx-font-smoothing: grayscale;
}
-/* line 91, ../assets/sass/components/_events.scss */
+/* line 93, ../assets/sass/components/_events.scss */
.news-title {
text-transform: capitalize;
}
-/* line 95, ../assets/sass/components/_events.scss */
+/* line 97, ../assets/sass/components/_events.scss */
.evt-header {
background: #EFEFEF;
padding: 15px 5px 10px;
@@ -10205,47 +10207,47 @@ article.event {
margin-bottom: 30px;
}
-/* line 103, ../assets/sass/components/_events.scss */
+/* line 105, ../assets/sass/components/_events.scss */
.evt-icon {
float: left;
margin-right: 10px;
}
-/* line 110, ../assets/sass/components/_events.scss */
+/* line 112, ../assets/sass/components/_events.scss */
.evt-cal .hidden {
display: none;
}
-/* line 114, ../assets/sass/components/_events.scss */
+/* line 116, ../assets/sass/components/_events.scss */
.evt-cal span {
float: right;
padding: 20px 0;
}
@media (max-width: 768px) {
- /* line 114, ../assets/sass/components/_events.scss */
+ /* line 116, ../assets/sass/components/_events.scss */
.evt-cal span {
float: none;
}
}
@media (max-width: 768px) {
- /* line 108, ../assets/sass/components/_events.scss */
+ /* line 110, ../assets/sass/components/_events.scss */
.evt-cal {
text-align: center;
margin-bottom: 5px;
}
}
-/* line 134, ../assets/sass/components/_events.scss */
+/* line 136, ../assets/sass/components/_events.scss */
.page-node-type-news-story .page-header {
display: none;
}
-/* line 143, ../assets/sass/components/_events.scss */
+/* line 145, ../assets/sass/components/_events.scss */
.taxonomy-events-heading {
float: left;
width: 100%;
padding-top: 15px;
}
-/* line 148, ../assets/sass/components/_events.scss */
+/* line 150, ../assets/sass/components/_events.scss */
.taxonomy-events-heading h2 {
line-height: 0;
font-size: 18px;
diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js
index 7d2461288a..7193b35321 100644
--- a/web/themes/asc_bootstrap/js/scripts.js
+++ b/web/themes/asc_bootstrap/js/scripts.js
@@ -38,10 +38,6 @@ jQuery(document).ready(function(){
}
});
- //character limit in mobile view for slide text title
- /*if (jQuery(".slide-txt h2").html().length > 25){
- //
- }*/
} else {
jQuery('.sf-sub-indicator').empty().replaceWith(function(){
diff --git a/web/themes/asc_bootstrap/templates/paragraph/paragraph--fun-facts.html.twig b/web/themes/asc_bootstrap/templates/paragraph/paragraph--fun-facts.html.twig
index 7c01e8217c..957b54f0ed 100644
--- a/web/themes/asc_bootstrap/templates/paragraph/paragraph--fun-facts.html.twig
+++ b/web/themes/asc_bootstrap/templates/paragraph/paragraph--fun-facts.html.twig
@@ -43,7 +43,9 @@
{% set bgcolor = 'transparent-bg' %}
{% endif %}
+
{# Prints div with classes, and content without Width and Background. #}
+{% if content.field_facts['#items'].value %}
<div{{ attributes.addClass(classes) }}>
<div class="paragraph__column {{ bgcolor }}">
@@ -51,7 +53,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">
{{ thecont[0] }}
</div>
@@ -63,6 +65,7 @@
<div class="col-xs-12 col-md-4">
{{ thecont[2] }}
</div>
- {% if is_front %}</div>{% endif %}
+ </div>
</div>
</div>
+{% endif %}
--
GitLab