Merge pull request #36 from ASCWebServices/canini

asc_bootstrap - adding new sidebar region, updating sass

web/themes/asc_bootstrap/asc_bootstrap.info.yml

@@ -13,7 +13,7 @@ regions:
   events: 'Events'
   news: 'News'
   people: 'People'
-  sidebar_first: 'Left Siderbar'
+  sidebar_menu: 'Sidebar Menu'
   sidebar_second: 'Right Siderbar'
   footer_one: 'Footer One'
   footer_two: 'Footer Two'

web/themes/asc_bootstrap/assets/sass/components/_filters.scss

+@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;
+  }
+}

web/themes/asc_bootstrap/assets/sass/helpers/_variables.scss

@@ -172,13 +172,13 @@ $table-border-color:            #ddd !default;
 
 $btn-font-weight:                normal !default;
 
-$btn-default-color:              $white !default;
-$btn-default-bg:                 #960000 !default;
-$btn-default-border:             #830000 !default;
+$btn-default-color:              $brand-gray !default;
+$btn-default-bg:                 $white !default;
+$btn-default-border:             $brand-gray !default;
 
-$btn-primary-color:              $brand-gray !default;
-$btn-primary-bg:                 $white !default;
-$btn-primary-border:             $brand-gray !default;
+$btn-primary-color:              $white !default;
+$btn-primary-bg:                 #960000 !default;
+$btn-primary-border:             #830000 !default;
 
 $btn-success-color:              #fff !default;
 $btn-success-bg:                 $brand-success !default;

web/themes/asc_bootstrap/assets/sass/layout/_aside.scss

@@ -15,6 +15,36 @@ aside {
     padding: 5px 15px 20px;
     background: #efefef;
     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;
+          }
+      }
+    }
   }
 }
 

web/themes/asc_bootstrap/assets/sass/layout/_default.scss

@@ -144,7 +144,7 @@ a:hover {
 }
 
 .img-responsive {
-  width: 100%;
+  width: auto;
 }
 
 .hov {

web/themes/asc_bootstrap/assets/sass/layout/_footer.scss

@@ -11,9 +11,24 @@
   color: $white;
   margin-top: 0;
 
-  a {
+  p, h2, h3 {
     color: $white;
   }
+
+  a {
+    color: #d4df48;
+  }
+
+  .social-media-links--platforms {
+
+    a {
+      color: $white;
+
+      &:hover {
+        color: #d4df48;
+      }
+    }
+  }
 }
 
 #subfoot {
@@ -23,10 +38,14 @@
   color: $white;
   padding: 20px 0;
 
-  a {
+  p {
     color: $white;
   }
 
+  a {
+    color: #d4df48;
+  }
+
   .sf-col2 {
     text-align: right;
 

web/themes/asc_bootstrap/assets/sass/style.scss

@@ -5,9 +5,9 @@
  */
 
 // Core variables and mixins
-@import "helpers/variables";
-@import "helpers/mixins";
 @import "helpers/functions";
+@import "helpers/mixins";
+@import "helpers/variables";
 @import "../../bootstrap/stylesheets/bootstrap/mixins";
 
 // Reset and dependencies
@@ -16,10 +16,10 @@
 @import "../../bootstrap/stylesheets/bootstrap/glyphicons";
 
 //Custom Layout
-@import "layout/default";
 @import "layout/aside";
-@import "layout/header";
+@import "layout/default";
 @import "layout/footer";
+@import "layout/header";
 @import "layout/section-background-colors";
 
 // Core CSS
@@ -32,16 +32,17 @@
 @import "../../bootstrap/stylesheets/bootstrap/buttons";
 
 //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/news";
+@import "components/cbpmenu";
 @import "components/events";
+@import "components/fields";
+@import "components/filters";
+@import "components/menu";
+@import "components/paragraphs";
 @import "components/people";
+@import "components/people-styles";
+@import "components/simplemenu";
 
 // Components
 @import "../../bootstrap/stylesheets/bootstrap/component-animations";
@@ -77,5 +78,6 @@
 @import "../../bootstrap/stylesheets/bootstrap/responsive-utilities";
 
 // Custom Pages
-@import "pages/landing-page";
 @import "pages/basic-page";
+@import "pages/landing-page";
+

web/themes/asc_bootstrap/templates/system/page.html.twig

@@ -66,15 +66,6 @@
     <div class="container">
     <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 #}
       {%
         set content_classes = [
@@ -126,14 +117,25 @@
 
       </section>
 
-      {# Sidebar Second #}
-      {% if page.sidebar_second %}
-        {% block sidebar_second %}
-          <aside class="col-sm-3" role="complementary">
+      <aside class="col-sm-3" role="complementary">
+        {# Sidebar Second #}
+        {% if page.sidebar_menu %}
+          {% block sidebar_menu %}
+
+            {{ page.sidebar_menu }}
+
+          {% endblock %}
+        {% endif %}
+
+        {# Sidebar Second #}
+        {% if page.sidebar_second %}
+          {% block sidebar_second %}
+
             {{ page.sidebar_second }}
-          </aside>
-        {% endblock %}
-      {% endif %}
+
+          {% endblock %}
+        {% endif %}
+      </aside>
     </div>
   </div>
 </div>