zurb-foundation 4.1.5 → 4.1.6

data/scss/foundation/components/_side-nav.scss

@@ -1,6 +1,7 @@
 //
 // Side Nav Variables
 //
+$include-html-nav-classes: $include-html-classes !default;
 
 // We use this to control padding.
 $side-nav-padding:           emCalc(14px) 0 !default;
@@ -44,7 +45,7 @@ $side-nav-divider-color:     darken(#fff, 10%) !default;
       color: $link-color;
     }
 
-    &.active a {
+    &.active > a:first-child {
       color: $side-nav-link-color-active;
       font-weight: $side-nav-font-weight;
     }

data/scss/foundation/components/_split-buttons.scss

@@ -1,6 +1,7 @@
 //
 // Split Button Variables
 //
+$include-html-button-classes: $include-html-classes !default;
 
 // We use these to control different shared styles for Split Buttons
 $split-button-function-factor: 15% !default;

data/scss/foundation/components/_sub-nav.scss

@@ -1,6 +1,7 @@
 //
 // Sub Nav Variables
 //
+$include-html-nav-classes: $include-html-classes !default;
 
 // We use these to control margin and padding
 $sub-nav-list-margin:        emCalc(-4px) 0 emCalc(18px) !default;

data/scss/foundation/components/_switch.scss

@@ -1,6 +1,7 @@
 //
 // Switch Variables
 //
+$include-html-form-classes: $include-html-classes !default;
 
 // Controlling border styles and background colors for the switch container
 $switch-border-color:             darken(#fff, 20%) !default;
@@ -78,7 +79,8 @@ $switch-label-outline:            1px dotted #888 !default;
     opacity: 0;
     width: 100%;
     height: 100%;
-
+    -moz-appearance: none;
+    
     // Hover and focus styles for the paddle
     &:hover,
     &:focus {
@@ -212,7 +214,7 @@ $switch-label-outline:            1px dotted #888 !default;
   @include switch-style($paddle-bg, $positive-color, $negative-color, $radius, $base-style);
 }
 
-@if $include-html-button-classes != false {
+@if $include-html-form-classes != false {
 
   /* Foundation Switches */
   @media only screen {

data/scss/foundation/components/_tables.scss

@@ -1,6 +1,7 @@
 //
 // Table Variables
 //
+$include-html-table-classes: $include-html-classes !default;
 
 // These control the background color for the table and even rows
 $table-bg:               #fff !default;
@@ -73,8 +74,11 @@ $table-margin-bottom:    emCalc(20px) !default;
   tfoot tr td { display: $table-display; line-height: $table-line-height; }
 }
 
+@if $include-html-table-classes {
+
+  /* Tables */
+  table {
+    @include table;
+  }
 
-/* Tables */
-table {
-  @include table;
 }

data/scss/foundation/components/_thumbs.scss

@@ -1,6 +1,7 @@
 //
 // Image Thumbnail Variables
 //
+$include-html-media-classes: $include-html-classes !default;
 
 // We use these to control border styles
 $thumb-border-style:     solid !default;

data/scss/foundation/components/_tooltips.scss

@@ -1,6 +1,8 @@
 //
 // Tooltip Variables
 //
+$include-html-tooltip-classes: $include-html-classes !default;
+
 $has-tip-border-bottom:       dotted 1px #ccc !default;
 $has-tip-font-weight:         bold !default;
 $has-tip-font-color:          #333 !default;
@@ -21,93 +23,95 @@ $tooltip-font-size-sml:       emCalc(14px) !default;
 $tooltip-radius:              $global-radius !default;
 $tooltip-pip-size:            5px !default;
 
-
-/* Tooltips */
-
-.has-tip {
-  border-bottom: $has-tip-border-bottom;
-  cursor: $has-tip-cursor-type;
-  font-weight: $has-tip-font-weight;
-  color: $has-tip-font-color;
-
-  &:hover,
-  &:focus {
-    border-bottom: $has-tip-border-bottom-hover;
-    color: $has-tip-font-color-hover;
-  }
-
-  &.tip-left,
-  &.tip-right { float: none !important; }
-}
-
-.tooltip {
-  display: none;
-  position: absolute;
-  z-index: 999;
-  font-weight: $tooltip-font-weight;
-  font-size: $tooltip-font-size;
-  line-height: $tooltip-line-height;
-  padding: $tooltip-padding;
-  max-width: 85%;
-  #{$default-float}: 50%;
-  width: 100%;
-  color: $tooltip-font-color;
-  background: $tooltip-bg;
-  @include radius($tooltip-radius);
-
-  &>.nub {
-    display: block;
-    #{$default-float}: $tooltip-pip-size;
-    position: absolute;
-    width: 0;
-    height: 0;
-    border: solid $tooltip-pip-size;
-    border-color: transparent transparent $tooltip-bg transparent;
-    top: -($tooltip-pip-size * 2);
-  }
-
-  &.opened {
-    color: $has-tip-font-color-hover !important;
-    border-bottom: $has-tip-border-bottom-hover !important;
+@if $include-html-tooltip-classes != false {
+  
+  /* Tooltips */
+  .has-tip {
+    border-bottom: $has-tip-border-bottom;
+    cursor: $has-tip-cursor-type;
+    font-weight: $has-tip-font-weight;
+    color: $has-tip-font-color;
+  
+    &:hover,
+    &:focus {
+      border-bottom: $has-tip-border-bottom-hover;
+      color: $has-tip-font-color-hover;
+    }
+  
+    &.tip-left,
+    &.tip-right { float: none !important; }
   }
-}
-
-.tap-to-close {
-  display: block;
-  font-size: $tooltip-close-font-size;
-  color: $tooltip-close-font-color;
-  font-weight: $tooltip-close-font-weight;
-}
-
-@media #{$small} {
+  
   .tooltip {
+    display: none;
+    position: absolute;
+    z-index: 999;
+    font-weight: $tooltip-font-weight;
+    font-size: $tooltip-font-size;
+    line-height: $tooltip-line-height;
+    padding: $tooltip-padding;
+    max-width: 85%;
+    #{$default-float}: 50%;
+    width: 100%;
+    color: $tooltip-font-color;
+    background: $tooltip-bg;
+    @include radius($tooltip-radius);
+  
     &>.nub {
+      display: block;
+      #{$default-float}: $tooltip-pip-size;
+      position: absolute;
+      width: 0;
+      height: 0;
+      border: solid $tooltip-pip-size;
       border-color: transparent transparent $tooltip-bg transparent;
       top: -($tooltip-pip-size * 2);
     }
-    &.tip-top>.nub {
-      border-color: $tooltip-bg transparent transparent transparent;
-      top: auto;
-      bottom: -($tooltip-pip-size * 2);
-    }
-
-    &.tip-left,
-    &.tip-right { float: none !important; }
-
-    &.tip-left>.nub {
-      border-color: transparent transparent transparent $tooltip-bg;
-      right: -($tooltip-pip-size * 2);
-      left: auto;
-      top: 50%;
-      margin-top: -$tooltip-pip-size;
+  
+    &.opened {
+      color: $has-tip-font-color-hover !important;
+      border-bottom: $has-tip-border-bottom-hover !important;
     }
-    &.tip-right>.nub {
-      border-color: transparent $tooltip-bg transparent transparent;
-      right: auto;
-      left: -($tooltip-pip-size * 2);
-      top: 50%;
-      margin-top: -$tooltip-pip-size;
+  }
+  
+  .tap-to-close {
+    display: block;
+    font-size: $tooltip-close-font-size;
+    color: $tooltip-close-font-color;
+    font-weight: $tooltip-close-font-weight;
+  }
+  
+  @media #{$small} {
+    .tooltip {
+      &>.nub {
+        border-color: transparent transparent $tooltip-bg transparent;
+        top: -($tooltip-pip-size * 2);
+      }
+      &.tip-top>.nub {
+        border-color: $tooltip-bg transparent transparent transparent;
+        top: auto;
+        bottom: -($tooltip-pip-size * 2);
+      }
+  
+      &.tip-left,
+      &.tip-right { float: none !important; }
+  
+      &.tip-left>.nub {
+        border-color: transparent transparent transparent $tooltip-bg;
+        right: -($tooltip-pip-size * 2);
+        left: auto;
+        top: 50%;
+        margin-top: -$tooltip-pip-size;
+      }
+      &.tip-right>.nub {
+        border-color: transparent $tooltip-bg transparent transparent;
+        right: auto;
+        left: -($tooltip-pip-size * 2);
+        top: 50%;
+        margin-top: -$tooltip-pip-size;
+      }
+  
     }
-
   }
-}
+
+}

data/scss/foundation/components/_top-bar.scss

@@ -1,6 +1,7 @@
 //
 // Top Bar Variables
 //
+$include-html-nav-classes: $include-html-classes !default;
 
 // Background color for the top bar
 $topbar-bg: #111 !default;
@@ -44,416 +45,420 @@ $topbar-transition-speed: 300ms !default;
 $topbar-breakpoint: emCalc(940px) !default; // Change to 9999px for always mobile layout
 $topbar-media-query: "only screen and (min-width:"#{$topbar-breakpoint}")" !default;
 
+@if $include-html-nav-classes {
 
-/* Wrapped around .top-bar to contain to grid width */
-.contain-to-grid {
-  width: 100%;
-  background: $topbar-bg;
-}
-
-// Wrapped around .top-bar to make it fixed at the top
-.fixed {
-  width: 100%;
-  #{$default-float}: 0;
-  position: fixed;
-  top: 0;
-  z-index: 99;
-}
+  /* Wrapped around .top-bar to contain to grid width */
+  .contain-to-grid {
+    width: 100%;
+    background: $topbar-bg;
+  }
 
-.top-bar {
-  overflow: hidden;
-  height: $topbar-height;
-  line-height: $topbar-height;
-  position: relative;
-  background: $topbar-bg;
-  margin-bottom: $topbar-margin-bottom;
-
-  // Topbar Global list Styles
-  ul {
-    margin-bottom: 0;
-    list-style: none;
+  // Wrapped around .top-bar to make it fixed at the top
+  .fixed {
+    width: 100%;
+    #{$default-float}: 0;
+    position: fixed;
+    top: 0;
+    z-index: 99;
   }
 
-  .row { max-width: none; }
+  .top-bar {
+    overflow: hidden;
+    height: $topbar-height;
+    line-height: $topbar-height;
+    position: relative;
+    background: $topbar-bg;
+    margin-bottom: $topbar-margin-bottom;
 
-  form,
-  input { margin-bottom: 0; }
+    // Topbar Global list Styles
+    ul {
+      margin-bottom: 0;
+      list-style: none;
+    }
 
-  input { height: $topbar-input-height; }
+    .row { max-width: none; }
 
-  .button { padding-top: .5em; padding-bottom: .5em; margin-bottom: 0; }
+    form,
+    input { margin-bottom: 0; }
 
-  // Title Area
-  .title-area { position: relative; }
+    input { height: $topbar-input-height; }
 
-  .name {
-    height: $topbar-height;
-    margin: 0;
-    font-size: $em-base;
+    .button { padding-top: .5em; padding-bottom: .5em; margin-bottom: 0; }
 
-    h1 {
-      line-height: $topbar-height;
-      font-size: $topbar-title-font-size;
+    // Title Area
+    .title-area { position: relative; }
+
+    .name {
+      height: $topbar-height;
       margin: 0;
+      font-size: $em-base;
+
+      h1 {
+        line-height: $topbar-height;
+        font-size: $topbar-title-font-size;
+        margin: 0;
+        a {
+          font-weight: $topbar-title-weight;
+          color: $topbar-link-color;
+          width: 50%;
+          display: block;
+          padding: 0 $topbar-height / 3;
+        }
+      }
+    }
+
+    // Menu toggle button on small devices
+    .toggle-topbar {
+      position: absolute;
+      #{$opposite-direction}: 0;
+      top: 0;
+
       a {
-        font-weight: $topbar-title-weight;
         color: $topbar-link-color;
-        width: 50%;
+        text-transform: $topbar-menu-link-transform;
+        font-size: $topbar-menu-link-font-size;
+        font-weight: $topbar-menu-link-weight;
+        position: relative;
         display: block;
         padding: 0 $topbar-height / 3;
+        height: $topbar-height;
+        line-height: $topbar-height;
       }
-    }
-  }
 
-  // Menu toggle button on small devices
-  .toggle-topbar {
-    position: absolute;
-    #{$opposite-direction}: 0;
-    top: 0;
+      // Adding the class "menu-icon" will add the 3-line icon people love and adore.
+      &.menu-icon {
+        #{$opposite-direction}: $topbar-height / 3;
+        top: 50%;
+        margin-top: -16px;
+        padding-#{$default-float}: 40px;
 
-    a {
-      color: $topbar-link-color;
-      text-transform: $topbar-menu-link-transform;
-      font-size: $topbar-menu-link-font-size;
-      font-weight: $topbar-menu-link-weight;
-      position: relative;
-      display: block;
-      padding: 0 $topbar-height / 3;
-      height: $topbar-height;
-      line-height: $topbar-height;
-    }
-
-    // Adding the class "menu-icon" will add the 3-line icon people love and adore.
-    &.menu-icon {
-      #{$opposite-direction}: $topbar-height / 3;
-      top: 50%;
-      margin-top: -16px;
-      padding-#{$default-float}: 40px;
-
-      a {
-        text-indent: -48px;
-        width: 34px;
-        height: 34px;
-        line-height: 33px;
-        padding: 0;
-        color: $topbar-menu-link-color;
-
-        span {
-          position: absolute;
-          #{$opposite-direction}: 0;
-          display: block;
-          width: 16px;
-          height: 0;
-          // Shh, don't tell, but box-shadows create the menu icon :)
-          -webkit-box-shadow: 0 10px 0 1px $topbar-menu-icon-color,
-                              0 16px 0 1px $topbar-menu-icon-color,
-                              0 22px 0 1px $topbar-menu-icon-color;
-
-          box-shadow:         0 10px 0 1px $topbar-menu-icon-color,
-                              0 16px 0 1px $topbar-menu-icon-color,
-                              0 22px 0 1px $topbar-menu-icon-color;
+        a {
+          text-indent: -48px;
+          width: 34px;
+          height: 34px;
+          line-height: 33px;
+          padding: 0;
+          color: $topbar-menu-link-color;
+
+          span {
+            position: absolute;
+            #{$opposite-direction}: 0;
+            display: block;
+            width: 16px;
+            height: 0;
+            // Shh, don't tell, but box-shadows create the menu icon :)
+            -webkit-box-shadow: 0 10px 0 1px $topbar-menu-icon-color,
+                                0 16px 0 1px $topbar-menu-icon-color,
+                                0 22px 0 1px $topbar-menu-icon-color;
+
+            box-shadow:         0 10px 0 1px $topbar-menu-icon-color,
+                                0 16px 0 1px $topbar-menu-icon-color,
+                                0 22px 0 1px $topbar-menu-icon-color;
+          }
         }
       }
     }
-  }
 
-  // Change things up when the top-bar is expanded
-  &.expanded {
-    height: auto;
-    background: transparent;
+    // Change things up when the top-bar is expanded
+    &.expanded {
+      height: auto;
+      background: transparent;
+
+      .title-area { background: $topbar-bg; }
 
-    .title-area { background: $topbar-bg; }
+      .toggle-topbar {
+        a { color: $topbar-menu-link-color-toggled;
+          span {
+            // Shh, don't tell, but box-shadows create the menu icon :)
+            -webkit-box-shadow: 0 10px 0 1px $topbar-menu-icon-color-toggled,
+                                0 16px 0 1px $topbar-menu-icon-color-toggled,
+                                0 22px 0 1px $topbar-menu-icon-color-toggled;
 
-    .toggle-topbar {
-      a { color: $topbar-menu-link-color-toggled;
-        span {
-          // Shh, don't tell, but box-shadows create the menu icon :)
-          -webkit-box-shadow: 0 10px 0 1px $topbar-menu-icon-color-toggled,
-                              0 16px 0 1px $topbar-menu-icon-color-toggled,
-                              0 22px 0 1px $topbar-menu-icon-color-toggled;
-
-          box-shadow:         0 10px 0 1px $topbar-menu-icon-color-toggled,
-                              0 16px 0 1px $topbar-menu-icon-color-toggled,
-                              0 22px 0 1px $topbar-menu-icon-color-toggled;
+            box-shadow:         0 10px 0 1px $topbar-menu-icon-color-toggled,
+                                0 16px 0 1px $topbar-menu-icon-color-toggled,
+                                0 22px 0 1px $topbar-menu-icon-color-toggled;
+          }
         }
       }
     }
-  }
-
-}
 
-// Right and Left Navigation that stacked by default
-.top-bar-section {
-  #{$default-float}: 0;
-  position: relative;
-  width: auto;
-  @include single-transition($default-float, $topbar-transition-speed);
-
-  ul {
-    width: 100%;
-    height: auto;
-    display: block;
-    background: $topbar-dropdown-bg;
-    font-size: $em-base;
-    margin: 0;
   }
 
-  .divider,
-  [role="separator"] {
-    border-bottom: solid 1px lighten($topbar-dropdown-bg, 10%);
-    border-top: solid 1px darken($topbar-dropdown-bg, 10%);
-    clear: both;
-    height: 1px;
-    width: 100%;
-  }
+  // Right and Left Navigation that stacked by default
+  .top-bar-section {
+    #{$default-float}: 0;
+    position: relative;
+    width: auto;
+    @include single-transition($default-float, $topbar-transition-speed);
 
-  ul li {
-    & > a {
-      display: block;
+    ul {
       width: 100%;
-      color: $topbar-link-color;
-      padding: 12px 0 12px 0;
-      padding-#{$default-float}: $topbar-height / 3;
-      font-size: $topbar-link-font-size;
-      font-weight: $topbar-link-weight;
+      height: auto;
+      display: block;
       background: $topbar-dropdown-bg;
+      font-size: $em-base;
+      margin: 0;
+    }
 
-      &:hover { background: darken($topbar-dropdown-bg, 3%); }
-
+    .divider,
+    [role="separator"] {
+      border-bottom: solid 1px lighten($topbar-dropdown-bg, 10%);
+      border-top: solid 1px darken($topbar-dropdown-bg, 10%);
+      clear: both;
+      height: 1px;
+      width: 100%;
+    }
 
-      &.button {
-        background: $primary-color;
+    ul li {
+      & > a {
+        display: block;
+        width: 100%;
+        color: $topbar-link-color;
+        padding: 12px 0 12px 0;
+        padding-#{$default-float}: $topbar-height / 3;
         font-size: $topbar-link-font-size;
-        &:hover {
-          background: darken($primary-color, 10%);
+        font-weight: $topbar-link-weight;
+        background: $topbar-dropdown-bg;
+
+        &:hover { background: darken($topbar-dropdown-bg, 3%); }
+
+
+        &.button {
+          background: $primary-color;
+          font-size: $topbar-link-font-size;
+          &:hover {
+            background: darken($primary-color, 10%);
+          }
         }
-      }
-      &.button.secondary {
-        background: $secondary-color;
-        &:hover {
-          background: darken($secondary-color, 10%);
+        &.button.secondary {
+          background: $secondary-color;
+          &:hover {
+            background: darken($secondary-color, 10%);
+          }
         }
-      }
-      &.button.success {
-        background: $success-color;
-        &:hover {
-          background: darken($success-color, 10%);
+        &.button.success {
+          background: $success-color;
+          &:hover {
+            background: darken($success-color, 10%);
+          }
         }
-      }
-      &.button.alert {
-        background: $alert-color;
-        &:hover {
-          background: darken($alert-color, 10%);
+        &.button.alert {
+          background: $alert-color;
+          &:hover {
+            background: darken($alert-color, 10%);
+          }
         }
+
       }
 
+      // Apply the active link color when it has that class
+      &.active > a { background: darken($topbar-dropdown-bg, 3%); }
     }
 
-    // Apply the active link color when it has that class
-    &.active > a { background: darken($topbar-dropdown-bg, 3%); }
-  }
-
-  // Add some extra padding for list items contains buttons
-  .has-form { padding: $topbar-height / 3; }
+    // Add some extra padding for list items contains buttons
+    .has-form { padding: $topbar-height / 3; }
 
-  // Styling for list items that have a dropdown within them.
-  .has-dropdown {
-    position: relative;
+    // Styling for list items that have a dropdown within them.
+    .has-dropdown {
+      position: relative;
 
-    & > a {
-      &:after {
-        @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), $default-float);
-        margin-#{$opposite-direction}: $topbar-height / 3;
-        margin-top: -($topbar-dropdown-toggle-size / 2) - 2;
-        position: absolute;
-        top: 22px;
-        #{$opposite-direction}: 0;
+      & > a {
+        &:after {
+          @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), $default-float);
+          margin-#{$opposite-direction}: $topbar-height / 3;
+          margin-top: -($topbar-dropdown-toggle-size / 2) - 2;
+          position: absolute;
+          top: 22px;
+          #{$opposite-direction}: 0;
+        }
       }
-    }
 
-    &.moved { position: static;
-      & > .dropdown {
-        visibility: visible;
+      &.moved { position: static;
+        & > .dropdown {
+          visibility: visible;
+        }
       }
     }
-  }
 
-  // Styling elements inside of dropdowns
-  .dropdown {
-    position: absolute;
-    #{$default-float}: 100%;
-    top: 0;
-    visibility: hidden;
-    z-index: 99;
-
-    li { width: 100%;
-      a {
-        font-weight: normal;
-        padding: 8px $topbar-height / 3;
-      }
+    // Styling elements inside of dropdowns
+    .dropdown {
+      position: absolute;
+      #{$default-float}: 100%;
+      top: 0;
+      visibility: hidden;
+      z-index: 99;
 
-      &.title h5 { margin-bottom: 0;
+      li { width: 100%;
         a {
-          color: $topbar-link-color;
-          line-height: $topbar-height / 2;
-          display: block;
+          font-weight: normal;
+          padding: 8px $topbar-height / 3;
+        }
+
+        &.title h5 { margin-bottom: 0;
+          a {
+            color: $topbar-link-color;
+            line-height: $topbar-height / 2;
+            display: block;
+          }
         }
       }
-    }
 
-    label {
-      padding: 8px $topbar-height / 3 2px;
-      margin-bottom: 0;
-      text-transform: uppercase;
-      color: $dropdown-label-color;
-      font-weight: bold;
-      font-size: emCalc(10px);
+      label {
+        padding: 8px $topbar-height / 3 2px;
+        margin-bottom: 0;
+        text-transform: uppercase;
+        color: $dropdown-label-color;
+        font-weight: bold;
+        font-size: emCalc(10px);
+      }
     }
   }
-}
-
-// Element that controls breakpoint, no need to change this ever
-.top-bar-js-breakpoint {
-  width: $topbar-breakpoint !important;
-  visibility: hidden;
-}
-.js-generated { display: block; }
-
-
-// Top Bar styles intended for screen sizes above the breakpoint.
-@media #{$topbar-media-query} {
-  .top-bar { background: $topbar-bg; @include clearfix; overflow: visible;
-    .toggle-topbar { display: none; }
-
-    .title-area { float: $default-float; }
-    .name h1 a { width: auto; }
 
-    input,
-    .button {
-      line-height: 2em;
-      font-size: emCalc(14px);
-      height: 2em;
-      padding: 0 10px;
-      position: relative;
-      top: 8px;
-    }
-
-    &.expanded { background: $topbar-bg; }
+  // Element that controls breakpoint, no need to change this ever
+  .top-bar-js-breakpoint {
+    width: $topbar-breakpoint !important;
+    visibility: hidden;
   }
+  .js-generated { display: block; }
 
-  .contain-to-grid .top-bar { max-width: $row-width; margin: 0 auto; margin-bottom: $topbar-margin-bottom; }
 
-  .top-bar-section {
-    @include single-transition(none,0,0);
-    #{$default-float}: 0 !important;
+  // Top Bar styles intended for screen sizes above the breakpoint.
+  @media #{$topbar-media-query} {
+    .top-bar { background: $topbar-bg; @include clearfix; overflow: visible;
+      .toggle-topbar { display: none; }
 
-    ul {
-      width: auto;
-      height: auto !important;
-      display: inline;
+      .title-area { float: $default-float; }
+      .name h1 a { width: auto; }
 
-      li {
-        float: $default-float;
-        .js-generated { display: none; }
+      input,
+      .button {
+        line-height: 2em;
+        font-size: emCalc(14px);
+        height: 2em;
+        padding: 0 10px;
+        position: relative;
+        top: 8px;
       }
-    }
 
-    li {
-      a:not(.button) {
-        padding: 0 $topbar-height / 3;
-        line-height: $topbar-height;
-        background: $topbar-bg;
-        &:hover { background: adjust-color($topbar-dropdown-bg, $lightness: $topbar-link-hover-lightness); }
-      }
+      &.expanded { background: $topbar-bg; }
     }
 
-    .has-dropdown {
-      & > a {
-        padding-#{$opposite-direction}: $topbar-dropdown-toggle-size * 7 !important;
+    .contain-to-grid .top-bar { max-width: $row-width; margin: 0 auto; margin-bottom: $topbar-margin-bottom; }
 
-        &:after {
-          @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), top);
-          margin-top: -($topbar-dropdown-toggle-size / 2);
-        }
-      }
+    .top-bar-section {
+      @include single-transition(none,0,0);
+      #{$default-float}: 0 !important;
+
+      ul {
+        width: auto;
+        height: auto !important;
+        display: inline;
 
-      &.moved { position: relative;
-        & > .dropdown { visibility: hidden; }
+        li {
+          float: $default-float;
+          .js-generated { display: none; }
+        }
       }
 
-      &:hover,
-      &:active {
-        & > .dropdown {
-          visibility: visible;
+      li {
+        a:not(.button) {
+          padding: 0 $topbar-height / 3;
+          line-height: $topbar-height;
+          background: $topbar-bg;
+          &:hover { background: adjust-color($topbar-dropdown-bg, $lightness: $topbar-link-hover-lightness); }
         }
       }
 
-      .dropdown li.has-dropdown {
+      .has-dropdown {
         & > a {
+          padding-#{$opposite-direction}: $topbar-height / 3 + 20 !important;
+
           &:after {
-            border: none;
-            content: "\00bb";
-            margin-top: -15px;
-            #{$opposite-direction}: 5px;
+            @include css-triangle($topbar-dropdown-toggle-size, rgba($topbar-dropdown-toggle-color, $topbar-dropdown-toggle-alpha), top);
+            margin-top: -($topbar-dropdown-toggle-size / 2);
+            top: $topbar-height / 2;
           }
         }
-      }
-
-    }
 
-    .dropdown {
-      #{$default-float}: 0;
-      top: auto;
-      background: transparent;
-      min-width: 100%;
+        &.moved { position: relative;
+          & > .dropdown { visibility: hidden; }
+        }
 
-      li {
-        a {
-          color: $topbar-dropdown-link-color;
-          line-height: 1;
-          white-space: nowrap;
-          padding: 7px $topbar-height / 3;
-          background: lighten($topbar-bg, 5%);
+        &:hover,
+        &:active {
+          & > .dropdown {
+            visibility: visible;
+          }
         }
 
-        label {
-          white-space: nowrap;
-          background: lighten($topbar-bg, 5%);
+        .dropdown li.has-dropdown {
+          & > a {
+            &:after {
+              border: none;
+              content: "\00bb";
+              margin-top: -15px;
+              #{$opposite-direction}: 5px;
+            }
+          }
         }
 
-        // Second Level Dropdowns
-        .dropdown {
-          #{$default-float}: 100%;
-          top: 0;
+      }
+
+      .dropdown {
+        #{$default-float}: 0;
+        top: auto;
+        background: transparent;
+        min-width: 100%;
+
+        li {
+          a {
+            color: $topbar-dropdown-link-color;
+            line-height: 1;
+            white-space: nowrap;
+            padding: 7px $topbar-height / 3;
+            background: lighten($topbar-bg, 5%);
+          }
+
+          label {
+            white-space: nowrap;
+            background: lighten($topbar-bg, 5%);
+          }
+
+          // Second Level Dropdowns
+          .dropdown {
+            #{$default-float}: 100%;
+            top: 0;
+          }
         }
       }
-    }
 
-    & > ul > .divider,
-    & > ul > [role="separator"] {
-      border-bottom: none;
-      border-top: none;
-      border-#{$opposite-direction}: solid 1px lighten($topbar-bg, 10%);
-      border-#{$default-float}: solid 1px darken($topbar-bg, 10%);
-      clear: none;
-      height: $topbar-height;
-      width: 0px;
-    }
+      & > ul > .divider,
+      & > ul > [role="separator"] {
+        border-bottom: none;
+        border-top: none;
+        border-#{$opposite-direction}: solid 1px lighten($topbar-bg, 10%);
+        border-#{$default-float}: solid 1px darken($topbar-bg, 10%);
+        clear: none;
+        height: $topbar-height;
+        width: 0px;
+      }
 
-    .has-form {
-      background: $topbar-bg;
-      padding: 0 $topbar-height / 3;
-      height: $topbar-height;
-    }
+      .has-form {
+        background: $topbar-bg;
+        padding: 0 $topbar-height / 3;
+        height: $topbar-height;
+      }
 
-    // Position overrides for ul.right
-    ul.right {
-      li .dropdown {
-        left: auto;
-        right: 0;
+      // Position overrides for ul.right
+      ul.right {
+        li .dropdown {
+          left: auto;
+          right: 0;
 
-        li .dropdown { right: 100%; }
+          li .dropdown { right: 100%; }
+        }
       }
+
     }
 
   }