kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip

Browse source
This commit is contained in:
Jacob Thornton 2012-08-02 16:58:51 -07:00
commit 88deb08ff2
4 changed files with 59 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
docs/assets/css/bootstrap.css vendored
View file

@ -1305,6 +1305,9 @@ input[type="checkbox"][readonly] {
.control-group.warning textarea {
color: #c09853;
border-color: #c09853;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.warning .checkbox:focus,
@ -1313,9 +1316,9 @@ input[type="checkbox"][readonly] {
.control-group.warning select:focus,
.control-group.warning textarea:focus {
border-color: #a47e3c;
-webkit-box-shadow: 0 0 6px #dbc59e;
-moz-box-shadow: 0 0 6px #dbc59e;
box-shadow: 0 0 6px #dbc59e;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
}
.control-group.warning .input-prepend .add-on,
@ -1338,6 +1341,9 @@ input[type="checkbox"][readonly] {
.control-group.error textarea {
color: #b94a48;
border-color: #b94a48;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.error .checkbox:focus,
@ -1346,9 +1352,9 @@ input[type="checkbox"][readonly] {
.control-group.error select:focus,
.control-group.error textarea:focus {
border-color: #953b39;
-webkit-box-shadow: 0 0 6px #d59392;
-moz-box-shadow: 0 0 6px #d59392;
box-shadow: 0 0 6px #d59392;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
}
.control-group.error .input-prepend .add-on,
@ -1371,6 +1377,9 @@ input[type="checkbox"][readonly] {
.control-group.success textarea {
color: #468847;
border-color: #468847;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
.control-group.success .checkbox:focus,
@ -1379,9 +1388,9 @@ input[type="checkbox"][readonly] {
.control-group.success select:focus,
.control-group.success textarea:focus {
border-color: #356635;
-webkit-box-shadow: 0 0 6px #7aba7b;
-moz-box-shadow: 0 0 6px #7aba7b;
box-shadow: 0 0 6px #7aba7b;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
}
.control-group.success .input-prepend .add-on,

2
docs/assets/css/docs.css
View file

@ -134,7 +134,7 @@ hr.soften {
/* Download button */
@-webkit-keyframes downloadButton {
from { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
50% { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 50px rgba(0,68,204,1); }
50% { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 25px rgba(0,68,204,.9); }
to { -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.1); }
}
.masthead .btn {

6
less/mixins.less
View file

@ -175,9 +175,13 @@
textarea {
color: @textColor;
border-color: @borderColor;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
&:focus {
border-color: darken(@borderColor, 10%);
.box-shadow(0 0 6px lighten(@borderColor, 20%));
// Write out in full since the lighten() function isn't easily escaped
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
}
}
// Give a small background color for input-prepend/-append

49
less/tests/css-tests.html
View file

@ -818,6 +818,30 @@
<br>
<h4>Fluid textarea at .span12</h4>
<div class="row-fluid">
<div class="span12">
<textarea class="span12"></textarea>
</div>
</div>
<br>
<h4>Selects</h4>
<form>
<select class="span4">
<option>Option</option>
</select>
</form>
<br>
<!-- Dropdowns
================================================== -->
@ -1009,6 +1033,7 @@
</div>
</div> <!-- /tabbable -->
<br>
<!-- Labels
@ -1035,13 +1060,14 @@
</div><!--/span-->
</div><!--/row-->
<br>
<!-- Button groups
================================================== -->
<div class="page-header">
<h1>Button groups</h1>
<h1>Buttons</h1>
</div>
<table class="table table-bordered">
@ -1062,6 +1088,14 @@
</tbody>
</table>
<h4>Mini buttons: text and icon</h4>
<div class="btn-group">
<button class="btn btn-mini">Button text</button>
<button class="btn btn-mini"><i class="icon-cog"></i></button>
</div>
<br>
<!-- Responsive utility classes
@ -1098,19 +1132,6 @@
<br>
<br>
<br>
<h4>Fluid textarea at .span12</h4>
<div class="row-fluid">
<div class="span12">
<textarea class="span12"></textarea>
</div>
</div>
</div><!-- /container -->