Skip to content

B
bootstrap
Commit 5cae2220 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch 'master' into dev

parents 3c31d8a2 2edf16c0
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
bootstrap.css
View file @ 5cae2220
...@@ -2344,6 +2344,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { ...@@ -2344,6 +2344,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
white-space: nowrap;
} }
.label.important { .label.important {
background-color: #c43c35; background-color: #c43c35;
......
bootstrap.min.css
View file @ 5cae2220
...@@ -338,7 +338,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; ...@@ -338,7 +338,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} .popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} .popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} .fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
.label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}.label.important{background-color:#c43c35;} .label{padding:1px 3px 2px;background-color:#bfbfbf;font-size:9.75px;font-weight:bold;color:#ffffff;text-transform:uppercase;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:nowrap;}.label.important{background-color:#c43c35;}
.label.warning{background-color:#f89406;} .label.warning{background-color:#f89406;}
.label.success{background-color:#46a546;} .label.success{background-color:#46a546;}
.label.notice{background-color:#62cffc;} .label.notice{background-color:#62cffc;}
......
lib/patterns.less
View file @ 5cae2220
...@@ -989,6 +989,7 @@ input[type=submit].btn { ...@@ -989,6 +989,7 @@ input[type=submit].btn {
font-weight: bold; font-weight: bold;
color: @white; color: @white;
text-transform: uppercase; text-transform: uppercase;
white-space: nowrap;
.border-radius(3px); .border-radius(3px);
&.important { background-color: #c43c35; } &.important { background-color: #c43c35; }
&.warning { background-color: @orange; } &.warning { background-color: @orange; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment