bootstrapped-rails 2.0.7.1 → 2.0.7.2

data/vendor/assets/stylesheets/{bootstrapped/modals.scss → bootstrapped-sass/_modals.scss}

@@ -1,6 +1,7 @@
 // MODALS
 // ------
 
+// Recalculate z-index where appropriate
 .modal-open {
   .dropdown-menu {  z-index: $zindexDropdown + $zindexModal; }
   .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
@@ -8,6 +9,7 @@
   .tooltip       {  z-index: $zindexTooltip  + $zindexModal; }
 }
 
+// Background
 .modal-backdrop {
   position: fixed;
   top: 0;
@@ -20,11 +22,11 @@
   &.fade { opacity: 0; }
 }
 
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  @include opacity(80);
+.modal-backdrop, .modal-backdrop.fade.in {
+  @include opacity(0.8);
 }
 
+// Base modal
 .modal {
   position: fixed;
   top: 50%;
@@ -42,7 +44,8 @@
   @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
   @include background-clip(padding-box);
   &.fade {
-    @include transition(#{'opacity .3s linear, top .3s ease-out'});
+    $transition: opacity .3s linear, top .3s ease-out;
+    @include transition($transition);
     top: -25%;
   }
   &.fade.in { top: 50%; }
@@ -53,9 +56,17 @@
   // Close icon
   .close { margin-top: 2px; }
 }
+
+// Body (where all modal content resides)
 .modal-body {
   padding: 15px;
 }
+// Remove bottom margin if need be
+.modal-body .modal-form {
+  margin-bottom: 0;
+}
+
+// Footer (for actions)
 .modal-footer {
   padding: 14px 15px 15px;
   margin-bottom: 0;

data/vendor/assets/stylesheets/{bootstrapped/navbar.scss → bootstrapped-sass/_navbar.scss}

@@ -12,7 +12,7 @@
 
 // Gradient is applied to it's own element because overflow visible is not honored by IE when filter is present
 .navbar-inner {
-  padding-left:  20px;
+  padding-left: 20px;
   padding-right: 20px;
   @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
   @include border-radius(4px);
@@ -27,7 +27,7 @@
   padding: 7px 10px;
   margin-left: 5px;
   margin-right: 5px;
-  @include button-background($navbarBackgroundHighlight, $navbarBackground);
+  @include buttonBackground($navbarBackgroundHighlight, $navbarBackground);
   $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
   @include box-shadow($shadow);
 }
@@ -51,30 +51,24 @@
 // Brand, links, text, and buttons
 .navbar {
   // Hover and active states
+  .brand:hover {
+    text-decoration: none;
+    color: #222;
+  }
+  // Website or project name
   .brand {
-    display: inline-block;
-    padding-top: 10px;
     -moz-transition: all 0.2s linear 0s;
-    color: #000;
+    color: #000000;
+    display: inline-block;
     font-size: 22px;
     font-weight: bold;
-    margin-right: 20px;
     margin-left: 20px;
+    margin-right: 20px;
     padding-left: 0;
     padding-right: 0;
+    padding-top: 10px;
     text-shadow: 0 1px 0 rgba(255, 255, 255, 0.1), 0 0 30px rgba(255, 255, 255, 0.125);
-    &:hover {
-      color: darken(#3366CC,35%);
-      text-decoration: none;
-    }
-    &.left {
-      float:left;
-    }
-    &.right {
-      float:right;
-    }
   }
-
   // Plain text in topbar
   .navbar-text {
     margin-bottom: 0;
@@ -86,12 +80,11 @@
     }
   }
   // Buttons in navbar
-  .btn,
-  .btn-group {
+  .btn, .btn-group {
     margin-top: 5px; // make buttons vertically centered in navbar
   }
   .btn-group .btn {
-    margin-top: 0;
+    margin-top: 0; // then undo the margin here so we don't accidentally double it
   }
 }
 
@@ -99,21 +92,24 @@
 .navbar-form {
   margin-bottom: 0; // remove default bottom margin
   @include clearfix();
-  input,
-  select {
+  input, select {
     display: inline-block;
     margin-top: 5px;
     margin-bottom: 0;
   }
-  .radio,
-  .checkbox {
+  .radio, .checkbox {
     margin-top: 5px;
   }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
+  input[type="image"], input[type="checkbox"], input[type="radio"] {
     margin-top: 3px;
   }
+  .input-append, .input-prepend {
+    margin-top: 6px;
+    white-space: nowrap; // prevents two items from separating within a .navbar-form that has .pull-left
+    input {
+      margin-top: 0; //remove the margin on top since it's on parent
+    }
+  }
 }
 
 // Navbar search
@@ -143,9 +139,8 @@
       background-color: $grayLight;
       background-color: rgba(255,255,255,.5);
     }
-    // Focus states (we use .focused since IE8 and down doesn't support :focus)
-    &:focus,
-    &.focused {
+    // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
+    &:focus, &.focused {
       padding: 5px 10px;
       color: $grayDark;
       text-shadow: 0 1px 0 $white;
@@ -169,7 +164,7 @@
   z-index: $zindexFixedNavbar;
 }
 .navbar-fixed-top .navbar-inner {
-  padding-left:  0;
+  padding-left: 0;
   padding-right: 0;
   @include border-radius(0);
 }
@@ -204,18 +199,16 @@
 }
 // Hover
 .navbar .nav > li > a:hover {
-  background-color: transparent;
+  background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from :active
   color: $navbarLinkColorHover;
   text-decoration: none;
 }
 
 // Active nav items
-.navbar .nav .active > a,
-.navbar .nav .active > a:hover {
+.navbar .nav .active > a, .navbar .nav .active > a:hover {
   color: $navbarLinkColorHover;
   text-decoration: none;
   background-color: $navbarBackground;
-  background-color: rgba(0,0,0,.5);
 }
 
 // Dividers (basically a vertical hr)
@@ -267,18 +260,15 @@
 }
 
 // Dropdown toggle caret
-.navbar .nav .dropdown-toggle .caret,
-.navbar .nav .open.dropdown .caret {
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
   border-top-color: $white;
 }
 .navbar .nav .active .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Remove background color from open dropdown
-.navbar .nav .open > .dropdown-toggle,
-.navbar .nav .active > .dropdown-toggle,
-.navbar .nav .open.active > .dropdown-toggle {
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
   background-color: transparent;
 }
 
@@ -299,4 +289,4 @@
     left: auto;
     right: 13px;
   }
-}
+}

data/vendor/assets/stylesheets/{bootstrapped/navs.scss → bootstrapped-sass/_navs.scss}

@@ -21,6 +21,21 @@
   background-color: $grayLighter;
 }
 
