diff --git a/web/themes/asc_bootstrap/asc_bootstrap.theme b/web/themes/asc_bootstrap/asc_bootstrap.theme
index e556439e48ac8033156d8b01eb71a215d27733d9..1c6dd5ab17c80c144da8b8b908f08f438678ba9e 100755
--- a/web/themes/asc_bootstrap/asc_bootstrap.theme
+++ b/web/themes/asc_bootstrap/asc_bootstrap.theme
@@ -71,11 +71,11 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
* and setting weights for where they should appear in the form hierarchy
*/
$form['filter_heading'] = array(
- '#markup' => '<h3 class="filter-heading">Filter</h3>',
+ '#markup' => '<h2 class="filter-heading">Filter</h2>',
'#weight' => -10,
);
$form['filter_search_heading'] = array(
- '#markup' => '<h3 class="filter-heading search-heading">Search</h3>',
+ '#markup' => '<h2 class="filter-heading search-heading">Search</h2>',
'#weight' => 4,
);
$form['spacer'] = array(
@@ -138,11 +138,11 @@ function asc_bootstrap_form_alter(&$form, \Drupal\Core\Form\FormStateInterface $
* and setting weights for where they should appear in the form hierarchy
*/
$form['filter_heading'] = array(
- '#markup' => '<h3 class="ppl-filter-heading ppl-taxon-heading">Filter</h3>',
+ '#markup' => '<h2 class="ppl-filter-heading ppl-taxon-heading">Filter</h2>',
'#weight' => 2,
);
$form['filter_search_heading'] = array(
- '#markup' => '<h3 class="ppl-filter-heading ppl-search-heading">Search</h3>',
+ '#markup' => '<h2 class="ppl-filter-heading ppl-search-heading">Search</h2>',
'#weight' => 0,
);
/*
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_events.scss b/web/themes/asc_bootstrap/assets/sass/components/_events.scss
index 790819338f34a9554854e786c9cb15b5f4c57559..f3d3782481c5f9c9b7adb1d2486aaa5a8da926ee 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_events.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_events.scss
@@ -134,3 +134,19 @@ article.event {
.page-node-type-news-story .page-header {
display: none;
}
+
+
+// --------------------------------------------------
+
+//## Events taxonomy.
+
+.taxonomy-events-heading {
+ float: left;
+ width: 100%;
+ padding-top: 15px;
+
+ h2 {
+ line-height: 0;
+ font-size: 18px;
+ }
+}
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_news.scss b/web/themes/asc_bootstrap/assets/sass/components/_news.scss
index 822c37a7aec17f63f23ed3e7d0228a5129a4a8fe..3b98378f5740981294e66b46681d08234212f598 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_news.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_news.scss
@@ -122,3 +122,14 @@ article.news-story {
display: none;
}
}
+
+.taxonomy-news-heading {
+ float: left;
+ width: 100%;
+ padding-top: 15px;
+
+ h2 {
+ line-height: 0;
+ font-size: 18px;
+ }
+}
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_people.scss b/web/themes/asc_bootstrap/assets/sass/components/_people.scss
index d5d51d452e57060559e82519e87da9d8214d38fd..8aebd8eabac8ec4c769e1d6af748147d0cf203bd 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_people.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_people.scss
@@ -261,6 +261,14 @@
}
}
}
+
+ .bio-top-left {
+
+ h1 {
+ margin-bottom: 0;
+ }
+ }
+
}
.bio-header {
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
index 8041c2fcdaa790fd7196fe21bd3c16787143693b..92fd044c40b94668e8a02cb32f825f550466838f 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_sidebar-menu.scss
@@ -36,7 +36,7 @@
li {
.link-wrapper {
- padding-left: 35px;
+ padding-left: 17px;
}
a {
@@ -50,10 +50,39 @@
li {
.link-wrapper {
- padding-left: 55px;
+ padding-left: 27px;
+ }
+
+ li {
+
+ .link-wrapper {
+ padding-left: 37px;
+ }
+
+ li {
+
+ .link-wrapper {
+ padding-left: 47px;
+ }
+
+ li {
+
+ .link-wrapper {
+ padding-left: 57px;
+ }
+
+ li {
+
+ .link-wrapper {
+ padding-left: 67px;
+ }
+ }
+ }
+ }
}
}
}
+
}
.active-trail ul {
diff --git a/web/themes/asc_bootstrap/assets/sass/components/_wysiwyg.scss b/web/themes/asc_bootstrap/assets/sass/components/_wysiwyg.scss
index 36441029c8195e1d622aec22d12c83b1ce44325a..4b4d79b4f174e43ed1ffe9b6c2bd5b4805a31438 100644
--- a/web/themes/asc_bootstrap/assets/sass/components/_wysiwyg.scss
+++ b/web/themes/asc_bootstrap/assets/sass/components/_wysiwyg.scss
@@ -7,7 +7,7 @@
.align-right {
.field--name-field-media-image {
- padding: 15px 0 15px 15px;
+ padding: 0 0 15px 15px;
width: auto;
}
@@ -18,7 +18,7 @@
.align-left {
.field--name-field-media-image {
- padding: 15px 15px 15px 0;
+ padding: 0 15px 15px 0;
width: auto;
}
@@ -29,7 +29,7 @@
.align-center {
.field--name-field-media-image {
- padding: 15px 0;
+ padding: 0 0 15px;
width: auto;
img {
diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss b/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
index 61e4315913f9fd488b8fa6f70a3131ca57b9b7b7..43ecbf9dbd8907dbd22657794419d3fb5201ece0 100644
--- a/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
+++ b/web/themes/asc_bootstrap/assets/sass/layout/_aside.scss
@@ -16,14 +16,14 @@ aside {
}
.region-sidebar-second {
- padding: 5px 15px 20px;
+ padding: 5px 5px 20px;
width: $full;
float: left;
}
.region-sidebar-menu {
float: left;
- padding: 5px 15px 20px;
+ padding: 5px 5px 20px;
width: $full;
nav {
diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css
index fb81b8531063284f4898a337d41fcff06fb801b1..79eb6b16739af5c5581ee4b25eb47c7841362a51 100644
--- a/web/themes/asc_bootstrap/css/style.css
+++ b/web/themes/asc_bootstrap/css/style.css
@@ -8802,14 +8802,14 @@ aside img {
}
/* line 18, ../assets/sass/layout/_aside.scss */
aside .region-sidebar-second {
- padding: 5px 15px 20px;
+ padding: 5px 5px 20px;
width: 100%;
float: left;
}
/* line 24, ../assets/sass/layout/_aside.scss */
aside .region-sidebar-menu {
float: left;
- padding: 5px 15px 20px;
+ padding: 5px 5px 20px;
width: 100%;
}
/* line 29, ../assets/sass/layout/_aside.scss */
@@ -10239,6 +10239,18 @@ article.event {
display: none;
}
+/* line 143, ../assets/sass/components/_events.scss */
+.taxonomy-events-heading {
+ float: left;
+ width: 100%;
+ padding-top: 15px;
+}
+/* line 148, ../assets/sass/components/_events.scss */
+.taxonomy-events-heading h2 {
+ line-height: 0;
+ font-size: 18px;
+}
+
/* line 8, ../assets/sass/components/_fields.scss */
.field--name-field-slides img {
width: 100%;
@@ -10838,6 +10850,18 @@ article.news-story {
display: none;
}
+/* line 126, ../assets/sass/components/_news.scss */
+.taxonomy-news-heading {
+ float: left;
+ width: 100%;
+ padding-top: 15px;
+}
+/* line 131, ../assets/sass/components/_news.scss */
+.taxonomy-news-heading h2 {
+ line-height: 0;
+ font-size: 18px;
+}
+
/* line 10, ../assets/sass/components/_paragraphs.scss */
.paragraph--type--columns-1 {
width: 90%;
@@ -11506,28 +11530,32 @@ article.news-story {
.bio-header-top .field--name-field-google-map-location .field--item .geolocation-formatter-map-wrapper {
border: solid 2px #979797;
}
+/* line 267, ../assets/sass/components/_people.scss */
+.bio-header-top .bio-top-left h1 {
+ margin-bottom: 0;
+}
-/* line 266, ../assets/sass/components/_people.scss */
+/* line 274, ../assets/sass/components/_people.scss */
.bio-header {
width: 100%;
float: left;
margin: 0 0 20px;
}
-/* line 272, ../assets/sass/components/_people.scss */
+/* line 280, ../assets/sass/components/_people.scss */
.bio-btm-left {
margin-bottom: 40px;
}
-/* line 275, ../assets/sass/components/_people.scss */
+/* line 283, ../assets/sass/components/_people.scss */
.bio-btm-left h2 {
font-size: 22px;
}
-/* line 279, ../assets/sass/components/_people.scss */
+/* line 287, ../assets/sass/components/_people.scss */
.bio-btm-left .bio-exp {
padding-left: 0;
}
-/* line 285, ../assets/sass/components/_people.scss */
+/* line 293, ../assets/sass/components/_people.scss */
.bio-btm-right h3 {
font-size: 18px;
padding-top: 20px;
@@ -11719,7 +11747,7 @@ body {
}
/* line 38, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav ul li .link-wrapper {
- padding-left: 35px;
+ padding-left: 17px;
}
/* line 42, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav ul li a {
@@ -11731,44 +11759,60 @@ body {
}
/* line 52, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav ul li li .link-wrapper {
- padding-left: 55px;
+ padding-left: 27px;
+}
+/* line 58, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav ul li li li .link-wrapper {
+ padding-left: 37px;
+}
+/* line 64, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav ul li li li li .link-wrapper {
+ padding-left: 47px;
}
-/* line 59, ../assets/sass/components/_sidebar-menu.scss */
+/* line 70, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav ul li li li li li .link-wrapper {
+ padding-left: 57px;
+}
+/* line 76, ../assets/sass/components/_sidebar-menu.scss */
+#block-mainnavigation-2 .navbar-nav ul li li li li li li .link-wrapper {
+ padding-left: 67px;
+}
+/* line 88, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav .active-trail ul {
display: inherit;
}
-/* line 64, ../assets/sass/components/_sidebar-menu.scss */
+/* line 93, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav i {
float: right;
padding: 2px 10px;
cursor: pointer;
}
-/* line 70, ../assets/sass/components/_sidebar-menu.scss */
+/* line 99, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .navbar-nav:nth-last-child(1) {
border-bottom: 1px #979797 dotted;
border-top: none;
}
-/* line 77, ../assets/sass/components/_sidebar-menu.scss */
+/* line 106, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .nav > li > a:hover, #block-mainnavigation-2 .nav > li > a:focus {
background-color: transparent;
}
-/* line 81, ../assets/sass/components/_sidebar-menu.scss */
+/* line 110, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .active-link {
background-color: #ffffff;
border-left: solid #D0021B 3px;
padding-left: 5px;
}
-/* line 89, ../assets/sass/components/_sidebar-menu.scss */
+/* line 118, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 .link-wrapper:hover {
background-color: #ffffff;
}
-/* line 94, ../assets/sass/components/_sidebar-menu.scss */
+/* line 123, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 h2.active-link {
background-color: transparent;
border-left: none;
padding-left: 0;
}
-/* line 102, ../assets/sass/components/_sidebar-menu.scss */
+/* line 131, ../assets/sass/components/_sidebar-menu.scss */
#block-mainnavigation-2 h2 a {
color: #000000;
}
@@ -11806,7 +11850,7 @@ label {
/* line 9, ../assets/sass/components/_wysiwyg.scss */
.align-right .field--name-field-media-image {
- padding: 15px 0 15px 15px;
+ padding: 0 0 15px 15px;
width: auto;
}
/* line 14, ../assets/sass/components/_wysiwyg.scss */
@@ -11816,7 +11860,7 @@ label {
/* line 20, ../assets/sass/components/_wysiwyg.scss */
.align-left .field--name-field-media-image {
- padding: 15px 15px 15px 0;
+ padding: 0 15px 15px 0;
width: auto;
}
/* line 25, ../assets/sass/components/_wysiwyg.scss */
@@ -11826,7 +11870,7 @@ label {
/* line 31, ../assets/sass/components/_wysiwyg.scss */
.align-center .field--name-field-media-image {
- padding: 15px 0;
+ padding: 0 0 15px;
width: auto;
}
/* line 35, ../assets/sass/components/_wysiwyg.scss */
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 b9646c0cda5dff7128aaef802e1ab22d8532cd4d..061301ca3aed4bbd603f93d2d6732fef8629ce8f 100644
--- a/web/themes/asc_bootstrap/templates/node/node--event.html.twig
+++ b/web/themes/asc_bootstrap/templates/node/node--event.html.twig
@@ -230,6 +230,12 @@
</div>
{{ content|without('field_evt_image')|without('field_evt_location_2')|without('field_evt_date')|without('field_evt_date_range')|without('field_evt_time')|without('field_evt_social_share')|without('field_evt_taxonomy')|without('field_evt_taxonomy2') }}
+ {% if (content.field_evt_taxonomy.0 != '') or (content.field_evt_taxonomy2.0 != '') %}
+ <div class="taxonomy-events-heading">
+ <h2>Events Filters:</h2>
+ </div>
+ {% endif %}
+
{% for item in content.field_evt_taxonomy %}
{% if item['#title'] %}
<div class="taxonomy-events">
@@ -240,6 +246,7 @@
{% endif %}
{% endfor %}
+
{% for item in content.field_evt_taxonomy2 %}
{% if item['#title'] %}
<div class="taxonomy-events">
diff --git a/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig b/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig
index 43aebf529b0c3b3619167a1985f3fd83e1017eb8..a6f35505077255c8c8728661e2798696f90551bf 100644
--- a/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig
+++ b/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig
@@ -111,6 +111,12 @@
<div class="col-sm-8 col-sm-pull-4 news-cont">
{{ content|without('field_news_image2')|without('field_news_social_share')|without('field_news_terms_1')|without('field_news_terms_2') }}
+ {% if (content.field_news_terms_1.0 != '') or (content.field_news_terms_2.0 != '') %}
+ <div class="taxonomy-news-heading">
+ <h2>News Filters:</h2>
+ </div>
+ {% endif %}
+
{% for item in content.field_news_terms_1 %}
{% if item['#title'] %}
<div class="taxonomy-news">
diff --git a/web/themes/asc_bootstrap/templates/system/user.html.twig b/web/themes/asc_bootstrap/templates/system/user.html.twig
index bc15de7337c6b839cf7ad1ffca4052a639de0bd4..19dc4eb00fea18e3de293da4be50b939d00ee21d 100644
--- a/web/themes/asc_bootstrap/templates/system/user.html.twig
+++ b/web/themes/asc_bootstrap/templates/system/user.html.twig
@@ -33,13 +33,6 @@
<h1>
{{ content.field_first_name.0 }} {{ content.field_last_name.0 }}
</h1>
- {% if content.field_appointment.0 != '' %}
- <p class="bio-title">
- <a href="/people?field_appointment_target_id[{{ content.field_appointment.0['#url']|render|split('/')|last }}]={{ content.field_appointment.0['#url']|render|split('/')|last }}">
- {{ content.field_appointment.0['#title'] }}
- </a>
- </p>
- {% endif %}
{% if content.field_your_title.0 != '' %}
<p class="bio-title">