bootstrap-generators 2.2.1 → 2.2.2

data/vendor/twitter/bootstrap/less/type.less

@@ -20,33 +20,27 @@ p {
 // Emphasis & misc
 // -------------------------
 
-small {
-  font-size: 85%; // Ex: 14px base font * 85% = about 12px
-}
-strong {
-  font-weight: bold;
-}
-em {
-  font-style: italic;
-}
-cite {
-  font-style: normal;
-}
+// Ex: 14px base font * 85% = about 12px
+small   { font-size: 85%; }
+
+strong  { font-weight: bold; }
+em      { font-style: italic; }
+cite    { font-style: normal; }
 
 // Utility classes
-.muted {
-  color: @grayLight;
-}
-.text-warning { color: @warningText; }
+.muted               { color: @grayLight; }
+a.muted:hover        { color: darken(@grayLight, 10%); }
+
+.text-warning        { color: @warningText; }
 a.text-warning:hover { color: darken(@warningText, 10%); }
 
-.text-error { color: @errorText; }
-a.text-error:hover { color: darken(@errorText, 10%); }
+.text-error          { color: @errorText; }
+a.text-error:hover   { color: darken(@errorText, 10%); }
 
-.text-info { color: @infoText; }
-a.text-info:hover { color: darken(@infoText, 10%); }
+.text-info           { color: @infoText; }
+a.text-info:hover    { color: darken(@infoText, 10%); }
 
-.text-success { color: @successText; }
+.text-success        { color: @successText; }
 a.text-success:hover { color: darken(@successText, 10%); }
 
 
@@ -112,12 +106,26 @@ ol ul {
 li {
   line-height: @baseLineHeight;
 }
+
+// Remove default list styles
 ul.unstyled,
 ol.unstyled {
   margin-left: 0;
   list-style: none;
 }
 
+// Single-line list items
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+  & > li {
+    display: inline-block;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+}
+
 // Description Lists
 dl {
   margin-bottom: @baseLineHeight;

data/vendor/twitter/bootstrap/less/variables.less

@@ -68,7 +68,7 @@
 
 @paddingLarge:          11px 19px; // 44px
 @paddingSmall:          2px 10px;  // 26px
-@paddingMini:           1px 6px;   // 24px
+@paddingMini:           0 6px;   // 22px
 
 @baseBorderRadius:      4px;
 @borderRadiusLarge:     6px;
@@ -126,7 +126,7 @@
 
 @dropdownLinkColor:             @grayDark;
 @dropdownLinkColorHover:        @white;
-@dropdownLinkColorActive:       @dropdownLinkColor;
+@dropdownLinkColorActive:       @white;
 
 @dropdownLinkBackgroundActive:  @linkColor;
 @dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
@@ -151,8 +151,8 @@
 
 // Sprite icons path
 // -------------------------
-@iconSpritePath:          "glyphicons-halflings.png";
-@iconWhiteSpritePath:     "glyphicons-halflings-white.png";
+@iconSpritePath:          "../img/glyphicons-halflings.png";
+@iconWhiteSpritePath:     "../img/glyphicons-halflings-white.png";
 
 
 // Input placeholder text color

data/vendor/twitter/bootstrap/sass/_alerts.scss

@@ -13,6 +13,10 @@
   background-color: $warningBackground;
   border: 1px solid $warningBorder;
   @include border-radius($baseBorderRadius);
+}
+.alert,
+.alert h4 {
+  // Specified for the h4 to prevent conflicts of changing $headingsColor
   color: $warningText;
 }
 .alert h4 {
@@ -36,17 +40,27 @@
   border-color: $successBorder;
   color: $successText;
 }
+.alert-success h4 {
+  color: $successText;
+}
 .alert-danger,
 .alert-error {
   background-color: $errorBackground;
   border-color: $errorBorder;
   color: $errorText;
 }
+.alert-danger h4,
+.alert-error h4 {
+  color: $errorText;
+}
 .alert-info {
   background-color: $infoBackground;
   border-color: $infoBorder;
   color: $infoText;
 }
+.alert-info h4 {
+  color: $infoText;
+}
 
 
 // Block alerts

data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss

@@ -9,14 +9,14 @@
   list-style: none;
   background-color: #f5f5f5;
   @include border-radius($baseBorderRadius);
-  li {
+  > li {
     display: inline-block;
     @include ie7-inline-block();
     text-shadow: 0 1px 0 $white;
-  }
-  .divider {
-    padding: 0 5px;
-    color: #ccc;
+    > .divider {
+      padding: 0 5px;
+      color: #ccc;
+    }
   }
   .active {
     color: $grayLight;

data/vendor/twitter/bootstrap/sass/_button-groups.scss

@@ -24,9 +24,9 @@
   font-size: 0; // Hack to remove whitespace that results from using inline-block
   margin-top: $baseLineHeight / 2;
   margin-bottom: $baseLineHeight / 2;
-  .btn + .btn,
-  .btn-group + .btn,
-  .btn + .btn-group {
+  > .btn + .btn,
+  > .btn-group + .btn,
+  > .btn + .btn-group {
     margin-left: 5px;
   }
 }
@@ -40,59 +40,44 @@
   margin-left: -1px;
 }
 .btn-group > .btn,
-.btn-group > .dropdown-menu {
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
   font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
 }
 
 // Reset fonts for other sizes
 .btn-group > .btn-mini {
-  font-size: 11px;
+  font-size: $fontSizeMini;
 }
 .btn-group > .btn-small {
-  font-size: 12px;
+  font-size: $fontSizeSmall;
 }
 .btn-group > .btn-large {
-  font-size: 16px;
+  font-size: $fontSizeLarge;
 }
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-     -webkit-border-top-left-radius: 4px;
-         -moz-border-radius-topleft: 4px;
-             border-top-left-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-      -moz-border-radius-bottomleft: 4px;
-          border-bottom-left-radius: 4px;
+  @include border-top-left-radius($baseBorderRadius);
+  @include border-bottom-left-radius($baseBorderRadius);
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
 .btn-group > .btn:last-child,
 .btn-group > .dropdown-toggle {
-     -webkit-border-top-right-radius: 4px;
-         -moz-border-radius-topright: 4px;
-             border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-      -moz-border-radius-bottomright: 4px;
-          border-bottom-right-radius: 4px;
+  @include border-top-right-radius($baseBorderRadius);
+  @include border-bottom-right-radius($baseBorderRadius);
 }
 // Reset corners for large buttons
 .btn-group > .btn.large:first-child {
   margin-left: 0;
-     -webkit-border-top-left-radius: 6px;
-         -moz-border-radius-topleft: 6px;
-             border-top-left-radius: 6px;
-  -webkit-border-bottom-left-radius: 6px;
-      -moz-border-radius-bottomleft: 6px;
-          border-bottom-left-radius: 6px;
+  @include border-top-left-radius($borderRadiusLarge);
+  @include border-bottom-left-radius($borderRadiusLarge);
 }
 .btn-group > .btn.large:last-child,
 .btn-group > .large.dropdown-toggle {
-     -webkit-border-top-right-radius: 6px;
-         -moz-border-radius-topright: 6px;
-             border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-      -moz-border-radius-bottomright: 6px;
-          border-bottom-right-radius: 6px;
+  @include border-top-right-radius($borderRadiusLarge);
+  @include border-bottom-right-radius($borderRadiusLarge);
 }
 
 // On hover/focus/active, bring the proper btn to front
@@ -218,25 +203,25 @@
   display: inline-block; // makes buttons only take up the width they need
   @include ie7-inline-block();
 }
-.btn-group-vertical .btn {
+.btn-group-vertical > .btn {
   display: block;
   float: none;
-  width: 100%;
+  max-width: 100%;
   @include border-radius(0);
 }
-.btn-group-vertical .btn + .btn {
+.btn-group-vertical > .btn + .btn {
   margin-left: 0;
   margin-top: -1px;
 }
-.btn-group-vertical .btn:first-child {
-  @include border-radius(4px 4px 0 0);
+.btn-group-vertical > .btn:first-child {
+  @include border-radius($baseBorderRadius $baseBorderRadius 0 0);
 }
-.btn-group-vertical .btn:last-child {
-  @include border-radius(0 0 4px 4px);
+.btn-group-vertical > .btn:last-child {
+  @include border-radius(0 0 $baseBorderRadius $baseBorderRadius);
 }
-.btn-group-vertical .btn-large:first-child {
-  @include border-radius(6px 6px 0 0);
+.btn-group-vertical > .btn-large:first-child {
+  @include border-radius($borderRadiusLarge $borderRadiusLarge 0 0);
 }
-.btn-group-vertical .btn-large:last-child {
-  @include border-radius(0 0 6px 6px);
+.btn-group-vertical > .btn-large:last-child {
+  @include border-radius(0 0 $borderRadiusLarge $borderRadiusLarge);
 }

data/vendor/twitter/bootstrap/sass/_buttons.scss

@@ -14,7 +14,6 @@
   margin-bottom: 0; // For input.btn
   font-size: $baseFontSize;
   line-height: $baseLineHeight;
-  *line-height: $baseLineHeight;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
@@ -30,8 +29,6 @@
   &:hover {
     color: $grayDark;
     text-decoration: none;
-    background-color: darken($white, 10%);
-    *background-color: darken($white, 15%); /* Buttons in IE7 don't get borders, so darken on hover */
     background-position: 0 -15px;
 
     // transition is only when going to hover, otherwise the background
@@ -47,8 +44,6 @@
   // Active state
   &.active,
   &:active {
-    background-color: darken($white, 10%);
-    background-color: darken($white, 15%) \9;
     background-image: none;
     outline: 0;
     @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
@@ -58,7 +53,6 @@
   &.disabled,
   &[disabled] {
     cursor: default;
-    background-color: darken($white, 10%);
     background-image: none;
     @include opacity(65);
     @include box-shadow(none);
@@ -79,7 +73,7 @@
 }
 .btn-large [class^="icon-"],
 .btn-large [class*=" icon-"] {
-  margin-top: 2px;
+  margin-top: 4px;
 }
 
 // Small
@@ -92,6 +86,10 @@
 .btn-small [class*=" icon-"] {
   margin-top: 0;
 }
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
 
 // Mini
 .btn-mini {

data/vendor/twitter/bootstrap/sass/_carousel.scss

@@ -15,50 +15,50 @@
   position: relative;
 }
 
-.carousel {
+.carousel-inner {
 
-  .item {
+  > .item {
     display: none;
     position: relative;
     @include transition(.6s ease-in-out left);
   }
 
   // Account for jankitude on images
-  .item > img {
+  > .item > img {
     display: block;
     line-height: 1;
   }
 
-  .active,
-  .next,
-  .prev { display: block; }
+  > .active,
+  > .next,
+  > .prev { display: block; }
 
-  .active {
+  > .active {
     left: 0;
   }
 
-  .next,
-  .prev {
+  > .next,
+  > .prev {
     position: absolute;
     top: 0;
     width: 100%;
   }
 
-  .next {
+  > .next {
     left: 100%;
   }
-  .prev {
+  > .prev {
     left: -100%;
   }
-  .next.left,
-  .prev.right {
+  > .next.left,
+  > .prev.right {
     left: 0;
   }
 
-  .active.left {
+  > .active.left {
     left: -100%;
   }
-  .active.right {
+  > .active.right {
     left: 100%;
   }
 

data/vendor/twitter/bootstrap/sass/_code.scss

@@ -19,6 +19,7 @@ code {
   color: #d14;
   background-color: #f7f7f9;
   border: 1px solid #e1e1e8;
+  white-space: nowrap;
 }
 
 // Blocks of code
@@ -46,6 +47,8 @@ pre {
   code {
     padding: 0;
     color: inherit;
+    white-space: pre;
+    white-space: pre-wrap;
     background-color: transparent;
     border: 0;
   }

data/vendor/twitter/bootstrap/sass/_dropdowns.scss

@@ -115,6 +115,7 @@
   text-decoration: none;
   background-color: transparent;
   background-image: none; // Remove CSS gradient
+  @include reset-filter();
   cursor: default;
 }
 
@@ -168,9 +169,7 @@
   left: 100%;
   margin-top: -6px;
   margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
+  @include border-radius(0 6px 6px 6px);
 }
 .dropdown-submenu:hover > .dropdown-menu {
   display: block;
@@ -182,9 +181,7 @@
   bottom: 0;
   margin-top: 0;
   margin-bottom: -2px;
-  -webkit-border-radius: 5px 5px 5px 0;
-     -moz-border-radius: 5px 5px 5px 0;
-          border-radius: 5px 5px 5px 0;
+  @include border-radius(5px 5px 5px 0);
 }
 
 // Caret to indicate there is a submenu
@@ -215,9 +212,7 @@
   > .dropdown-menu {
     left: -100%;
     margin-left: 10px;
-    -webkit-border-radius: 6px 0 6px 6px;
-       -moz-border-radius: 6px 0 6px 6px;
-            border-radius: 6px 0 6px 6px;
+    @include border-radius(6px 0 6px 6px);
   }
 }
 
@@ -232,6 +227,7 @@
 // Typeahead
 // ---------
 .typeahead {
+  z-index: 1051;
   margin-top: 2px; // give it some space to breathe
   @include border-radius($baseBorderRadius);
 }