+// Nav headers (for dropdowns and lists)
+.nav .nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: $baseLineHeight;
+  color: $grayLight;
+  text-shadow: 0 1px 0 rgba(255,255,255,.5);
+  text-transform: uppercase;
+}
+// Space them out when they follow another list item (link)
+.nav li + .nav-header {
+  margin-top: 9px;
+}
 
 
 // NAV LIST
@@ -31,29 +46,15 @@
   padding-right: 14px;
   margin-bottom: 0;
 }
-.nav-list .nav-header {
-  border-bottom: 1px solid #ddd;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  display: block;
-  padding: 3px 15px;
+.nav-list > li > a, .nav-list .nav-header {
   margin-left:  -15px;
   margin-right: -15px;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
 }
-.nav-list .nav-header {
-  font-size: 11px;
-  font-weight: bold;
-  line-height: $baseLineHeight;
-  color: $grayLight;
-  text-transform: uppercase;
-}
-.nav-list > li + .nav-header {
-  margin-top: 9px;
+.nav-list > li > a {
+  padding: 3px 15px;
 }
-.nav-list .active > a,
-.nav-list .active > a:hover {
+.nav-list .active > a, .nav-list .active > a:hover {
   color: $white;
   text-shadow: 0 -1px 0 rgba(0,0,0,.2);
   background-color: $linkColor;
@@ -68,16 +69,13 @@
 // -------------
 
 // Common styles
-.nav-tabs,
-.nav-pills {
+.nav-tabs, .nav-pills {
   @include clearfix();
 }
-.nav-tabs > li,
-.nav-pills > li {
+.nav-tabs > li, .nav-pills > li {
   float: left;
 }
-.nav-tabs > li > a,
-.nav-pills > li > a {
+.nav-tabs > li > a, .nav-pills > li > a {
   padding-right: 12px;
   padding-left: 12px;
   margin-right: 2px;
@@ -108,8 +106,7 @@
   }
 }
 // Active state, and it's :hover to override normal :hover
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
   color: $gray;
   background-color: $white;
   border: 1px solid #ddd;
@@ -130,8 +127,7 @@
 }
 
 // Active state
-.nav-pills .active > a,
-.nav-pills .active > a:hover {
+.nav-pills .active > a, .nav-pills .active > a:hover {
   color: $white;
   background-color: $linkColor;
 }
@@ -182,8 +178,7 @@
 // ---------
 
 // Position the menu
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
   margin-top: 1px;
   border-width: 1px;
 }
@@ -194,20 +189,17 @@
 // Default dropdown links
 // -------------------------
 // Make carets use linkColor to start
-.nav-tabs .dropdown-toggle .caret,
-.nav-pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
   border-top-color: $linkColor;
   margin-top: 6px;
 }
-.nav-tabs .dropdown-toggle:hover .caret,
-.nav-pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
   border-top-color: $linkColorHover;
 }
 
 // Active dropdown links
 // -------------------------
-.nav-tabs .active .dropdown-toggle .caret,
-.nav-pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
   border-top-color: $grayDark;
 }
 
@@ -220,18 +212,14 @@
 
 // Open dropdowns
 // -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > .open.active > a:hover {
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
   color: $white;
   background-color: $grayLight;
   border-color: $grayLight;
 }
-.nav .open .caret,
-.nav .open.active .caret,
-.nav .open a:hover .caret {
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: $white;
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Dropdowns in stacked tabs
@@ -252,21 +240,20 @@
 .tabbable {
   @include clearfix();
 }
+.tab-content {
+  overflow: hidden; // prevent content from running below tabs
+}
 
 // Remove border on bottom, left, right
-.tabs-below .nav-tabs,
-.tabs-right .nav-tabs,
-.tabs-left .nav-tabs {
+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
   border-bottom: 0;
 }
 
 // Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
+.tab-content > .tab-pane, .pill-content > .pill-pane {
   display: none;
 }
-.tab-content > .active,
-.pill-content > .active {
+.tab-content > .active, .pill-content > .active {
   display: block;
 }
 
@@ -288,8 +275,7 @@
     border-top-color: #ddd;
   }
 }
-.tabs-below .nav-tabs .active > a,
-.tabs-below .nav-tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
   border-color: transparent #ddd #ddd #ddd;
 }
 
@@ -297,12 +283,10 @@
 // ------------
 
 // Common styles
-.tabs-left .nav-tabs > li,
-.tabs-right .nav-tabs > li {
+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
   float: none;
 }
-.tabs-left .nav-tabs > li > a,
-.tabs-right .nav-tabs > li > a {
+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
   min-width: 74px;
   margin-right: 0;
   margin-bottom: 3px;
@@ -321,8 +305,7 @@
 .tabs-left .nav-tabs > li > a:hover {
   border-color: $grayLighter #ddd $grayLighter $grayLighter;
 }
-.tabs-left .nav-tabs .active > a,
-.tabs-left .nav-tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
   border-color: #ddd transparent #ddd #ddd;
   *border-right-color: $white;
 }
@@ -340,8 +323,7 @@
 .tabs-right .nav-tabs > li > a:hover {
   border-color: $grayLighter $grayLighter $grayLighter #ddd;
 }
-.tabs-right .nav-tabs .active > a,
-.tabs-right .nav-tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: $white;
 }

data/vendor/assets/stylesheets/{bootstrapped/pager.scss → bootstrapped-sass/_pager.scss}

@@ -27,4 +27,4 @@
 }
 .pager .previous a {
   float: left;
-}
+}