Permalink
Browse files

update missing bits to 2.1.0

  • Loading branch information...
1 parent 5666de8 commit 54613eaeef57dbcf9c4d215c8e41955fdd3f636e @m5o m5o committed Aug 26, 2012
View
@@ -2,6 +2,7 @@
// Alerts
// --------------------------------------------------
+
// Base styles
// -------------------------
@@ -26,6 +27,7 @@
line-height: $baseLineHeight;
}
+
// Alternate styles
// -------------------------
@@ -46,8 +48,10 @@
color: $infoText;
}
+
// Block alerts
// -------------------------
+
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
View
@@ -2,13 +2,13 @@
// Breadcrumbs
// --------------------------------------------------
+
.breadcrumb {
padding: 8px 15px;
margin: 0 0 $baseLineHeight;
list-style: none;
background-color: #f5f5f5;
@include border-radius(4px);
- @include box-shadow(inset 0 1px 0 $white);
li {
display: inline-block;
@include ie7-inline-block();
@@ -18,7 +18,7 @@
padding: 0 5px;
color: #ccc;
}
- .active a {
+ .active {
color: $grayLight;
}
}
View
@@ -124,16 +124,20 @@
*padding-bottom: 5px;
}
.btn-group > .btn-mini + .dropdown-toggle {
- *padding-left: 2px;
- *padding-right: 2px;
+ padding-left: 5px;
+ padding-right: 5px;
+ *padding-top: 2px;
+ *padding-bottom: 2px;
}
.btn-group > .btn-small + .dropdown-toggle {
*padding-top: 5px;
*padding-bottom: 4px;
}
.btn-group > .btn-large + .dropdown-toggle {
- *padding-left: 7px;
- *padding-right: 7px;
+ padding-left: 12px;
+ padding-right: 12px;
+ *padding-top: 7px;
+ *padding-bottom: 7px;
}
.btn-group.open {
View
@@ -172,6 +172,7 @@ input[type="submit"].btn {
// IE7 has some default padding on button controls
*padding-top: 3px;
*padding-bottom: 3px;
+
&.btn-large {
*padding-top: 7px;
*padding-bottom: 7px;
View
@@ -68,7 +68,7 @@
// Dividers (basically an hr) within the dropdown
.divider {
- @include nav-divider();
+ @include nav-divider($dropdownDividerTop, $dropdownDividerBottom);
}
// Links within the dropdown menu
View
@@ -38,20 +38,20 @@ a {
// Colors
// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
// Important (red)
-.label-important, .badge-important { background-color: $errorText; }
-.label-important[href], .badge-important[href] { background-color: darken($errorText, 10%); }
+.label-important, .badge-important { background-color: $errorText; }
+.label-important[href], .badge-important[href] { background-color: darken($errorText, 10%); }
// Warnings (orange)
-.label-warning, .badge-warning { background-color: $orange; }
-.label-warning[href], .badge-warning[href] { background-color: darken($orange, 10%); }
+.label-warning, .badge-warning { background-color: $orange; }
+.label-warning[href], .badge-warning[href] { background-color: darken($orange, 10%); }
// Success (green)
-.label-success, .badge-success { background-color: $successText; }
-.label-success[href], .badge-success[href] { background-color: darken($successText, 10%); }
+.label-success, .badge-success { background-color: $successText; }
+.label-success[href], .badge-success[href] { background-color: darken($successText, 10%); }
// Info (turquoise)
-.label-info, .badge-info { background-color: $infoText; }
-.label-info[href], .badge-info[href] { background-color: darken($infoText, 10%); }
+.label-info, .badge-info { background-color: $infoText; }
+.label-info[href], .badge-info[href] { background-color: darken($infoText, 10%); }
// Inverse (black)
-.label-inverse, .badge-inverse { background-color: $grayDark; }
-.label-inverse[href], .badge-inverse[href] { background-color: darken($grayDark, 10%); }
+.label-inverse, .badge-inverse { background-color: $grayDark; }
+.label-inverse[href], .badge-inverse[href] { background-color: darken($grayDark, 10%); }
// Quick fix for labels/badges in buttons
.btn {
View
@@ -45,7 +45,7 @@
// IE7 inline-block
// ----------------
@mixin ie7-inline-block() {
- *display: inline; // IE7 inline-block hack
+ *display: inline; /* IE7 inline-block hack */
*zoom: 1;
}
@@ -278,15 +278,13 @@
-o-transform: translate($x, $y);
transform: translate($x, $y);
}
-
@mixin skew($x, $y) {
-webkit-transform: skew($x, $y);
-moz-transform: skew($x, $y);
-ms-transform: skew($x, $y);
-o-transform: skew($x, $y);
transform: skew($x, $y);
}
-
@mixin translate3d($x, $y, $z) {
-webkit-transform: translate3d($x, $y, $z);
-moz-transform: translate3d($x, $y, $z);
@@ -509,7 +507,6 @@
-
// Grid System
// -----------
@@ -539,94 +536,109 @@
width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
}
-// The Grid
-@mixin core-offset($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
- margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1));
-}
-
-@mixin core-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
- width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
-}
-@mixin grid-core($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
+// The Grid
+@mixin grid-core($gridColumnWidth, $gridGutterWidth) {
.row {
- margin-left: $gutterWidth * -1;
+ margin-left: $gridGutterWidth * -1;
@include clearfix();
}
[class*="span"] {
float: left;
- margin-left: $gutterWidth;
+ margin-left: $gridGutterWidth;
}
// Set the container width, and override it for fixed navbars in media queries
.container,
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
- @include core-span($gridColumns, $columnWidth, $gutterWidth);
+ @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
}
// generate .spanX and .offsetX
- $i: $gridColumns;
- @while $i > 0 {
- .span#{$i} { @include core-span($i, $columnWidth, $gutterWidth); }
- $i: $i - 1;
- }
+ @include grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
+ @include grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
+}
- $i: $gridColumns;
- @while $i > 0 {
- .offset#{$i} { @include core-offset($i, $columnWidth, $gutterWidth); }
- $i: $i - 1;
+@mixin grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
+ @while $gridColumns > 0 {
+ .span#{$gridColumns} { @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth)}
+ $gridColumns: $gridColumns - 1;
}
}
-@mixin fluid-offset($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
- margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1)) + ($gutterWidth * 2);
- *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1)) - (.5 / $gridRowWidth * 100px * 1%) + ($gutterWidth * 2) - (.5 / $gridRowWidth * 100px * 1%);
+@mixin grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
+ @while $gridColumns > 0 {
+ .offset#{$gridColumns} { @include grid-core-offset($gridColumns, $gridColumnWidth, $gridGutterWidth); }
+ $gridColumns: $gridColumns - 1;
+ }
}
-@mixin fluid-offset-first-child($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
- margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1)) + ($gutterWidth * 2);
- *margin-left: ($columnWidth * $columns) + ($gutterWidth * ($columns + 1)) - (.5 / $gridRowWidth * 100px * 1%) + $gutterWidth - (.5 / $gridRowWidth * 100px * 1%);
+@mixin grid-core-span($columns, $gridColumnWidth, $gridGutterWidth) {
+ width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
}
-@mixin fluid-span($columns, $columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
- width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1));
- *width: ($columnWidth * $columns) + ($gutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%);
+@mixin grid-core-offset($columns, $gridColumnWidth, $gridGutterWidth) {
+ margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns + 1));
}
-@mixin grid-fluid($columnWidth: $fluidGridColumnWidth, $gutterWidth: $fluidGridGutterWidth) {
+
+
+@mixin grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
.row-fluid {
width: 100%;
@include clearfix();
[class*="span"] {
@include input-block-level();
float: left;
- margin-left: $gutterWidth;
- *margin-left: $gutterWidth - (.5 / $gridRowWidth * 100px * 1%);
+ margin-left: $fluidGridGutterWidth;
+ *margin-left: $fluidGridGutterWidth - (.5 / $gridRowWidth * 100px * 1%);
}
[class*="span"]:first-child {
margin-left: 0;
}
// generate .spanX and .offsetX
- $i: $gridColumns;
- @while $i > 0 {
- .span#{$i} {
- @include fluid-span($i, $columnWidth, $gutterWidth);
- @include fluid-offset($i, $columnWidth, $gutterWidth);
- }
- $i: $i - 1;
- }
+ @include grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
+ @include grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
}
}
-@mixin input-span($columns, $columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
- width: (($columnWidth) * $columns) + ($gutterWidth * ($columns - 1)) - 14;
+@mixin grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
+ @while $gridColumns > 0 {
+ .span#{$gridColumns} { @include grid-fluid-span($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
+ $gridColumns: $gridColumns - 1;
+ }
}
-@mixin grid-input($columnWidth: $gridColumnWidth, $gutterWidth: $gridGutterWidth) {
+@mixin grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
+ @while $gridColumns > 0 {
+ .offset#{$gridColumns} { @include grid-fluid-offset($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
+ .offset#{$gridColumns}:first-child { @include grid-fluid-offset-first-child($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth); }
+ $gridColumns: $gridColumns - 1;
+ }
+}
+
+@mixin grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
+ width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
+ *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%);
+}
+
+@mixin grid-fluid-offset($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
+ margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth * 2);
+ *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + ($fluidGridGutterWidth * 2) - (.5 / $gridRowWidth * 100px * 1%);
+}
+
+@mixin grid-fluid-offset-first-child($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
+ margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth);
+ *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + $fluidGridGutterWidth - (.5 / $gridRowWidth * 100px * 1%);
+}
+
+
+
+@mixin grid-input($gridColumnWidth, $gridGutterWidth) {
input,
textarea,
.uneditable-input {
@@ -635,17 +647,24 @@
// Space grid-sized controls properly if multiple per line
.controls-row [class*="span"] + [class*="span"] {
- margin-left: $gutterWidth;
+ margin-left: $gridGutterWidth;
}
// generate .spanX
- $i: $gridColumns;
- @while $i > 0 {
- input.span#{$i},
- textarea.span#{$i},
- .uneditable-input.span#{$i} {
- @include input-span($i, $columnWidth, $gutterWidth);
+ @include grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
+}
+
+@mixin grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
+ @while $gridColumns > 0 {
+ input.span#{$gridColumns},
+ textarea.span#{$gridColumns},
+ .uneditable-input.span#{$gridColumns} {
+ @include grid-input-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
}
- $i: $i - 1;
+ $gridColumns: $gridColumns - 1;
}
}
+
+@mixin grid-input-span($columns, $gridColumnWidth, $gridGutterWidth) {
+ width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 14;
+}
View
@@ -134,7 +134,7 @@
margin-bottom: 0;
padding: 4px 14px;
@include font-sans-serif(13px, normal, 1);
- @include border-radius(15px);
+ @include border-radius(15px); // redeclare because of specificity of the type attribute
}
}
@@ -185,7 +185,7 @@
.navbar-static-top .container,
.navbar-fixed-top .container,
.navbar-fixed-bottom .container {
- @include core-span($gridColumns);
+ @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
}
// Fixed to top
@@ -203,7 +203,7 @@
.navbar-fixed-bottom {
bottom: 0;
.navbar-inner {
- @include box-shadow(#{inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)});
+ @include box-shadow(#{inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)});
}
}
@@ -19,7 +19,7 @@
margin-left: -$gridGutterWidth1200;
}
.thumbnails > li {
- margin-left: -$gridGutterWidth1200;
+ margin-left: $gridGutterWidth1200;
}
.row-fluid .thumbnails {
margin-left: 0;
@@ -13,7 +13,7 @@
body {
padding-top: 0;
}
- // Unfix the navbar
+ // Unfix the navbars
.navbar-fixed-top,
.navbar-fixed-bottom {
position: static;
Oops, something went wrong.

1 comment on commit 54613ea

smt commented on 54613ea Aug 27, 2012

Awesome!

Please sign in to comment.