1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-13 09:04:14 +02:00

lots of property ordering

This commit is contained in:
Jacob Thornton
2012-04-16 16:34:08 -07:00
parent a3ec868ac2
commit 2881269e16
11 changed files with 137 additions and 144 deletions

View File

@@ -300,8 +300,8 @@ a:hover {
width: 6.382978723%; width: 6.382978723%;
} }
.container { .container {
margin-left: auto;
margin-right: auto; margin-right: auto;
margin-left: auto;
*zoom: 1; *zoom: 1;
} }
.container:before, .container:before,
@@ -313,8 +313,8 @@ a:hover {
clear: both; clear: both;
} }
.container-fluid { .container-fluid {
padding-left: 20px;
padding-right: 20px; padding-right: 20px;
padding-left: 20px;
*zoom: 1; *zoom: 1;
} }
.container-fluid:before, .container-fluid:before,
@@ -377,8 +377,8 @@ h2 small {
font-size: 18px; font-size: 18px;
} }
h3 { h3 {
line-height: 27px;
font-size: 18px; font-size: 18px;
line-height: 27px;
} }
h3 small { h3 small {
font-size: 14px; font-size: 14px;
@@ -450,13 +450,13 @@ dd {
margin-left: 9px; margin-left: 9px;
} }
.dl-horizontal dt { .dl-horizontal dt {
float: left;
width: 120px;
clear: left;
text-align: right;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
float: left;
clear: left;
width: 120px;
text-align: right;
} }
.dl-horizontal dd { .dl-horizontal dd {
margin-left: 130px; margin-left: 130px;
@@ -477,8 +477,8 @@ em {
color: #999999; color: #999999;
} }
abbr[title] { abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help; cursor: help;
border-bottom: 1px dotted #ddd;
} }
abbr.initialism { abbr.initialism {
font-size: 90%; font-size: 90%;
@@ -505,10 +505,10 @@ blockquote small:before {
} }
blockquote.pull-right { blockquote.pull-right {
float: right; float: right;
padding-left: 0;
padding-right: 15px; padding-right: 15px;
border-left: 0; padding-left: 0;
border-right: 5px solid #eeeeee; border-right: 5px solid #eeeeee;
border-left: 0;
} }
blockquote.pull-right p, blockquote.pull-right p,
blockquote.pull-right small { blockquote.pull-right small {
@@ -523,8 +523,8 @@ blockquote:after {
address { address {
display: block; display: block;
margin-bottom: 18px; margin-bottom: 18px;
line-height: 18px;
font-style: normal; font-style: normal;
line-height: 18px;
} }
small { small {
font-size: 100%; font-size: 100%;
@@ -554,16 +554,16 @@ pre {
margin: 0 0 9px; margin: 0 0 9px;
font-size: 12.025px; font-size: 12.025px;
line-height: 18px; line-height: 18px;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
white-space: pre-wrap;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.15); border: 1px solid rgba(0, 0, 0, 0.15);
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
} }
pre.prettyprint { pre.prettyprint {
margin-bottom: 18px; margin-bottom: 18px;
@@ -660,12 +660,12 @@ input[type="radio"] {
line-height: normal; line-height: normal;
cursor: pointer; cursor: pointer;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
border: 0 \9; border: 0 \9;
/* IE9 and down */ /* IE9 and down */
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
} }
input[type="image"] { input[type="image"] {
border: 0; border: 0;
@@ -674,9 +674,9 @@ input[type="file"] {
width: auto; width: auto;
padding: initial; padding: initial;
line-height: initial; line-height: initial;
border: initial;
background-color: #ffffff; background-color: #ffffff;
background-color: initial; background-color: initial;
border: initial;
-webkit-box-shadow: none; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
@@ -721,8 +721,8 @@ input[type="hidden"] {
} }
.radio, .radio,
.checkbox { .checkbox {
overflow: auto;
padding-left: 18px; padding-left: 18px;
overflow: auto;
} }
.radio input[type="radio"], .radio input[type="radio"],
.checkbox input[type="checkbox"] { .checkbox input[type="checkbox"] {
@@ -758,24 +758,24 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
outline: 0; outline: 0;
outline: thin dotted \9; outline: thin dotted \9;
/* IE6-9 */ /* IE6-9 */
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
} }
input[type="file"]:focus, input[type="file"]:focus,
input[type="radio"]:focus, input[type="radio"]:focus,
input[type="checkbox"]:focus, input[type="checkbox"]:focus,
select:focus { select:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
outline: thin dotted #333; outline: thin dotted #333;
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
} }
.input-mini { .input-mini {
width: 60px; width: 60px;
@@ -853,9 +853,9 @@ textarea[disabled],
input[readonly], input[readonly],
select[readonly], select[readonly],
textarea[readonly] { textarea[readonly] {
cursor: not-allowed;
background-color: #eeeeee; background-color: #eeeeee;
border-color: #ddd; border-color: #ddd;
cursor: not-allowed;
} }
.control-group.warning > label, .control-group.warning > label,
.control-group.warning .help-block, .control-group.warning .help-block,
@@ -963,14 +963,14 @@ select:focus:required:invalid:focus {
clear: both; clear: both;
} }
.uneditable-input { .uneditable-input {
overflow: hidden;
white-space: nowrap;
cursor: not-allowed;
background-color: #ffffff; background-color: #ffffff;
border-color: #eee; border-color: #eee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
cursor: not-allowed;
overflow: hidden;
white-space: nowrap;
} }
:-moz-placeholder { :-moz-placeholder {
color: #999999; color: #999999;
@@ -1029,8 +1029,8 @@ select:focus:required:invalid:focus {
.input-append .add-on { .input-append .add-on {
display: inline-block; display: inline-block;
width: auto; width: auto;
min-width: 16px;
height: 18px; height: 18px;
min-width: 16px;
padding: 4px 5px; padding: 4px 5px;
font-weight: normal; font-weight: normal;
line-height: 18px; line-height: 18px;
@@ -1072,8 +1072,8 @@ select:focus:required:invalid:focus {
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
} }
.input-append .uneditable-input { .input-append .uneditable-input {
border-left-color: #eee;
border-right-color: #ccc; border-right-color: #ccc;
border-left-color: #eee;
} }
.input-append .add-on:last-child, .input-append .add-on:last-child,
.input-append .btn:last-child { .input-append .btn:last-child {
@@ -1103,12 +1103,12 @@ select:focus:required:invalid:focus {
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
} }
.search-query { .search-query {
padding-left: 14px;
padding-right: 14px; padding-right: 14px;
padding-right: 4px \9;
padding-left: 14px;
padding-left: 4px \9; padding-left: 4px \9;
/* IE7-8 doesn't have border-radius, so don't indent the padding */ /* IE7-8 doesn't have border-radius, so don't indent the padding */
padding-right: 4px \9;
margin-bottom: 0; margin-bottom: 0;
-webkit-border-radius: 14px; -webkit-border-radius: 14px;
-moz-border-radius: 14px; -moz-border-radius: 14px;
@@ -1170,8 +1170,8 @@ select:focus:required:invalid:focus {
.form-inline .radio input[type="radio"], .form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] { .form-inline .checkbox input[type="checkbox"] {
float: left; float: left;
margin-left: 0;
margin-right: 3px; margin-right: 3px;
margin-left: 0;
} }
.control-group { .control-group {
margin-bottom: 9px; margin-bottom: 9px;
@@ -1199,10 +1199,10 @@ legend + .control-group {
text-align: right; text-align: right;
} }
.form-horizontal .controls { .form-horizontal .controls {
margin-left: 160px;
*display: inline-block; *display: inline-block;
*margin-left: 0;
*padding-left: 20px; *padding-left: 20px;
margin-left: 160px;
*margin-left: 0;
} }
.form-horizontal .controls:first-child { .form-horizontal .controls:first-child {
*padding-left: 160px; *padding-left: 160px;
@@ -1216,9 +1216,9 @@ legend + .control-group {
} }
table { table {
max-width: 100%; max-width: 100%;
background-color: transparent;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
background-color: transparent;
} }
.table { .table {
width: 100%; width: 100%;
@@ -1255,9 +1255,9 @@ table {
} }
.table-bordered { .table-bordered {
border: 1px solid #dddddd; border: 1px solid #dddddd;
border-left: 0;
border-collapse: separate; border-collapse: separate;
*border-collapse: collapsed; *border-collapse: collapsed;
border-left: 0;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
@@ -1280,14 +1280,14 @@ table {
.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered thead:first-child tr:first-child th:first-child,
.table-bordered tbody:first-child tr:first-child td:first-child { .table-bordered tbody:first-child tr:first-child td:first-child {
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
} }
.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered thead:first-child tr:first-child th:last-child,
.table-bordered tbody:first-child tr:first-child td:last-child { .table-bordered tbody:first-child tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
} }
.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered thead:last-child tr:last-child th:first-child,
.table-bordered tbody:last-child tr:last-child td:first-child { .table-bordered tbody:last-child tr:last-child td:first-child {
@@ -1295,14 +1295,14 @@ table {
-moz-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px; border-radius: 0 0 0 4px;
-webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
} }
.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered thead:last-child tr:last-child th:last-child,
.table-bordered tbody:last-child tr:last-child td:last-child { .table-bordered tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
} }
.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) td,
.table-striped tbody tr:nth-child(odd) th { .table-striped tbody tr:nth-child(odd) th {
@@ -1437,12 +1437,12 @@ table .span24 {
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
*margin-right: .3em;
line-height: 14px; line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url("../img/glyphicons-halflings.png"); background-image: url("../img/glyphicons-halflings.png");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
*margin-right: .3em;
} }
[class^="icon-"]:last-child, [class^="icon-"]:last-child,
[class*=" icon-"]:last-child { [class*=" icon-"]:last-child {
@@ -1887,12 +1887,12 @@ table .span24 {
width: 0; width: 0;
height: 0; height: 0;
vertical-align: top; vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #000000; border-top: 4px solid #000000;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
opacity: 0.3; opacity: 0.3;
filter: alpha(opacity=30); filter: alpha(opacity=30);
content: "";
} }
.dropdown .caret { .dropdown .caret {
margin-top: 8px; margin-top: 8px;
@@ -1908,8 +1908,8 @@ table .span24 {
top: 100%; top: 100%;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
float: left;
display: none; display: none;
float: left;
min-width: 160px; min-width: 160px;
padding: 4px 0; padding: 4px 0;
margin: 1px 0 0; margin: 1px 0 0;
@@ -1917,6 +1917,8 @@ table .span24 {
background-color: #ffffff; background-color: #ffffff;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2); border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
@@ -1926,21 +1928,19 @@ table .span24 {
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding; -moz-background-clip: padding;
background-clip: padding-box; background-clip: padding-box;
*border-right-width: 2px;
*border-bottom-width: 2px;
} }
.dropdown-menu.pull-right { .dropdown-menu.pull-right {
right: 0; right: 0;
left: auto; left: auto;
} }
.dropdown-menu .divider { .dropdown-menu .divider {
*width: 100%;
height: 1px; height: 1px;
margin: 8px 1px; margin: 8px 1px;
*margin: -5px 0 5px;
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
*width: 100%;
*margin: -5px 0 5px;
} }
.dropdown-menu a { .dropdown-menu a {
display: block; display: block;
@@ -1965,8 +1965,8 @@ table .span24 {
display: block; display: block;
} }
.pull-right .dropdown-menu { .pull-right .dropdown-menu {
left: auto;
right: 0; right: 0;
left: auto;
} }
.dropup .caret, .dropup .caret,
.navbar-fixed-bottom .dropdown .caret { .navbar-fixed-bottom .dropdown .caret {
@@ -2017,25 +2017,25 @@ table .span24 {
border-radius: 3px; border-radius: 3px;
} }
.fade { .fade {
opacity: 0;
-webkit-transition: opacity 0.15s linear; -webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear; -moz-transition: opacity 0.15s linear;
-ms-transition: opacity 0.15s linear; -ms-transition: opacity 0.15s linear;
-o-transition: opacity 0.15s linear; -o-transition: opacity 0.15s linear;
transition: opacity 0.15s linear; transition: opacity 0.15s linear;
opacity: 0;
} }
.fade.in { .fade.in {
opacity: 1; opacity: 1;
} }
.collapse { .collapse {
position: relative;
height: 0;
overflow: hidden;
-webkit-transition: height 0.35s ease; -webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease; -moz-transition: height 0.35s ease;
-ms-transition: height 0.35s ease; -ms-transition: height 0.35s ease;
-o-transition: height 0.35s ease; -o-transition: height 0.35s ease;
transition: height 0.35s ease; transition: height 0.35s ease;
position: relative;
overflow: hidden;
height: 0;
} }
.collapse.in { .collapse.in {
height: auto; height: auto;
@@ -2053,9 +2053,9 @@ table .span24 {
.close:hover { .close:hover {
color: #000000; color: #000000;
text-decoration: none; text-decoration: none;
cursor: pointer;
opacity: 0.4; opacity: 0.4;
filter: alpha(opacity=40); filter: alpha(opacity=40);
cursor: pointer;
} }
button.close { button.close {
padding: 0; padding: 0;
@@ -2074,10 +2074,12 @@ button.close {
margin-bottom: 0; margin-bottom: 0;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
*line-height: 20px;
color: #333333; color: #333333;
text-align: center; text-align: center;
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
vertical-align: middle; vertical-align: middle;
cursor: pointer;
background-color: #f5f5f5; background-color: #f5f5f5;
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);
@@ -2089,24 +2091,20 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf; 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); 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);
*background-color: #e6e6e6; *background-color: #e6e6e6;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
border: 1px solid #cccccc; border: 1px solid #cccccc;
*border: 0;
border-bottom-color: #b3b3b3; border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
*margin-left: .3em;
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
cursor: pointer;
*margin-left: .3em;
/* Remove the border to prevent IE7's black border on input:focus */
*border: 0;
*line-height: 20px;
} }
.btn:hover, .btn:hover,
.btn:active, .btn:active,
@@ -2144,19 +2142,19 @@ button.close {
} }
.btn.active, .btn.active,
.btn:active { .btn:active {
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
background-image: none; background-image: none;
outline: 0;
-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
outline: 0;
} }
.btn.disabled, .btn.disabled,
.btn[disabled] { .btn[disabled] {
cursor: default; cursor: default;
background-image: none;
background-color: #e6e6e6; background-color: #e6e6e6;
background-image: none;
opacity: 0.65; opacity: 0.65;
filter: alpha(opacity=65); filter: alpha(opacity=65);
-webkit-box-shadow: none; -webkit-box-shadow: none;
@@ -2199,8 +2197,8 @@ button.close {
.btn-info:hover, .btn-info:hover,
.btn-inverse, .btn-inverse,
.btn-inverse:hover { .btn-inverse:hover {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
color: #ffffff; color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
} }
.btn-primary.active, .btn-primary.active,
.btn-warning.active, .btn-warning.active,
@@ -2222,10 +2220,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
border-color: #0055cc #0055cc #003580; border-color: #0055cc #0055cc #003580;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #0055cc; *background-color: #0055cc;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-primary:hover, .btn-primary:hover,
.btn-primary:active, .btn-primary:active,
@@ -2251,10 +2249,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
border-color: #f89406 #f89406 #ad6704; border-color: #f89406 #f89406 #ad6704;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #f89406; *background-color: #f89406;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-warning:hover, .btn-warning:hover,
.btn-warning:active, .btn-warning:active,
@@ -2280,10 +2278,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
border-color: #bd362f #bd362f #802420; border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #bd362f; *background-color: #bd362f;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-danger:hover, .btn-danger:hover,
.btn-danger:active, .btn-danger:active,
@@ -2309,10 +2307,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
border-color: #51a351 #51a351 #387038; border-color: #51a351 #51a351 #387038;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #51a351; *background-color: #51a351;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-success:hover, .btn-success:hover,
.btn-success:active, .btn-success:active,
@@ -2338,10 +2336,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
border-color: #2f96b4 #2f96b4 #1f6377; border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #2f96b4; *background-color: #2f96b4;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-info:hover, .btn-info:hover,
.btn-info:active, .btn-info:active,
@@ -2367,10 +2365,10 @@ button.close {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
border-color: #222222 #222222 #000000; border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #222222; *background-color: #222222;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
} }
.btn-inverse:hover, .btn-inverse:hover,
.btn-inverse:active, .btn-inverse:active,
@@ -2678,13 +2676,13 @@ input[type="submit"].btn.btn-mini {
margin-right: 2px; margin-right: 2px;
} }
.nav-list .divider { .nav-list .divider {
*width: 100%;
height: 1px; height: 1px;
margin: 8px 1px; margin: 8px 1px;
*margin: -5px 0 5px;
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
*width: 100%;
*margin: -5px 0 5px;
} }
.nav-tabs, .nav-tabs,
.nav-pills { .nav-pills {
@@ -3172,10 +3170,10 @@ input[type="submit"].btn.btn-mini {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
border-color: #222222 #222222 #000000; border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); 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);
*background-color: #222222; *background-color: #222222;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);

View File

@@ -13,23 +13,19 @@
margin-bottom: 0; // For input.btn margin-bottom: 0; // For input.btn
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: @baseLineHeight; line-height: @baseLineHeight;
*line-height: 20px;
color: @grayDark; color: @grayDark;
text-align: center; text-align: center;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
vertical-align: middle; vertical-align: middle;
cursor: pointer;
.buttonBackground(@btnBackground, @btnBackgroundHighlight); .buttonBackground(@btnBackground, @btnBackgroundHighlight);
border: 1px solid @btnBorder; border: 1px solid @btnBorder;
*border: 0; // Remove the border to prevent IE7's black border on input:focus
border-bottom-color: darken(@btnBorder, 10%); border-bottom-color: darken(@btnBorder, 10%);
.border-radius(4px); .border-radius(4px);
.ie7-restore-left-whitespace(); // Give IE7 some love
.box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
cursor: pointer;
// Give IE7 some love
.ie7-restore-left-whitespace();
/* Remove the border to prevent IE7's black border on input:focus */
*border: 0;
*line-height: 20px;
} }
// Hover state // Hover state
@@ -53,19 +49,19 @@
// Active state // Active state
.btn.active, .btn.active,
.btn:active { .btn:active {
background-image: none;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-color: darken(@white, 15%) e("\9"); background-color: darken(@white, 15%) e("\9");
background-image: none;
outline: 0; outline: 0;
.box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
} }
// Disabled state // Disabled state
.btn.disabled, .btn.disabled,
.btn[disabled] { .btn[disabled] {
cursor: default; cursor: default;
background-image: none;
background-color: darken(@white, 10%); background-color: darken(@white, 10%);
background-image: none;
.opacity(65); .opacity(65);
.box-shadow(none); .box-shadow(none);
} }
@@ -120,8 +116,8 @@
.btn-info:hover, .btn-info:hover,
.btn-inverse, .btn-inverse,
.btn-inverse:hover { .btn-inverse:hover {
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
color: @white; color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
} }
// Provide *some* extra contrast for those who can get it // Provide *some* extra contrast for those who can get it
.btn-primary.active, .btn-primary.active,

View File

@@ -12,8 +12,8 @@
&:hover { &:hover {
color: @black; color: @black;
text-decoration: none; text-decoration: none;
.opacity(40);
cursor: pointer; cursor: pointer;
.opacity(40);
} }
} }

View File

@@ -27,14 +27,14 @@ pre {
margin: 0 0 @baseLineHeight / 2; margin: 0 0 @baseLineHeight / 2;
font-size: @baseFontSize * .925; // 13px to 12px font-size: @baseFontSize * .925; // 13px to 12px
line-height: @baseLineHeight; line-height: @baseLineHeight;
word-break: break-all;
word-wrap: break-word;
white-space: pre;
white-space: pre-wrap;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc; // fallback for IE7-8 border: 1px solid #ccc; // fallback for IE7-8
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
.border-radius(4px); .border-radius(4px);
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
word-wrap: break-word;
// Make prettyprint styles more spaced out for readability // Make prettyprint styles more spaced out for readability
&.prettyprint { &.prettyprint {

View File

@@ -2,18 +2,18 @@
// -------------------- // --------------------
.fade { .fade {
.transition(opacity .15s linear);
opacity: 0; opacity: 0;
.transition(opacity .15s linear);
&.in { &.in {
opacity: 1; opacity: 1;
} }
} }
.collapse { .collapse {
.transition(height .35s ease);
position:relative; position:relative;
overflow:hidden;
height: 0; height: 0;
overflow:hidden;
.transition(height .35s ease);
&.in { &.in {
height: auto; height: auto;
} }

View File

@@ -22,11 +22,11 @@
width: 0; width: 0;
height: 0; height: 0;
vertical-align: top; vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid @black; border-top: 4px solid @black;
.opacity(30); border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: ""; content: "";
.opacity(30);
} }
// Place the caret // Place the caret
@@ -46,8 +46,8 @@
top: 100%; top: 100%;
left: 0; left: 0;
z-index: @zindexDropdown; z-index: @zindexDropdown;
float: left;
display: none; // none by default, but block on "open" of the menu display: none; // none by default, but block on "open" of the menu
float: left;
min-width: 160px; min-width: 160px;
padding: 4px 0; padding: 4px 0;
margin: 1px 0 0; // override default ul margin: 1px 0 0; // override default ul
@@ -55,13 +55,13 @@
background-color: @dropdownBackground; background-color: @dropdownBackground;
border: 1px solid #ccc; border: 1px solid #ccc;
border: 1px solid rgba(0,0,0,.2); border: 1px solid rgba(0,0,0,.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
.border-radius(5px); .border-radius(5px);
.box-shadow(0 5px 10px rgba(0,0,0,.2)); .box-shadow(0 5px 10px rgba(0,0,0,.2));
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding; -moz-background-clip: padding;
background-clip: padding-box; background-clip: padding-box;
*border-right-width: 2px;
*border-bottom-width: 2px;
// Aligns the dropdown menu to right // Aligns the dropdown menu to right
&.pull-right { &.pull-right {
@@ -111,8 +111,8 @@
// Right aligned dropdowns // Right aligned dropdowns
// --------------------------- // ---------------------------
.pull-right .dropdown-menu { .pull-right .dropdown-menu {
left: auto;
right: 0; right: 0;
left: auto;
} }
// Allow for dropdowns to go bottom up (aka, dropup-menu) // Allow for dropdowns to go bottom up (aka, dropup-menu)

View File

@@ -98,8 +98,8 @@ input[type="radio"] {
*margin-top: 0; /* IE7 */ *margin-top: 0; /* IE7 */
line-height: normal; line-height: normal;
cursor: pointer; cursor: pointer;
.border-radius(0);
border: 0 \9; /* IE9 and down */ border: 0 \9; /* IE9 and down */
.border-radius(0);
} }
input[type="image"] { input[type="image"] {
border: 0; border: 0;
@@ -110,9 +110,9 @@ input[type="file"] {
width: auto; width: auto;
padding: initial; padding: initial;
line-height: initial; line-height: initial;
border: initial;
background-color: @inputBackground; background-color: @inputBackground;
background-color: initial; background-color: initial;
border: initial;
.box-shadow(none); .box-shadow(none);
} }
@@ -172,8 +172,8 @@ input[type="hidden"] {
// Indent the labels to position radios/checkboxes as hanging // Indent the labels to position radios/checkboxes as hanging
.radio, .radio,
.checkbox { .checkbox {
overflow: auto; // clear the floating input if there is no label text
padding-left: 18px; padding-left: 18px;
overflow: auto; // clear the floating input if there is no label text
} }
.radio input[type="radio"], .radio input[type="radio"],
.checkbox input[type="checkbox"] { .checkbox input[type="checkbox"] {
@@ -215,16 +215,16 @@ textarea {
input:focus, input:focus,
textarea:focus { textarea:focus {
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
outline: 0; outline: 0;
outline: thin dotted \9; /* IE6-9 */ outline: thin dotted \9; /* IE6-9 */
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
} }
input[type="file"]:focus, input[type="file"]:focus,
input[type="radio"]:focus, input[type="radio"]:focus,
input[type="checkbox"]:focus, input[type="checkbox"]:focus,
select:focus { select:focus {
.box-shadow(none); // override for file inputs
.tab-focus(); .tab-focus();
.box-shadow(none); // override for file inputs
} }
@@ -274,9 +274,9 @@ textarea[disabled],
input[readonly], input[readonly],
select[readonly], select[readonly],
textarea[readonly] { textarea[readonly] {
cursor: not-allowed;
background-color: @inputDisabledBackground; background-color: @inputDisabledBackground;
border-color: #ddd; border-color: #ddd;
cursor: not-allowed;
} }
@@ -327,13 +327,12 @@ select:focus:required:invalid {
// For text that needs to appear as an input but should not be an input // For text that needs to appear as an input but should not be an input
.uneditable-input { .uneditable-input {
overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
white-space: nowrap;
cursor: not-allowed;
background-color: @inputBackground; background-color: @inputBackground;
border-color: #eee; border-color: #eee;
.box-shadow(inset 0 1px 2px rgba(0,0,0,.025)); .box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
cursor: not-allowed;
// prevent text from wrapping, but still cut it off like an input does
overflow: hidden;
white-space: nowrap;
} }
// Placeholder text gets special styles; can't be bundled together though for some reason // Placeholder text gets special styles; can't be bundled together though for some reason
@@ -389,8 +388,8 @@ select:focus:required:invalid {
.add-on { .add-on {
display: inline-block; display: inline-block;
width: auto; width: auto;
min-width: 16px;
height: @baseLineHeight; height: @baseLineHeight;
min-width: 16px;
padding: 4px 5px; padding: 4px 5px;
font-weight: normal; font-weight: normal;
line-height: @baseLineHeight; line-height: @baseLineHeight;
@@ -427,8 +426,8 @@ select:focus:required:invalid {
.border-radius(@inputBorderRadius 0 0 @inputBorderRadius); .border-radius(@inputBorderRadius 0 0 @inputBorderRadius);
} }
.uneditable-input { .uneditable-input {
border-left-color: #eee;
border-right-color: #ccc; border-right-color: #ccc;
border-left-color: #eee;
} }
.add-on:last-child, .add-on:last-child,
.btn:last-child { .btn:last-child {
@@ -460,10 +459,10 @@ select:focus:required:invalid {
// ----------- // -----------
.search-query { .search-query {
padding-left: 14px;
padding-right: 14px; padding-right: 14px;
padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
padding-right: 4px \9; padding-right: 4px \9;
padding-left: 14px;
padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
margin-bottom: 0; // remove the default margin on all inputs margin-bottom: 0; // remove the default margin on all inputs
.border-radius(14px); .border-radius(14px);
} }
@@ -521,8 +520,8 @@ select:focus:required:invalid {
.form-inline .radio input[type="radio"], .form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] { .form-inline .checkbox input[type="checkbox"] {
float: left; float: left;
margin-left: 0;
margin-right: 3px; margin-right: 3px;
margin-left: 0;
} }
@@ -555,11 +554,12 @@ legend + .control-group {
} }
// Move over all input controls and content // Move over all input controls and content
.controls { .controls {
margin-left: 160px; // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
// Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls // don't inherit the margin of the parent, in this case .controls
*display: inline-block; *display: inline-block;
*margin-left: 0;
*padding-left: 20px; *padding-left: 20px;
margin-left: 160px;
*margin-left: 0;
&:first-child { &:first-child {
*padding-left: 160px; *padding-left: 160px;
} }

View File

@@ -417,18 +417,17 @@
// ------------------------- // -------------------------
// Dividers (basically an hr) within dropdowns and nav lists // Dividers (basically an hr) within dropdowns and nav lists
.nav-divider() { .nav-divider() {
height: 1px;
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid @white;
// IE7 needs a set width since we gave a height. Restricting just // IE7 needs a set width since we gave a height. Restricting just
// to IE7 to keep the 1px left/right space in other browsers. // to IE7 to keep the 1px left/right space in other browsers.
// It is unclear where IE is getting the extra space that we need // It is unclear where IE is getting the extra space that we need
// to negative-margin away, but so it goes. // to negative-margin away, but so it goes.
*width: 100%; *width: 100%;
height: 1px;
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
*margin: -5px 0 5px; *margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid @white;
} }
// Button backgrounds // Button backgrounds
@@ -436,8 +435,8 @@
.buttonBackground(@startColor, @endColor) { .buttonBackground(@startColor, @endColor) {
// gradientBar will set the background to a pleasing blend of these, to support IE<=9 // gradientBar will set the background to a pleasing blend of these, to support IE<=9
.gradientBar(@startColor, @endColor); .gradientBar(@startColor, @endColor);
.reset-filter();
*background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ *background-color: @endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
.reset-filter();
// in these cases the gradient won't cover the background, so we override // in these cases the gradient won't cover the background, so we override
&:hover, &:active, &.active, &.disabled, &[disabled] { &:hover, &:active, &.active, &.disabled, &[disabled] {

View File

@@ -19,13 +19,13 @@
display: inline-block; display: inline-block;
width: 14px; width: 14px;
height: 14px; height: 14px;
.ie7-restore-right-whitespace();
line-height: 14px; line-height: 14px;
vertical-align: text-top; vertical-align: text-top;
background-image: url("@{iconSpritePath}"); background-image: url("@{iconSpritePath}");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
.ie7-restore-right-whitespace();
} }
.icon-white { .icon-white {
background-image: url("@{iconWhiteSpritePath}"); background-image: url("@{iconWhiteSpritePath}");

View File

@@ -9,9 +9,9 @@
table { table {
max-width: 100%; max-width: 100%;
background-color: @tableBackground;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0; border-spacing: 0;
background-color: @tableBackground;
} }
// BASELINE STYLES // BASELINE STYLES
@@ -69,9 +69,9 @@ table {
.table-bordered { .table-bordered {
border: 1px solid @tableBorder; border: 1px solid @tableBorder;
border-left: 0;
border-collapse: separate; // Done so we can round those corners! border-collapse: separate; // Done so we can round those corners!
*border-collapse: collapsed; // IE7 can't round corners anyway *border-collapse: collapsed; // IE7 can't round corners anyway
border-left: 0;
.border-radius(4px); .border-radius(4px);
th, th,
td { td {
@@ -93,28 +93,28 @@ table {
thead:first-child tr:first-child th:first-child, thead:first-child tr:first-child th:first-child,
tbody:first-child tr:first-child td:first-child { tbody:first-child tr:first-child td:first-child {
-webkit-border-top-left-radius: 4px; -webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
} }
thead:first-child tr:first-child th:last-child, thead:first-child tr:first-child th:last-child,
tbody:first-child tr:first-child td:last-child { tbody:first-child tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px; -webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
} }
// For first th or td in the first row in the first thead or tbody // For first th or td in the first row in the first thead or tbody
thead:last-child tr:last-child th:first-child, thead:last-child tr:last-child th:first-child,
tbody:last-child tr:last-child td:first-child { tbody:last-child tr:last-child td:first-child {
.border-radius(0 0 0 4px); .border-radius(0 0 0 4px);
-webkit-border-bottom-left-radius: 4px; -webkit-border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
} }
thead:last-child tr:last-child th:last-child, thead:last-child tr:last-child th:last-child,
tbody:last-child tr:last-child td:last-child { tbody:last-child tr:last-child td:last-child {
-webkit-border-bottom-right-radius: 4px; -webkit-border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
-moz-border-radius-bottomright: 4px;
} }
} }

View File

@@ -135,11 +135,11 @@ dd {
// Horizontal layout (like forms) // Horizontal layout (like forms)
.dl-horizontal { .dl-horizontal {
dt { dt {
.text-overflow();
float: left; float: left;
clear: left;
width: 120px; width: 120px;
clear: left;
text-align: right; text-align: right;
.text-overflow();
} }
dd { dd {
margin-left: 130px; margin-left: 130px;
@@ -170,8 +170,8 @@ em {
// Abbreviations and acronyms // Abbreviations and acronyms
abbr[title] { abbr[title] {
border-bottom: 1px dotted #ddd;
cursor: help; cursor: help;
border-bottom: 1px dotted #ddd;
} }
abbr.initialism { abbr.initialism {
font-size: 90%; font-size: 90%;
@@ -199,10 +199,10 @@ blockquote {
// Float right with text-align: right // Float right with text-align: right
&.pull-right { &.pull-right {
float: right; float: right;
padding-left: 0;
padding-right: 15px; padding-right: 15px;
border-left: 0; padding-left: 0;
border-right: 5px solid @grayLighter; border-right: 5px solid @grayLighter;
border-left: 0;
p, p,
small { small {
text-align: right; text-align: right;
@@ -222,8 +222,8 @@ blockquote:after {
address { address {
display: block; display: block;
margin-bottom: @baseLineHeight; margin-bottom: @baseLineHeight;
line-height: @baseLineHeight;
font-style: normal; font-style: normal;
line-height: @baseLineHeight;
} }
// Misc // Misc