From ae0806f5344b5f2a0a3887fdb2a14718a3b1849d Mon Sep 17 00:00:00 2001
From: bcanini <canini.16@osu.edu>
Date: Tue, 5 Feb 2019 14:58:55 -0500
Subject: [PATCH] asc_bootstrap - adding if statement around AddToCalendar btn
so it doesn't show when all day event, fixing padding for hr tag on news and
events when advanced settings are used
---
.../assets/sass/layout/_default.scss | 4 +++
web/themes/asc_bootstrap/css/style.css | 29 +++++++++++--------
.../templates/node/node--event.html.twig | 4 ++-
3 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_default.scss b/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
index 297298f04f..1cb3f08c42 100755
--- a/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_default.scss
@@ -185,6 +185,10 @@ select:focus {
}
+hr {
+ width: 100%;
+}
+
// --------------------------------------------------
//## Headings.
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index a9232e5b76..14a255b0fc 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -9056,65 +9056,70 @@ select:focus {
outline-offset: 4px;
}
-/* line 192, ../assets/sass/layout/_default.scss */
+/* line 188, ../assets/sass/layout/_default.scss */
+hr {
+ width: 100%;
+}
+
+/* line 196, ../assets/sass/layout/_default.scss */
h1, h2, h3, h4, h5, h6 {
margin: 11px 0;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
-/* line 198, ../assets/sass/layout/_default.scss */
+/* line 202, ../assets/sass/layout/_default.scss */
h1 {
font-weight: bold;
line-height: 33px;
}
-/* line 203, ../assets/sass/layout/_default.scss */
+/* line 207, ../assets/sass/layout/_default.scss */
h2 {
line-height: 26px;
}
-/* line 207, ../assets/sass/layout/_default.scss */
+/* line 211, ../assets/sass/layout/_default.scss */
h3 {
line-height: 22px;
}
-/* line 211, ../assets/sass/layout/_default.scss */
+/* line 215, ../assets/sass/layout/_default.scss */
h4 {
line-height: 17px;
}
-/* line 215, ../assets/sass/layout/_default.scss */
+/* line 219, ../assets/sass/layout/_default.scss */
h5, h6 {
line-height: 15px;
}
-/* line 224, ../assets/sass/layout/_default.scss */
+/* line 228, ../assets/sass/layout/_default.scss */
.field--name-field-media-image {
padding-bottom: 15px;
}
-/* line 230, ../assets/sass/layout/_default.scss */
+/* line 234, ../assets/sass/layout/_default.scss */
.align-left .field--name-field-media-image {
padding: 0 15px 0 0;
}
-/* line 237, ../assets/sass/layout/_default.scss */
+/* line 241, ../assets/sass/layout/_default.scss */
.align-right .field--name-field-media-image {
padding: 0 0 0 15px;
}
-/* line 247, ../assets/sass/layout/_default.scss */
+/* line 251, ../assets/sass/layout/_default.scss */
#contact-message-feedback-form {
margin-bottom: 20px;
}
-/* line 256, ../assets/sass/layout/_default.scss */
+/* line 260, ../assets/sass/layout/_default.scss */
.user-login-form {
margin-bottom: 40px;
}
-/* line 260, ../assets/sass/layout/_default.scss */
+/* line 264, ../assets/sass/layout/_default.scss */
#user-form {
margin-bottom: 40px;
}
diff --git a/web/themes/asc_bootstrap/templates/node/node--event.html.twig b/web/themes/asc_bootstrap/templates/node/node--event.html.twig
index 224f566bec..b45123d2b3 100644
--- a/web/themes/asc_bootstrap/templates/node/node--event.html.twig
+++ b/web/themes/asc_bootstrap/templates/node/node--event.html.twig
@@ -187,6 +187,8 @@
</div>
+{# Only show AddToCalendar if not All Day Event #}
+{% if start_date_cal != end_date_cal %}
{# BEGIN AddToCalendar #}
<div class="col-xs-12 col-md-4 evt-cal">
{# place and hide date range field/AddToCalendar so stylesheet activates for btn #}
@@ -220,7 +222,7 @@
{# END setup AddToCalendar btn #}
</div>
{# END AddToCalendar #}
-{{ content.field_evt_date_range_2 }}
+{% endif %}
{% endfor %}{# END for loop to display all event dates #}
--
GitLab