Permalink
Browse files

update scss files to match 2.0.2

  • Loading branch information...
1 parent 20d6334 commit 6116357fcfc147bf5fe8d1578009f59379cf3886 @m5o m5o committed Mar 26, 2012
View
@@ -9,10 +9,10 @@
background-color: $warningBackground;
border: 1px solid $warningBorder;
@include border-radius(4px);
+ color: $warningText;
}
-.alert,
.alert-heading {
- color: $warningText;
+ color: inherit;
}
// Adjust close link position
@@ -29,32 +29,20 @@
.alert-success {
background-color: $successBackground;
border-color: $successBorder;
-}
-.alert-success,
-.alert-success .alert-heading {
color: $successText;
}
.alert-danger,
.alert-error {
background-color: $errorBackground;
border-color: $errorBorder;
-}
-.alert-danger,
-.alert-error,
-.alert-danger .alert-heading,
-.alert-error .alert-heading {
color: $errorText;
}
.alert-info {
background-color: $infoBackground;
border-color: $infoBorder;
-}
-.alert-info,
-.alert-info .alert-heading {
color: $infoText;
}
-
// Block alerts
// ------------------------
.alert-block {
View
@@ -0,0 +1,36 @@
+// BADGES
+// ------
+
+// Base
+.badge {
+ padding: 1px 9px 2px;
+ font-size: $baseFontSize * .925;
+ font-weight: bold;
+ white-space: nowrap;
+ color: $white;
+ background-color: $grayLight;
+ @include border-radius(9px);
+}
+
+// Hover state
+.badge:hover {
+ color: $white;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+// Colors
+.badge-error { background-color: $errorText; }
+.badge-error:hover { background-color: darken($errorText, 10%); }
+
+.badge-warning { background-color: $orange; }
+.badge-warning:hover { background-color: darken($orange, 10%); }
+
+.badge-success { background-color: $successText; }
+.badge-success:hover { background-color: darken($successText, 10%); }
+
+.badge-info { background-color: $infoText; }
+.badge-info:hover { background-color: darken($infoText, 10%); }
+
+.badge-inverse { background-color: $grayDark; }
+.badge-inverse:hover { background-color: darken($grayDark, 10%); }
View
@@ -4,12 +4,14 @@
.breadcrumb {
padding: 7px 14px;
margin: 0 0 $baseLineHeight;
+ list-style: none;
@include gradient-vertical($white, #f5f5f5);
border: 1px solid #ddd;
@include border-radius(3px);
@include box-shadow(inset 0 1px 0 $white);
li {
display: inline-block;
+ @include ie7-inline-block();
text-shadow: 0 1px 0 $white;
}
.divider {
View
@@ -95,8 +95,22 @@
padding-right: 8px;
$shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
@include box-shadow($shadow);
- *padding-top: 5px;
- *padding-bottom: 5px;
+ *padding-top: 3px;
+ *padding-bottom: 3px;
+}
+.btn-group .btn-mini.dropdown-toggle {
+ padding-left: 5px;
+ padding-right: 5px;
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
+.btn-group .btn-small.dropdown-toggle {
+ *padding-top: 4px;
+ *padding-bottom: 4px;
+}
+.btn-group .btn-large.dropdown-toggle {
+ padding-left: 12px;
+ padding-right: 12px;
}
.btn-group.open {
@@ -127,21 +141,31 @@
.open.btn-group .caret {
@include opacity(100);
}
+// Carets in other button sizes
+.btn-mini .caret {
+ margin-top: 5px;
+}
+.btn-small .caret {
+ margin-top: 6px;
+}
+.btn-large .caret {
+ margin-top: 6px;
+ border-left: 5px solid transparent;
+ border-right: 5px solid transparent;
+ border-top: 5px solid $black;
+}
// Account for other colors
.btn-primary,
+.btn-warning,
.btn-danger,
.btn-info,
.btn-success,
.btn-inverse {
.caret {
border-top-color: $white;
+ border-bottom-color: $white;
@include opacity(75);
}
}
-
-// Small button dropdowns
-.btn-small .caret {
- margin-top: 4px;
-}
View
@@ -8,6 +8,7 @@
// Core
.btn {
display: inline-block;
+ @include ie7-inline-block();
padding: 4px 10px 4px;
margin-bottom: 0; // For input.btn
font-size: $baseFontSize;
@@ -16,16 +17,15 @@
text-align: center;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
vertical-align: middle;
- @include buttonBackground($white, darken($white, 10%));
- border: 1px solid #ccc;
- border-bottom-color: #bbb;
+ @include buttonBackground($btnBackground, $btnBackgroundHighlight);
+ border: 1px solid $btnBorder;
+ border-bottom-color: darken($btnBorder, 10%);
@include border-radius(4px);
$shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
@include box-shadow($shadow);
cursor: pointer;
// Give IE7 some love
- @include reset-filter();
@include ie7-restore-left-whitespace();
}
@@ -126,34 +126,34 @@
.btn-danger.active,
.btn-success.active,
.btn-info.active,
-.btn-dark.active {
+.btn-inverse.active {
color: rgba(255,255,255,.75);
}
// Set the backgrounds
// -------------------------
.btn-primary {
- @include buttonBackground($primaryButtonBackground, adjust-hue($primaryButtonBackground, 20));
+ @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
}
// Warning appears are orange
.btn-warning {
- @include buttonBackground(lighten($orange, 15%), $orange);
+ @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
}
// Danger and error appear as red
.btn-danger {
- @include buttonBackground(#ee5f5b, #bd362f);
+ @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
}
// Success appears as green
.btn-success {
- @include buttonBackground(#62c462, #51a351);
+ @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
}
// Info appears as a neutral blue
.btn-info {
- @include buttonBackground(#5bc0de, #2f96b4);
+ @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
}
// Inverse appears as dark gray
.btn-inverse {
- @include buttonBackground(#454545, #262626);
+ @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
}
@@ -172,12 +172,16 @@ input[type="submit"].btn {
// IE7 has some default padding on button controls
*padding-top: 2px;
*padding-bottom: 2px;
- &.large {
+ &.btn-large {
*padding-top: 7px;
*padding-bottom: 7px;
}
- &.small {
+ &.btn-small {
*padding-top: 3px;
*padding-bottom: 3px;
}
+ &.btn-mini {
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+ }
}
View
@@ -14,7 +14,7 @@ pre {
// Inline code
code {
- padding: 3px 4px;
+ padding: 2px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
@@ -25,7 +25,7 @@ pre {
display: block;
padding: ($baseLineHeight - 1) / 2;
margin: 0 0 $baseLineHeight / 2;
- font-size: 12px;
+ font-size: $baseFontSize * .925; // 13px to 12px
line-height: $baseLineHeight;
background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8
@@ -14,5 +14,7 @@
position:relative;
overflow:hidden;
height: 0;
- &.in { height: auto; }
+ &.in {
+ height: auto;
+ }
}
Oops, something went wrong.

0 comments on commit 6116357

Please sign in to comment.