0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00

make links in error messages not be blue, but instead match the text color and be bold:

This commit is contained in:
Mark Otto 2011-10-03 22:36:51 -07:00
parent c843e202b5
commit 1b245ffdf8
4 changed files with 45 additions and 6 deletions

18
bootstrap.css vendored
View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Mon Oct 3 22:26:41 PDT 2011 * Date: Mon Oct 3 22:36:24 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@ -1960,6 +1960,16 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
/* IE7 spacing */ /* IE7 spacing */
} }
.alert-message a {
font-weight: bold;
color: #404040;
}
.alert-message.danger p a,
.alert-message.error p a,
.alert-message.success p a,
.alert-message.info p a {
color: #ffffff;
}
.alert-message h5 { .alert-message h5 {
line-height: 18px; line-height: 18px;
} }
@ -2014,6 +2024,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
background-color: #ddf4fb; background-color: #ddf4fb;
border-color: #c6edf9; border-color: #c6edf9;
} }
.alert-message.block-message.danger p a,
.alert-message.block-message.error p a,
.alert-message.block-message.success p a,
.alert-message.block-message.info p a {
color: #404040;
}
.pagination { .pagination {
height: 36px; height: 36px;
margin: 18px 0; margin: 18px 0;

3
bootstrap.min.css vendored
View File

@ -290,6 +290,8 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
.close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;} .close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;} .alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;}
.alert-message a{font-weight:bold;color:#404040;}
.alert-message.danger p a,.alert-message.error p a,.alert-message.success p a,.alert-message.info p a{color:#ffffff;}
.alert-message h5{line-height:18px;} .alert-message h5{line-height:18px;}
.alert-message p{margin-bottom:0;} .alert-message p{margin-bottom:0;}
.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;} .alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;}
@ -302,6 +304,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;} .alert-message.block-message.error{background-color:#fddfde;border-color:#fbc7c6;}
.alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;} .alert-message.block-message.success{background-color:#d1eed1;border-color:#bfe7bf;}
.alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;} .alert-message.block-message.info{background-color:#ddf4fb;border-color:#c6edf9;}
.alert-message.block-message.danger p a,.alert-message.block-message.error p a,.alert-message.block-message.success p a,.alert-message.block-message.info p a{color:#404040;}
.pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} .pagination{height:36px;margin:18px 0;}.pagination ul{float:left;margin:0;border:1px solid #ddd;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
.pagination li{display:inline;} .pagination li{display:inline;}
.pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;} .pagination a{float:left;padding:0 14px;line-height:34px;border-right:1px solid;border-right-color:#ddd;border-right-color:rgba(0, 0, 0, 0.15);*border-right-color:#ddd;text-decoration:none;}

View File

@ -1538,19 +1538,19 @@
<div class="span12"> <div class="span12">
<div class="alert-message warning"> <div class="alert-message warning">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Holy guacamole!</strong> Best check yo self, youre not looking too good.</p> <p><strong>Holy guacamole!</strong> Best check yo self, youre not <a href="#">looking too good</a>.</p>
</div> </div>
<div class="alert-message error"> <div class="alert-message error">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Oh snap!</strong> Change this and that and try again.</p> <p><strong>Oh snap!</strong> Change this and that and <a href="#">try again</a>.</p>
</div> </div>
<div class="alert-message success"> <div class="alert-message success">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Well done!</strong> You successfully read this alert message.</p> <p><strong>Well done!</strong> You successfully <a href="#">read this</a> alert message.</p>
</div> </div>
<div class="alert-message info"> <div class="alert-message info">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Heads up!</strong> This is an alert that needs your attention, but its not a huge priority just yet.</p> <p><strong>Heads up!</strong> This is an alert that needs your attention, but its not <a href="#">a huge priority</a> just yet.</p>
</div> </div>
<h4>Example code</h4> <h4>Example code</h4>
@ -1580,7 +1580,7 @@
</div> </div>
<div class="alert-message block-message error"> <div class="alert-message block-message error">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Oh snap! You got an error!</strong> Change this and that and try again.</p> <p><strong>Oh snap! You got an error!</strong> Change this and that and <a href="#">try again</a>.</p>
<ul> <ul>
<li>Duis mollis est non commodo luctus</li> <li>Duis mollis est non commodo luctus</li>
<li>Nisi erat porttitor ligula</li> <li>Nisi erat porttitor ligula</li>

View File

@ -646,6 +646,18 @@ input[type=submit].btn {
*margin-top: 3px; /* IE7 spacing */ *margin-top: 3px; /* IE7 spacing */
} }
// Make links same color as text and stand out more
a {
font-weight: bold;
color: @grayDark;
}
&.danger p a,
&.error p a,
&.success p a,
&.info p a {
color: @white;
}
// Remove extra margin from content // Remove extra margin from content
h5 { h5 {
line-height: @baseline; line-height: @baseline;
@ -700,6 +712,14 @@ input[type=submit].btn {
background-color: lighten(#6bd0ee, 25%); background-color: lighten(#6bd0ee, 25%);
border-color: lighten(#6bd0ee, 20%); border-color: lighten(#6bd0ee, 20%);
} }
// Change link color back
&.danger p a,
&.error p a,
&.success p a,
&.info p a {
color: @grayDark;
}
} }
} }