kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

remove top margin from alert close, chance close line height to 18px (baseLineHeight)

This commit is contained in:
Mark Otto 2012-01-24 21:11:20 -08:00
parent 9602248ad5
commit f2fe2b1798
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Tue Jan 24 20:44:12 PST 2012
* Date: Tue Jan 24 21:10:54 PST 2012
*/
article,
aside,
@ -1505,7 +1505,7 @@ i {
float: right;
font-size: 20px;
font-weight: bold;
line-height: 12px;
line-height: 18px;
color: #000000;
text-shadow: 0 1px 0 #ffffff;
filter: alpha(opacity=20);
@ -2627,11 +2627,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
color: #c09853;
}
.alert .close {
*margin-top: 3px;
/* IE7 spacing */
position: relative;
right: -21px;
line-height: 18px;
}
.alert-success {
background-color: #dff0d8;

4
bootstrap.min.css vendored
View File

@ -312,7 +312,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
.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;}
.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
.close{float:right;font-size:20px;font-weight:bold;line-height:12px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-moz-opacity:0.4;opacity:0.4;cursor:pointer;}
.nav{margin-left:0;margin-bottom:18px;list-style:none;}
.nav>li>a{display:block;}
.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
@ -482,7 +482,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;filter:alpha(opacity=75);-moz-opacity:0.75;opacity:0.75;}
.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
.alert,.alert-heading{color:#c09853;}
.alert .close{*margin-top:3px;position:relative;right:-21px;}
.alert .close{position:relative;right:-21px;line-height:18px;}
.alert-success{background-color:#dff0d8;border-color:#cfe8c4;}
.alert-success,.alert-success .alert-heading{color:#468847;}
.alert-danger,.alert-error{background-color:#f2dede;border-color:#e9c7c7;}

1
lib/alerts.less
View File

@ -17,7 +17,6 @@
// Adjust close link position
.alert .close {
*margin-top: 3px; /* IE7 spacing */
position: relative;
right: -21px;
line-height: 18px;

2
lib/close.less
View File

@ -5,7 +5,7 @@
float: right;
font-size: 20px;
font-weight: bold;
line-height: 12px;
line-height: @baseLineHeight;
color: @black;
text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(20);