mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-14 18:42:30 +03:00
Merge branch '2.0.1-wip' of https://github.com/twitter/bootstrap into 2.0.1-wip
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
Binary file not shown.
+28
-24
@@ -205,40 +205,40 @@
|
||||
.row-fluid > [class*="span"]:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
.row-fluid > .span1 {
|
||||
width: 5.801104972%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
.row-fluid > .span2 {
|
||||
width: 14.364640883%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
.row-fluid > .span3 {
|
||||
width: 22.928176794%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
.row-fluid > .span4 {
|
||||
width: 31.491712705%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
.row-fluid > .span5 {
|
||||
width: 40.055248616%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
.row-fluid > .span6 {
|
||||
width: 48.618784527%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
.row-fluid > .span7 {
|
||||
width: 57.182320438000005%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
.row-fluid > .span8 {
|
||||
width: 65.74585634900001%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
.row-fluid > .span9 {
|
||||
width: 74.30939226%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
.row-fluid > .span10 {
|
||||
width: 82.87292817100001%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
.row-fluid > .span11 {
|
||||
width: 91.436464082%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
.row-fluid > .span12 {
|
||||
width: 99.999999993%;
|
||||
}
|
||||
input.span1, textarea.span1, .uneditable-input.span1 {
|
||||
@@ -314,6 +314,10 @@
|
||||
.navbar .nav > .divider-vertical {
|
||||
display: none;
|
||||
}
|
||||
.navbar .nav .nav-header {
|
||||
color: #999999;
|
||||
text-shadow: none;
|
||||
}
|
||||
.navbar .nav > li > a, .navbar .dropdown-menu a {
|
||||
padding: 6px 15px;
|
||||
font-weight: bold;
|
||||
@@ -486,40 +490,40 @@
|
||||
.row-fluid > [class*="span"]:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
.row-fluid > .span1 {
|
||||
width: 5.982905983%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
.row-fluid > .span2 {
|
||||
width: 14.529914530000001%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
.row-fluid > .span3 {
|
||||
width: 23.076923077%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
.row-fluid > .span4 {
|
||||
width: 31.623931624%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
.row-fluid > .span5 {
|
||||
width: 40.170940171000005%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
.row-fluid > .span6 {
|
||||
width: 48.717948718%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
.row-fluid > .span7 {
|
||||
width: 57.264957265%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
.row-fluid > .span8 {
|
||||
width: 65.81196581200001%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
.row-fluid > .span9 {
|
||||
width: 74.358974359%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
.row-fluid > .span10 {
|
||||
width: 82.905982906%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
.row-fluid > .span11 {
|
||||
width: 91.45299145300001%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
.row-fluid > .span12 {
|
||||
width: 100%;
|
||||
}
|
||||
input.span1, textarea.span1, .uneditable-input.span1 {
|
||||
|
||||
Vendored
+98
-35
@@ -212,40 +212,40 @@ a:hover {
|
||||
.row-fluid > [class*="span"]:first-child {
|
||||
margin-left: 0;
|
||||
}
|
||||
.row-fluid .span1 {
|
||||
.row-fluid > .span1 {
|
||||
width: 6.382978723%;
|
||||
}
|
||||
.row-fluid .span2 {
|
||||
.row-fluid > .span2 {
|
||||
width: 14.89361702%;
|
||||
}
|
||||
.row-fluid .span3 {
|
||||
.row-fluid > .span3 {
|
||||
width: 23.404255317%;
|
||||
}
|
||||
.row-fluid .span4 {
|
||||
.row-fluid > .span4 {
|
||||
width: 31.914893614%;
|
||||
}
|
||||
.row-fluid .span5 {
|
||||
.row-fluid > .span5 {
|
||||
width: 40.425531911%;
|
||||
}
|
||||
.row-fluid .span6 {
|
||||
.row-fluid > .span6 {
|
||||
width: 48.93617020799999%;
|
||||
}
|
||||
.row-fluid .span7 {
|
||||
.row-fluid > .span7 {
|
||||
width: 57.446808505%;
|
||||
}
|
||||
.row-fluid .span8 {
|
||||
.row-fluid > .span8 {
|
||||
width: 65.95744680199999%;
|
||||
}
|
||||
.row-fluid .span9 {
|
||||
.row-fluid > .span9 {
|
||||
width: 74.468085099%;
|
||||
}
|
||||
.row-fluid .span10 {
|
||||
.row-fluid > .span10 {
|
||||
width: 82.97872339599999%;
|
||||
}
|
||||
.row-fluid .span11 {
|
||||
.row-fluid > .span11 {
|
||||
width: 91.489361693%;
|
||||
}
|
||||
.row-fluid .span12 {
|
||||
.row-fluid > .span12 {
|
||||
width: 99.99999998999999%;
|
||||
}
|
||||
.container {
|
||||
@@ -530,11 +530,16 @@ input,
|
||||
button,
|
||||
select,
|
||||
textarea {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
font-size: 13px;
|
||||
font-weight: normal;
|
||||
line-height: 18px;
|
||||
}
|
||||
input,
|
||||
button,
|
||||
select,
|
||||
textarea {
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
}
|
||||
label {
|
||||
display: block;
|
||||
margin-bottom: 5px;
|
||||
@@ -832,6 +837,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
|
||||
color: #999999;
|
||||
}
|
||||
.help-block {
|
||||
display: block;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 0;
|
||||
color: #999999;
|
||||
@@ -913,6 +919,7 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
|
||||
border-radius: 3px 0 0 3px;
|
||||
}
|
||||
.input-append .uneditable-input {
|
||||
border-left-color: #eee;
|
||||
border-right-color: #ccc;
|
||||
}
|
||||
.input-append .add-on {
|
||||
@@ -1693,15 +1700,18 @@ table .span12 {
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
|
||||
vertical-align: middle;
|
||||
background-color: #fafafa;
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
|
||||
background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
|
||||
background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
|
||||
background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
|
||||
background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
|
||||
background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
|
||||
background-repeat: no-repeat;
|
||||
background-color: #f5f5f5;
|
||||
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
|
||||
background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
|
||||
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
|
||||
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
|
||||
background-image: linear-gradient(top, #ffffff, #e6e6e6);
|
||||
background-repeat: repeat-x;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
|
||||
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
|
||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
|
||||
border: 1px solid #ccc;
|
||||
border-bottom-color: #bbb;
|
||||
-webkit-border-radius: 4px;
|
||||
@@ -1711,8 +1721,19 @@ table .span12 {
|
||||
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
|
||||
cursor: pointer;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
|
||||
*margin-left: .3em;
|
||||
}
|
||||
.btn:hover,
|
||||
.btn:active,
|
||||
.btn.active,
|
||||
.btn.disabled,
|
||||
.btn[disabled] {
|
||||
background-color: #e6e6e6;
|
||||
}
|
||||
.btn:active, .btn.active {
|
||||
background-color: #cccccc \9;
|
||||
}
|
||||
.btn:first-child {
|
||||
*margin-left: 0;
|
||||
}
|
||||
@@ -1779,7 +1800,9 @@ table .span12 {
|
||||
.btn-success,
|
||||
.btn-success:hover,
|
||||
.btn-info,
|
||||
.btn-info:hover {
|
||||
.btn-info:hover,
|
||||
.btn-inverse,
|
||||
.btn-inverse:hover {
|
||||
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
||||
color: #ffffff;
|
||||
}
|
||||
@@ -1787,7 +1810,8 @@ table .span12 {
|
||||
.btn-warning.active,
|
||||
.btn-danger.active,
|
||||
.btn-success.active,
|
||||
.btn-info.active {
|
||||
.btn-info.active,
|
||||
.btn-dark.active {
|
||||
color: rgba(255, 255, 255, 0.75);
|
||||
}
|
||||
.btn-primary {
|
||||
@@ -1910,6 +1934,30 @@ table .span12 {
|
||||
.btn-info:active, .btn-info.active {
|
||||
background-color: #24748c \9;
|
||||
}
|
||||
.btn-inverse {
|
||||
background-color: #393939;
|
||||
background-image: -moz-linear-gradient(top, #454545, #262626);
|
||||
background-image: -ms-linear-gradient(top, #454545, #262626);
|
||||
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#454545), to(#262626));
|
||||
background-image: -webkit-linear-gradient(top, #454545, #262626);
|
||||
background-image: -o-linear-gradient(top, #454545, #262626);
|
||||
background-image: linear-gradient(top, #454545, #262626);
|
||||
background-repeat: repeat-x;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#454545', endColorstr='#262626', GradientType=0);
|
||||
border-color: #262626 #262626 #000000;
|
||||
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
|
||||
}
|
||||
.btn-inverse:hover,
|
||||
.btn-inverse:active,
|
||||
.btn-inverse.active,
|
||||
.btn-inverse.disabled,
|
||||
.btn-inverse[disabled] {
|
||||
background-color: #262626;
|
||||
}
|
||||
.btn-inverse:active, .btn-inverse.active {
|
||||
background-color: #0c0c0c \9;
|
||||
}
|
||||
button.btn, input[type="submit"].btn {
|
||||
*padding-top: 2px;
|
||||
*padding-bottom: 2px;
|
||||
@@ -2042,7 +2090,8 @@ button.btn.small, input[type="submit"].btn.small {
|
||||
.btn-primary .caret,
|
||||
.btn-danger .caret,
|
||||
.btn-info .caret,
|
||||
.btn-success .caret {
|
||||
.btn-success .caret,
|
||||
.btn-inverse .caret {
|
||||
border-top-color: #ffffff;
|
||||
opacity: 0.75;
|
||||
filter: alpha(opacity=75);
|
||||
@@ -2115,27 +2164,31 @@ button.btn.small, input[type="submit"].btn.small {
|
||||
text-decoration: none;
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
.nav .nav-header {
|
||||
display: block;
|
||||
padding: 3px 15px;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
line-height: 18px;
|
||||
color: #999999;
|
||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.nav li + .nav-header {
|
||||
margin-top: 9px;
|
||||
}
|
||||
.nav-list {
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.nav-list > li > a, .nav-list .nav-header {
|
||||
display: block;
|
||||
padding: 3px 15px;
|
||||
margin-left: -15px;
|
||||
margin-right: -15px;
|
||||
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
|
||||
}
|
||||
.nav-list .nav-header {
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
line-height: 18px;
|
||||
color: #999999;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
.nav-list > li + .nav-header {
|
||||
margin-top: 9px;
|
||||
.nav-list > li > a {
|
||||
padding: 3px 15px;
|
||||
}
|
||||
.nav-list .active > a, .nav-list .active > a:hover {
|
||||
color: #ffffff;
|
||||
@@ -2483,6 +2536,13 @@ button.btn.small, input[type="submit"].btn.small {
|
||||
.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
|
||||
margin-top: 3px;
|
||||
}
|
||||
.navbar-form .input-append, .navbar-form .input-prepend {
|
||||
margin-top: 6px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.navbar-form .input-append input, .navbar-form .input-prepend input {
|
||||
margin-top: 0;
|
||||
}
|
||||
.navbar-search {
|
||||
position: relative;
|
||||
float: left;
|
||||
@@ -2841,6 +2901,9 @@ button.btn.small, input[type="submit"].btn.small {
|
||||
.modal-body {
|
||||
padding: 15px;
|
||||
}
|
||||
.modal-body .modal-form {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.modal-footer {
|
||||
padding: 14px 15px 15px;
|
||||
margin-bottom: 0;
|
||||
|
||||
@@ -181,7 +181,7 @@ hr.soften {
|
||||
top: 40px;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 1030;
|
||||
z-index: 1020; /* 10 less than .navbar-fixed to prevent any overlap */
|
||||
border-color: #d5d5d5;
|
||||
border-width: 0 0 1px; /* drop the border on the fixed edges */
|
||||
-webkit-border-radius: 0;
|
||||
@@ -190,6 +190,7 @@ hr.soften {
|
||||
-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
|
||||
-moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
|
||||
box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false); /* IE6-9 */
|
||||
}
|
||||
.subnav-fixed .nav {
|
||||
width: 938px;
|
||||
|
||||
Reference in New Issue
Block a user