mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-24 12:40:58 +00:00
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
This commit is contained in:
Jacob Thornton
commit
3250ecc674
20
bootstrap.css
vendored
20
bootstrap.css
vendored
@ -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: Wed Jan 25 11:23:36 PST 2012
|
||||
* Date: Wed Jan 25 11:47:25 PST 2012
|
||||
*/
|
||||
article,
|
||||
aside,
|
||||
@ -497,7 +497,7 @@ input,
|
||||
textarea,
|
||||
select,
|
||||
.uneditable-input {
|
||||
display: block;
|
||||
display: inline-block;
|
||||
width: 210px;
|
||||
height: 18px;
|
||||
padding: 4px;
|
||||
@ -715,11 +715,11 @@ textarea[readonly] {
|
||||
.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
|
||||
color: #c09853;
|
||||
}
|
||||
.control-group.warning input, .control-group.warning textarea {
|
||||
.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
|
||||
color: #c09853;
|
||||
border-color: #c09853;
|
||||
}
|
||||
.control-group.warning input:focus, .control-group.warning textarea:focus {
|
||||
.control-group.warning input:focus, .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;
|
||||
@ -733,11 +733,11 @@ textarea[readonly] {
|
||||
.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
|
||||
color: #b94a48;
|
||||
}
|
||||
.control-group.error input, .control-group.error textarea {
|
||||
.control-group.error input, .control-group.error select, .control-group.error textarea {
|
||||
color: #b94a48;
|
||||
border-color: #b94a48;
|
||||
}
|
||||
.control-group.error input:focus, .control-group.error textarea:focus {
|
||||
.control-group.error input:focus, .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;
|
||||
@ -751,11 +751,11 @@ textarea[readonly] {
|
||||
.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
|
||||
color: #468847;
|
||||
}
|
||||
.control-group.success input, .control-group.success textarea {
|
||||
.control-group.success input, .control-group.success select, .control-group.success textarea {
|
||||
color: #468847;
|
||||
border-color: #468847;
|
||||
}
|
||||
.control-group.success input:focus, .control-group.success textarea:focus {
|
||||
.control-group.success input:focus, .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;
|
||||
@ -2924,6 +2924,10 @@ a.thumbnail:hover {
|
||||
-o-transition: 0.6s ease-in-out left;
|
||||
transition: 0.6s ease-in-out left;
|
||||
}
|
||||
.carousel .item > img {
|
||||
display: block;
|
||||
line-height: 1;
|
||||
}
|
||||
.carousel .active, .carousel .next, .carousel .prev {
|
||||
display: block;
|
||||
}
|
||||
|
||||
9
bootstrap.min.css
vendored
9
bootstrap.min.css
vendored
@ -94,7 +94,7 @@ fieldset{padding:0;margin:0;border:0;}
|
||||
legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
|
||||
label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
|
||||
label{display:block;margin-bottom:5px;color:#333333;}
|
||||
input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
|
||||
input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
|
||||
.uneditable-textarea{width:auto;height:auto;}
|
||||
input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
|
||||
input[type=file]{padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
|
||||
@ -145,13 +145,13 @@ select.span11{width:870px;}
|
||||
select.span12{width:950px;}
|
||||
input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
|
||||
.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
|
||||
.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input: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;}
|
||||
.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.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;}
|
||||
.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
|
||||
.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
|
||||
.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input: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;}
|
||||
.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.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;}
|
||||
.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
|
||||
.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
|
||||
.control-group.success input,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input: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;}
|
||||
.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.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;}
|
||||
.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
|
||||
input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
|
||||
.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
|
||||
@ -524,6 +524,7 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
|
||||
.carousel{position:relative;line-height:1;}
|
||||
.carousel-inner{overflow:hidden;width:100%;position:relative;}
|
||||
.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
|
||||
.carousel .item>img{display:block;line-height:1;}
|
||||
.carousel .active,.carousel .next,.carousel .prev{display:block;}
|
||||
.carousel .active{left:0;}
|
||||
.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
|
||||
|
||||
@ -132,6 +132,7 @@ section {
|
||||
.subnav {
|
||||
width: 100%;
|
||||
height: 36px;
|
||||
overflow: hidden;
|
||||
background-color: #eeeeee; /* Old browsers */
|
||||
background-repeat: repeat-x; /* Repeat the gradient */
|
||||
background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
|
||||
@ -167,13 +168,10 @@ section {
|
||||
color: #333;
|
||||
}
|
||||
.subnav .nav .active a {
|
||||
background-color: #eee;
|
||||
background-color: #e5e5e5;
|
||||
}
|
||||
.subnav .nav li:first-child a {
|
||||
border-left: 0;
|
||||
-webkit-border-radius: 4px 0 0 4px;
|
||||
-moz-border-radius: 4px 0 0 4px;
|
||||
border-radius: 4px 0 0 4px;
|
||||
}
|
||||
.subnav .nav li:last-child a {
|
||||
border-right: 0;
|
||||
|
||||
@ -899,7 +899,7 @@
|
||||
<div class="span9">
|
||||
<form class="well">
|
||||
<label>Label name</label>
|
||||
<input type="text" class="span3" placeholder="Type something…">
|
||||
<input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox"> Check me out
|
||||
</label>
|
||||
@ -1066,6 +1066,19 @@
|
||||
<span class="help-inline">Woohoo!</span>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="control-group success">
|
||||
<label class="control-label" for="selectError">Select with success</label>
|
||||
<div class="controls">
|
||||
<select name="selectError">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
<option>5</option>
|
||||
</select>
|
||||
<span class="help-inline">Woohoo!</span>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="form-actions">
|
||||
<button type="submit" class="btn primary">Save changes</button>
|
||||
<button type="reset" class="btn">Cancel</button>
|
||||
|
||||
15
docs/templates/pages/base-css.mustache
vendored
15
docs/templates/pages/base-css.mustache
vendored
@ -835,7 +835,7 @@
|
||||
<div class="span9">
|
||||
<form class="well">
|
||||
<label>{{_i}}Label name{{/i}}</label>
|
||||
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}">
|
||||
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox"> {{_i}}Check me out{{/i}}
|
||||
</label>
|
||||
@ -1002,6 +1002,19 @@
|
||||
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="control-group success">
|
||||
<label class="control-label" for="selectError">{{_i}}Select with success{{/i}}</label>
|
||||
<div class="controls">
|
||||
<select name="selectError">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
<option>4</option>
|
||||
<option>5</option>
|
||||
</select>
|
||||
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="form-actions">
|
||||
<button type="submit" class="btn primary">{{_i}}Save changes{{/i}}</button>
|
||||
<button type="reset" class="btn">{{_i}}Cancel{{/i}}</button>
|
||||
|
||||
@ -20,6 +20,12 @@
|
||||
.transition(.6s ease-in-out left);
|
||||
}
|
||||
|
||||
// Account for jankitude on images
|
||||
.item > img {
|
||||
display: block;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
.active,
|
||||
.next,
|
||||
.prev { display: block; }
|
||||
|
||||
@ -52,7 +52,7 @@ input,
|
||||
textarea,
|
||||
select,
|
||||
.uneditable-input {
|
||||
display: block;
|
||||
display: inline-block;
|
||||
width: 210px;
|
||||
height: @baseLineHeight;
|
||||
padding: 4px;
|
||||
@ -283,6 +283,7 @@ textarea[readonly] {
|
||||
}
|
||||
// Style inputs accordingly
|
||||
input,
|
||||
select,
|
||||
textarea {
|
||||
color: @textColor;
|
||||
border-color: @borderColor;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user