Skip to content
Snippets Groups Projects
Commit 9d54b331 authored by Brian Canini's avatar Brian Canini
Browse files

asc_bootstrap - sass updates, temp updates, contact info temp and theme...

asc_bootstrap - sass updates, temp updates, contact info temp and theme function, fixing aside to only appear when sidebar content exists, footer adjustments, paragraph styles
parent d0e51ef9
No related branches found
No related tags found
No related merge requests found
ascintranet
d8-demo-site
d8-example
global-arts-and-humanities
mathematical-biosciences-institute
......@@ -46,3 +46,8 @@ function asc_bootstrap_preprocess_paragraph(&$variables) {
$node = \Drupal::request()->attributes->get('node');
$variables['page_content_type'] = $node->getType();
}
function asc_bootstrap_preprocess_block(&$vars) {
$vars['site_mail'] = \Drupal::config('system.site')->get('mail');
}
......@@ -320,4 +320,3 @@
}
......@@ -17,7 +17,11 @@
a {
color: $white;
text-decoration: underline;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
.social-media-links--platforms {
......@@ -30,6 +34,15 @@
}
}
}
.nav > li > a:hover, .nav > li > a:focus {
background-color: transparent;
color: $white;
}
.nav > li > a {
padding: 0;
}
}
#subfoot {
......@@ -45,7 +58,11 @@
a {
color: $white;
text-decoration: underline;
text-decoration: none;
&:hover {
text-decoration: underline;
}
}
.sf-col2 {
......@@ -68,6 +85,35 @@
}
//
// Address
// --------------------------------------------------
.footer-address {
margin-bottom: 20px;
}
.footer-email {
margin-bottom: 20px;
a {
text-decoration: none;
&:hover {
color: $white;
text-decoration: underline;
}
}
}
.footer-phone {
margin-bottom: 20px;
padding: 10px 0;
border-top: solid $gray-6 1px;
border-bottom: solid $gray-6 1px;
}
//
// Social Media
// --------------------------------------------------
......
......@@ -21,10 +21,6 @@
background-color: #f5f5f5;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -38,10 +34,6 @@
background-color: #e9eff7;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -55,10 +47,6 @@
background-color: #f3e9ef;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -72,10 +60,6 @@
background-color: #f5f5ee;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -89,10 +73,6 @@
background-color: #f1f8f7;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -106,10 +86,6 @@
background-color: #eaf0f1;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......@@ -123,10 +99,6 @@
background-color: #f6f9da;
color: $black-base;
a {
color: $black-base;
}
.paragraph--type--tabs a:hover {
color: $gray;
}
......
......@@ -2016,18 +2016,31 @@ h5, h6 {
/* line 18, ../assets/sass/layout/_footer.scss */
.footer a {
color: #ffffff;
text-decoration: none;
}
/* line 22, ../assets/sass/layout/_footer.scss */
.footer a:hover {
text-decoration: underline;
}
/* line 25, ../assets/sass/layout/_footer.scss */
/* line 29, ../assets/sass/layout/_footer.scss */
.footer .social-media-links--platforms a {
color: #ffffff;
}
/* line 28, ../assets/sass/layout/_footer.scss */
/* line 32, ../assets/sass/layout/_footer.scss */
.footer .social-media-links--platforms a:hover {
color: #cccccc;
}
/* line 38, ../assets/sass/layout/_footer.scss */
.footer .nav > li > a:hover, .footer .nav > li > a:focus {
background-color: transparent;
color: #ffffff;
}
/* line 43, ../assets/sass/layout/_footer.scss */
.footer .nav > li > a {
padding: 0;
}
/* line 35, ../assets/sass/layout/_footer.scss */
/* line 48, ../assets/sass/layout/_footer.scss */
#subfoot {
background: #333333;
float: left;
......@@ -2035,83 +2048,114 @@ h5, h6 {
color: #ffffff;
padding: 20px 0;
}
/* line 42, ../assets/sass/layout/_footer.scss */
/* line 55, ../assets/sass/layout/_footer.scss */
#subfoot p {
color: #ffffff;
}
/* line 46, ../assets/sass/layout/_footer.scss */
/* line 59, ../assets/sass/layout/_footer.scss */
#subfoot a {
color: #ffffff;
text-decoration: none;
}
/* line 63, ../assets/sass/layout/_footer.scss */
#subfoot a:hover {
text-decoration: underline;
}
/* line 51, ../assets/sass/layout/_footer.scss */
/* line 68, ../assets/sass/layout/_footer.scss */
#subfoot .sf-col2 {
text-align: right;
}
/* line 54, ../assets/sass/layout/_footer.scss */
/* line 71, ../assets/sass/layout/_footer.scss */
#subfoot .sf-col2 ul {
list-style-type: none;
}
@media (max-width: 768px) {
/* line 60, ../assets/sass/layout/_footer.scss */
/* line 77, ../assets/sass/layout/_footer.scss */
#subfoot .col-xs-12 {
text-align: center;
}
/* line 63, ../assets/sass/layout/_footer.scss */
/* line 80, ../assets/sass/layout/_footer.scss */
#subfoot .col-xs-12 ul {
padding: 0;
}
}
/* line 75, ../assets/sass/layout/_footer.scss */
/* line 92, ../assets/sass/layout/_footer.scss */
.footer-address {
margin-bottom: 20px;
}
/* line 96, ../assets/sass/layout/_footer.scss */
.footer-email {
margin-bottom: 20px;
}
/* line 99, ../assets/sass/layout/_footer.scss */
.footer-email a {
text-decoration: none;
}
/* line 102, ../assets/sass/layout/_footer.scss */
.footer-email a:hover {
color: #ffffff;
text-decoration: underline;
}
/* line 109, ../assets/sass/layout/_footer.scss */
.footer-phone {
margin-bottom: 20px;
padding: 10px 0;
border-top: solid #666666 1px;
border-bottom: solid #666666 1px;
}
/* line 121, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms {
float: right;
}
/* line 78, ../assets/sass/layout/_footer.scss */
/* line 124, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-twitter:before {
content: "\f081";
}
/* line 82, ../assets/sass/layout/_footer.scss */
/* line 128, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-facebook:before {
content: "\f082";
}
/* line 86, ../assets/sass/layout/_footer.scss */
/* line 132, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-rss:before {
content: "\f143";
}
/* line 90, ../assets/sass/layout/_footer.scss */
/* line 136, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-youtube:before {
content: "\f166";
}
/* line 94, ../assets/sass/layout/_footer.scss */
/* line 140, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-linkedin:before {
content: "\f08c";
}
/* line 98, ../assets/sass/layout/_footer.scss */
/* line 144, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-envelope:before {
content: "\f199";
}
/* line 102, ../assets/sass/layout/_footer.scss */
/* line 148, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-github:before {
content: "\f092";
}
/* line 106, ../assets/sass/layout/_footer.scss */
/* line 152, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-bitbucket:before {
content: "\f172";
}
/* line 110, ../assets/sass/layout/_footer.scss */
/* line 156, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-tumblr:before {
content: "\f174";
}
/* line 114, ../assets/sass/layout/_footer.scss */
/* line 160, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-behance:before {
content: "\f1b5";
}
/* line 118, ../assets/sass/layout/_footer.scss */
/* line 164, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-pinterest:before {
content: "\f0d3";
}
/* line 122, ../assets/sass/layout/_footer.scss */
/* line 168, ../assets/sass/layout/_footer.scss */
.social-media-links--platforms .fa-google-plus:before {
content: "\f0d4";
}
......@@ -2283,276 +2327,248 @@ h5, h6 {
color: #000000;
}
/* line 24, ../assets/sass/layout/_section-background-colors.scss */
.lgray-bg a {
color: #000000;
}
/* line 28, ../assets/sass/layout/_section-background-colors.scss */
.lgray-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 32, ../assets/sass/layout/_section-background-colors.scss */
/* line 28, ../assets/sass/layout/_section-background-colors.scss */
.lgray-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 37, ../assets/sass/layout/_section-background-colors.scss */
/* line 33, ../assets/sass/layout/_section-background-colors.scss */
.lblue-bg {
background-color: #e9eff7;
color: #000000;
}
/* line 41, ../assets/sass/layout/_section-background-colors.scss */
.lblue-bg a {
color: #000000;
}
/* line 45, ../assets/sass/layout/_section-background-colors.scss */
/* line 37, ../assets/sass/layout/_section-background-colors.scss */
.lblue-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 49, ../assets/sass/layout/_section-background-colors.scss */
/* line 41, ../assets/sass/layout/_section-background-colors.scss */
.lblue-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 54, ../assets/sass/layout/_section-background-colors.scss */
/* line 46, ../assets/sass/layout/_section-background-colors.scss */
.lviolet-bg {
background-color: #f3e9ef;
color: #000000;
}
/* line 58, ../assets/sass/layout/_section-background-colors.scss */
.lviolet-bg a {
color: #000000;
}
/* line 62, ../assets/sass/layout/_section-background-colors.scss */
/* line 50, ../assets/sass/layout/_section-background-colors.scss */
.lviolet-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 66, ../assets/sass/layout/_section-background-colors.scss */
/* line 54, ../assets/sass/layout/_section-background-colors.scss */
.lviolet-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 71, ../assets/sass/layout/_section-background-colors.scss */
/* line 59, ../assets/sass/layout/_section-background-colors.scss */
.ltaupe-bg {
background-color: #f5f5ee;
color: #000000;
}
/* line 75, ../assets/sass/layout/_section-background-colors.scss */
.ltaupe-bg a {
color: #000000;
}
/* line 79, ../assets/sass/layout/_section-background-colors.scss */
/* line 63, ../assets/sass/layout/_section-background-colors.scss */
.ltaupe-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 83, ../assets/sass/layout/_section-background-colors.scss */
/* line 67, ../assets/sass/layout/_section-background-colors.scss */
.ltaupe-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 88, ../assets/sass/layout/_section-background-colors.scss */
/* line 72, ../assets/sass/layout/_section-background-colors.scss */
.lturquoise-bg {
background-color: #f1f8f7;
color: #000000;
}
/* line 92, ../assets/sass/layout/_section-background-colors.scss */
.lturquoise-bg a {
color: #000000;
}
/* line 96, ../assets/sass/layout/_section-background-colors.scss */
/* line 76, ../assets/sass/layout/_section-background-colors.scss */
.lturquoise-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 100, ../assets/sass/layout/_section-background-colors.scss */
/* line 80, ../assets/sass/layout/_section-background-colors.scss */
.lturquoise-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 105, ../assets/sass/layout/_section-background-colors.scss */
/* line 85, ../assets/sass/layout/_section-background-colors.scss */
.lteal-bg {
background-color: #eaf0f1;
color: #000000;
}
/* line 109, ../assets/sass/layout/_section-background-colors.scss */
.lteal-bg a {
color: #000000;
}
/* line 113, ../assets/sass/layout/_section-background-colors.scss */
/* line 89, ../assets/sass/layout/_section-background-colors.scss */
.lteal-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 117, ../assets/sass/layout/_section-background-colors.scss */
/* line 93, ../assets/sass/layout/_section-background-colors.scss */
.lteal-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 122, ../assets/sass/layout/_section-background-colors.scss */
/* line 98, ../assets/sass/layout/_section-background-colors.scss */
.lyellow-bg {
background-color: #f6f9da;
color: #000000;
}
/* line 126, ../assets/sass/layout/_section-background-colors.scss */
.lyellow-bg a {
color: #000000;
}
/* line 130, ../assets/sass/layout/_section-background-colors.scss */
/* line 102, ../assets/sass/layout/_section-background-colors.scss */
.lyellow-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 134, ../assets/sass/layout/_section-background-colors.scss */
/* line 106, ../assets/sass/layout/_section-background-colors.scss */
.lyellow-bg .field--name-field-callout-link a:hover {
color: #000000;
}
/* line 144, ../assets/sass/layout/_section-background-colors.scss */
/* line 116, ../assets/sass/layout/_section-background-colors.scss */
.dgray-bg {
background-color: #4A4A4A;
color: #ffffff;
}
/* line 148, ../assets/sass/layout/_section-background-colors.scss */
/* line 120, ../assets/sass/layout/_section-background-colors.scss */
.dgray-bg p {
color: #ffffff;
}
/* line 152, ../assets/sass/layout/_section-background-colors.scss */
/* line 124, ../assets/sass/layout/_section-background-colors.scss */
.dgray-bg a {
color: #ffffff;
}
/* line 156, ../assets/sass/layout/_section-background-colors.scss */
/* line 128, ../assets/sass/layout/_section-background-colors.scss */
.dgray-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 160, ../assets/sass/layout/_section-background-colors.scss */
/* line 132, ../assets/sass/layout/_section-background-colors.scss */
.dgray-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 165, ../assets/sass/layout/_section-background-colors.scss */
/* line 137, ../assets/sass/layout/_section-background-colors.scss */
.dscarlet-bg {
background-color: #830000;
color: #ffffff;
}
/* line 169, ../assets/sass/layout/_section-background-colors.scss */
/* line 141, ../assets/sass/layout/_section-background-colors.scss */
.dscarlet-bg p {
color: #ffffff;
}
/* line 173, ../assets/sass/layout/_section-background-colors.scss */
/* line 145, ../assets/sass/layout/_section-background-colors.scss */
.dscarlet-bg a {
color: #ffffff;
}
/* line 177, ../assets/sass/layout/_section-background-colors.scss */
/* line 149, ../assets/sass/layout/_section-background-colors.scss */
.dscarlet-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 181, ../assets/sass/layout/_section-background-colors.scss */
/* line 153, ../assets/sass/layout/_section-background-colors.scss */
.dscarlet-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 186, ../assets/sass/layout/_section-background-colors.scss */
/* line 158, ../assets/sass/layout/_section-background-colors.scss */
.dviolet-bg {
background-color: #5d1542;
color: #ffffff;
}
/* line 190, ../assets/sass/layout/_section-background-colors.scss */
/* line 162, ../assets/sass/layout/_section-background-colors.scss */
.dviolet-bg p {
color: #ffffff;
}
/* line 194, ../assets/sass/layout/_section-background-colors.scss */
/* line 166, ../assets/sass/layout/_section-background-colors.scss */
.dviolet-bg a {
color: #ffffff;
}
/* line 198, ../assets/sass/layout/_section-background-colors.scss */
/* line 170, ../assets/sass/layout/_section-background-colors.scss */
.dviolet-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 202, ../assets/sass/layout/_section-background-colors.scss */
/* line 174, ../assets/sass/layout/_section-background-colors.scss */
.dviolet-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 207, ../assets/sass/layout/_section-background-colors.scss */
/* line 179, ../assets/sass/layout/_section-background-colors.scss */
.dteal-bg {
background-color: #1b494c;
color: #ffffff;
}
/* line 211, ../assets/sass/layout/_section-background-colors.scss */
/* line 183, ../assets/sass/layout/_section-background-colors.scss */
.dteal-bg p {
color: #ffffff;
}
/* line 215, ../assets/sass/layout/_section-background-colors.scss */
/* line 187, ../assets/sass/layout/_section-background-colors.scss */
.dteal-bg a {
color: #ffffff;
}
/* line 219, ../assets/sass/layout/_section-background-colors.scss */
/* line 191, ../assets/sass/layout/_section-background-colors.scss */
.dteal-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 223, ../assets/sass/layout/_section-background-colors.scss */
/* line 195, ../assets/sass/layout/_section-background-colors.scss */
.dteal-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 228, ../assets/sass/layout/_section-background-colors.scss */
/* line 200, ../assets/sass/layout/_section-background-colors.scss */
.dpurple-bg {
background-color: #442369;
color: #ffffff;
}
/* line 232, ../assets/sass/layout/_section-background-colors.scss */
/* line 204, ../assets/sass/layout/_section-background-colors.scss */
.dpurple-bg p {
color: #ffffff;
}
/* line 236, ../assets/sass/layout/_section-background-colors.scss */
/* line 208, ../assets/sass/layout/_section-background-colors.scss */
.dpurple-bg a {
color: #ffffff;
}
/* line 240, ../assets/sass/layout/_section-background-colors.scss */
/* line 212, ../assets/sass/layout/_section-background-colors.scss */
.dpurple-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 244, ../assets/sass/layout/_section-background-colors.scss */
/* line 216, ../assets/sass/layout/_section-background-colors.scss */
.dpurple-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 249, ../assets/sass/layout/_section-background-colors.scss */
/* line 221, ../assets/sass/layout/_section-background-colors.scss */
.dgreen-bg {
background-color: #565b22;
color: #ffffff;
}
/* line 253, ../assets/sass/layout/_section-background-colors.scss */
/* line 225, ../assets/sass/layout/_section-background-colors.scss */
.dgreen-bg p {
color: #ffffff;
}
/* line 257, ../assets/sass/layout/_section-background-colors.scss */
/* line 229, ../assets/sass/layout/_section-background-colors.scss */
.dgreen-bg a {
color: #ffffff;
}
/* line 261, ../assets/sass/layout/_section-background-colors.scss */
/* line 233, ../assets/sass/layout/_section-background-colors.scss */
.dgreen-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 265, ../assets/sass/layout/_section-background-colors.scss */
/* line 237, ../assets/sass/layout/_section-background-colors.scss */
.dgreen-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
/* line 270, ../assets/sass/layout/_section-background-colors.scss */
/* line 242, ../assets/sass/layout/_section-background-colors.scss */
.dorange-bg {
background-color: #953d1c;
color: #ffffff;
}
/* line 274, ../assets/sass/layout/_section-background-colors.scss */
/* line 246, ../assets/sass/layout/_section-background-colors.scss */
.dorange-bg p {
color: #ffffff;
}
/* line 278, ../assets/sass/layout/_section-background-colors.scss */
/* line 250, ../assets/sass/layout/_section-background-colors.scss */
.dorange-bg a {
color: #ffffff;
}
/* line 282, ../assets/sass/layout/_section-background-colors.scss */
/* line 254, ../assets/sass/layout/_section-background-colors.scss */
.dorange-bg .paragraph--type--tabs a:hover {
color: #555555;
}
/* line 286, ../assets/sass/layout/_section-background-colors.scss */
/* line 258, ../assets/sass/layout/_section-background-colors.scss */
.dorange-bg .field--name-field-callout-link a:hover {
color: #ffffff;
}
......
......@@ -75,7 +75,7 @@ jQuery(document).ready(function(){
});
//sets bgcolor for events, news, and people sections on homepage
if (jQuery(".region-events")[0] && jQuery(".region-people")[0]) {
if (jQuery(".region-events")[0] && jQuery(".region-people")[0] && jQuery(".region-news")[0]) {
jQuery( ".region-events" ).addClass( "block-bg-color" );
jQuery( ".region-people" ).addClass( "block-bg-color" );
}
......
{#
/**
* @file
* Default theme implementation to display Contact Info block in Footer One.
*
* Available variables:
* - $block->subject: Block title.
* - $content: Block content.
* - $block->module: Module that generated the block.
* - $block->delta: An ID for the block, unique within each module.
* - $block->region: The block region embedding the current block.
* - $classes: String of classes that can be used to style contextually through
* CSS. It can be manipulated through the variable $classes_array from
* preprocess functions. The default values can be one or more of the
* following:
* - block: The current template type, i.e., "theming hook".
* - block-[module]: The module generating the block. For example, the user
* module is responsible for handling the default user navigation block. In
* that case the class would be 'block-user'.
* - $title_prefix (array): An array containing additional output populated by
* modules, intended to be displayed in front of the main title tag that
* appears in the template.
* - $title_suffix (array): An array containing additional output populated by
* modules, intended to be displayed after the main title tag that appears in
* the template.
*
* Helper variables:
* - $classes_array: Array of html class attribute values. It is flattened
* into a string within the variable $classes.
* - $block_zebra: Outputs 'odd' and 'even' dependent on each block region.
* - $zebra: Same output as $block_zebra but independent of any block region.
* - $block_id: Counter dependent on each block region.
* - $id: Same output as $block_id but independent of any block region.
* - $is_front: Flags true when presented in the front page.
* - $logged_in: Flags true when the current user is a logged-in member.
* - $is_admin: Flags true when the current user is an administrator.
* - $block_html_id: A valid HTML ID and guaranteed unique.
*
* @ingroup templates
*
* @see bootstrap_preprocess_block()
* @see template_preprocess()
* @see template_preprocess_block()
* @see bootstrap_process_block()
* @see template_process()
*/
#}
<div class="footer-address">
<h3>Contact Us</h3>
<p>
{% if content.field_address1.0 %}
{{ content.field_address1.0 }}<br/>
{% endif %}
{% if content.field_address2.0 %}
{{ content.field_address2.0 }}<br/>
{% endif %}
{% if content.field_city.0 %}
{{ content.field_city.0 }}
{% endif %}
{% if content.field_state.0 %}
{{ content.field_state.0 }},
{% endif %}
{% if content.field_zip.0 %}
{{ content.field_zip.0 }}
{% endif %}
</p>
</div>
<div class="footer-email">
<p>E-Mail: <a href"mailto:{{ site_mail }}">{{ site_mail }}</a></p>
</div>
<div class="footer-phone">
<p>
{% if content.field_phone.0 %}
Phone: {{ content.field_phone.0 }}
{% endif %}
{% if content.field_fax.0 %}
<br/>
Fax: {{ content.field_fax.0 }}
{% endif %}
</p>
</div>
......@@ -6,6 +6,8 @@
{{ page.footer_one }}
{{ site_mail }}
{% endblock %}
{% endif %}
</div>
......
......@@ -117,25 +117,27 @@
</section>
<aside class="col-sm-3" role="complementary">
{# Sidebar Second #}
{% if page.sidebar_menu %}
{% block sidebar_menu %}
{% if (page.sidemenu or page.sidebar_second) %}
<aside class="col-sm-3" role="complementary">
{# Sidebar Second #}
{% if page.sidebar_menu %}
{% block sidebar_menu %}
{{ page.sidebar_menu }}
{{ page.sidebar_menu }}
{% endblock %}
{% endif %}
{% endblock %}
{% endif %}
{# Sidebar Second #}
{% if page.sidebar_second %}
{% block sidebar_second %}
{# Sidebar Second #}
{% if page.sidebar_second %}
{% block sidebar_second %}
{{ page.sidebar_second }}
{{ page.sidebar_second }}
{% endblock %}
{% endif %}
</aside>
{% endblock %}
{% endif %}
</aside>
{% endif %}
</div>
</div>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment