mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-05 16:42:29 +03:00
Merge branch 'master' into tagliala-patch-1
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
> li {
|
||||
display: inline-block;
|
||||
&+li:before {
|
||||
content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
|
||||
content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
|
||||
padding: 0 5px;
|
||||
color: @breadcrumb-color;
|
||||
}
|
||||
|
||||
@@ -61,6 +61,7 @@
|
||||
font-size: @font-size-base;
|
||||
font-weight: normal;
|
||||
line-height: 1;
|
||||
color: @input-color;
|
||||
text-align: center;
|
||||
background-color: @input-group-addon-bg;
|
||||
border: 1px solid @input-group-addon-border-color;
|
||||
|
||||
+14
-13
@@ -18,9 +18,9 @@ th {
|
||||
width: 100%;
|
||||
margin-bottom: @line-height-computed;
|
||||
// Cells
|
||||
thead,
|
||||
tbody,
|
||||
tfoot {
|
||||
> thead,
|
||||
> tbody,
|
||||
> tfoot {
|
||||
> tr {
|
||||
> th,
|
||||
> td {
|
||||
@@ -32,22 +32,23 @@ th {
|
||||
}
|
||||
}
|
||||
// Bottom align for column headings
|
||||
thead > tr > th {
|
||||
> thead > tr > th {
|
||||
vertical-align: bottom;
|
||||
border-bottom: 2px solid @table-border-color;
|
||||
}
|
||||
// Remove top border from thead by default
|
||||
caption + thead,
|
||||
colgroup + thead,
|
||||
thead:first-child {
|
||||
tr:first-child {
|
||||
th, td {
|
||||
> caption + thead,
|
||||
> colgroup + thead,
|
||||
> thead:first-child {
|
||||
> tr:first-child {
|
||||
> th,
|
||||
> td {
|
||||
border-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Account for multiple tbody instances
|
||||
tbody + tbody {
|
||||
> tbody + tbody {
|
||||
border-top: 2px solid @table-border-color;
|
||||
}
|
||||
|
||||
@@ -61,9 +62,9 @@ th {
|
||||
// Condensed table w/ half padding
|
||||
|
||||
.table-condensed {
|
||||
thead,
|
||||
tbody,
|
||||
tfoot {
|
||||
> thead,
|
||||
> tbody,
|
||||
> tfoot {
|
||||
> tr {
|
||||
> th,
|
||||
> td {
|
||||
|
||||
@@ -53,6 +53,7 @@ h1, h2, h3, h4, h5, h6,
|
||||
font-family: @headings-font-family;
|
||||
font-weight: @headings-font-weight;
|
||||
line-height: @headings-line-height;
|
||||
color: inherit;
|
||||
|
||||
small {
|
||||
font-weight: normal;
|
||||
|
||||
@@ -61,6 +61,8 @@
|
||||
@headings-font-family: @font-family-base;
|
||||
@headings-font-weight: 500;
|
||||
@headings-line-height: 1.1;
|
||||
@headings-color: inherit;
|
||||
|
||||
|
||||
// Iconography
|
||||
// -------------------------
|
||||
@@ -561,6 +563,7 @@
|
||||
@breadcrumb-bg: #f5f5f5;
|
||||
@breadcrumb-color: #ccc;
|
||||
@breadcrumb-active-color: @gray-light;
|
||||
@breadcrumb-separator: "/";
|
||||
|
||||
|
||||
// Carousel
|
||||
|
||||
Reference in New Issue
Block a user