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

asc_bootstrap - adding new sidebar region, updating sass

parent 89adb5e1
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ regions: ...@@ -13,7 +13,7 @@ regions:
events: 'Events' events: 'Events'
news: 'News' news: 'News'
people: 'People' people: 'People'
sidebar_first: 'Left Siderbar' sidebar_menu: 'Sidebar Menu'
sidebar_second: 'Right Siderbar' sidebar_second: 'Right Siderbar'
footer_one: 'Footer One' footer_one: 'Footer One'
footer_two: 'Footer Two' footer_two: 'Footer Two'
......
@import "../helpers/mixins";
@import "../helpers/variables";
@import "../helpers/functions";
//
// Filters
// --------------------------------------------------
.view-events {
.view-filters {
background: #D8D8D8;
padding: 10px;
}
}
.view-news {
.view-filters {
background: #D8D8D8;
padding: 10px;
}
}
...@@ -172,13 +172,13 @@ $table-border-color: #ddd !default; ...@@ -172,13 +172,13 @@ $table-border-color: #ddd !default;
$btn-font-weight: normal !default; $btn-font-weight: normal !default;
$btn-default-color: $white !default; $btn-default-color: $brand-gray !default;
$btn-default-bg: #960000 !default; $btn-default-bg: $white !default;
$btn-default-border: #830000 !default; $btn-default-border: $brand-gray !default;
$btn-primary-color: $brand-gray !default; $btn-primary-color: $white !default;
$btn-primary-bg: $white !default; $btn-primary-bg: #960000 !default;
$btn-primary-border: $brand-gray !default; $btn-primary-border: #830000 !default;
$btn-success-color: #fff !default; $btn-success-color: #fff !default;
$btn-success-bg: $brand-success !default; $btn-success-bg: $brand-success !default;
......
...@@ -15,6 +15,36 @@ aside { ...@@ -15,6 +15,36 @@ aside {
padding: 5px 15px 20px; padding: 5px 15px 20px;
background: #efefef; background: #efefef;
min-height: $full; min-height: $full;
width: $full;
float: left;
}
.region-sidebar-menu {
float: left;
padding: 5px 15px 20px;
background: #efefef;
min-height: $full;
width: $full;
nav {
width: $full;
ul {
width: $full;
.menu {
position: relative;
background-color: transparent;
z-index: 0;
display: block;
float: none;
border: 0;
border-radius: 0;
-webkit-box-shadow: none;
box-shadow: none;
}
}
}
} }
} }
...@@ -144,7 +144,7 @@ a:hover { ...@@ -144,7 +144,7 @@ a:hover {
} }
.img-responsive { .img-responsive {
width: 100%; width: auto;
} }
.hov { .hov {
......
...@@ -11,9 +11,24 @@ ...@@ -11,9 +11,24 @@
color: $white; color: $white;
margin-top: 0; margin-top: 0;
a { p, h2, h3 {
color: $white; color: $white;
} }
a {
color: #d4df48;
}
.social-media-links--platforms {
a {
color: $white;
&:hover {
color: #d4df48;
}
}
}
} }
#subfoot { #subfoot {
...@@ -23,10 +38,14 @@ ...@@ -23,10 +38,14 @@
color: $white; color: $white;
padding: 20px 0; padding: 20px 0;
a { p {
color: $white; color: $white;
} }
a {
color: #d4df48;
}
.sf-col2 { .sf-col2 {
text-align: right; text-align: right;
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
*/ */
// Core variables and mixins // Core variables and mixins
@import "helpers/variables";
@import "helpers/mixins";
@import "helpers/functions"; @import "helpers/functions";
@import "helpers/mixins";
@import "helpers/variables";
@import "../../bootstrap/stylesheets/bootstrap/mixins"; @import "../../bootstrap/stylesheets/bootstrap/mixins";
// Reset and dependencies // Reset and dependencies
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
@import "../../bootstrap/stylesheets/bootstrap/glyphicons"; @import "../../bootstrap/stylesheets/bootstrap/glyphicons";
//Custom Layout //Custom Layout
@import "layout/default";
@import "layout/aside"; @import "layout/aside";
@import "layout/header"; @import "layout/default";
@import "layout/footer"; @import "layout/footer";
@import "layout/header";
@import "layout/section-background-colors"; @import "layout/section-background-colors";
// Core CSS // Core CSS
...@@ -32,16 +32,17 @@ ...@@ -32,16 +32,17 @@
@import "../../bootstrap/stylesheets/bootstrap/buttons"; @import "../../bootstrap/stylesheets/bootstrap/buttons";
//Custom Components //Custom Components
@import "components/people-styles";
@import "components/menu";
@import "components/cbpmenu";
@import "components/simplemenu";
@import "components/paragraphs";
@import "components/fields";
@import "components/video"; @import "components/video";
@import "components/news"; @import "components/news";
@import "components/cbpmenu";
@import "components/events"; @import "components/events";
@import "components/fields";
@import "components/filters";
@import "components/menu";
@import "components/paragraphs";
@import "components/people"; @import "components/people";
@import "components/people-styles";
@import "components/simplemenu";
// Components // Components
@import "../../bootstrap/stylesheets/bootstrap/component-animations"; @import "../../bootstrap/stylesheets/bootstrap/component-animations";
...@@ -77,5 +78,6 @@ ...@@ -77,5 +78,6 @@
@import "../../bootstrap/stylesheets/bootstrap/responsive-utilities"; @import "../../bootstrap/stylesheets/bootstrap/responsive-utilities";
// Custom Pages // Custom Pages
@import "pages/landing-page";
@import "pages/basic-page"; @import "pages/basic-page";
@import "pages/landing-page";
This diff is collapsed.
...@@ -66,15 +66,6 @@ ...@@ -66,15 +66,6 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
{# Sidebar First #}
{% if page.sidebar_first %}
{% block sidebar_first %}
<aside class="col-sm-3" role="complementary">
{{ page.sidebar_first }}
</aside>
{% endblock %}
{% endif %}
{# Content #} {# Content #}
{% {%
set content_classes = [ set content_classes = [
...@@ -126,14 +117,25 @@ ...@@ -126,14 +117,25 @@
</section> </section>
{# Sidebar Second #} <aside class="col-sm-3" role="complementary">
{% if page.sidebar_second %} {# Sidebar Second #}
{% block sidebar_second %} {% if page.sidebar_menu %}
<aside class="col-sm-3" role="complementary"> {% block sidebar_menu %}
{{ page.sidebar_menu }}
{% endblock %}
{% endif %}
{# Sidebar Second #}
{% if page.sidebar_second %}
{% block sidebar_second %}
{{ page.sidebar_second }} {{ page.sidebar_second }}
</aside>
{% endblock %} {% endblock %}
{% endif %} {% endif %}
</aside>
</div> </div>
</div> </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