mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-05 16:42:29 +03:00
Merge branch '3.0.0-wip' into bs3_navbar_overhaul
Conflicts: components.html dist/css/bootstrap.min.css
This commit is contained in:
+8
-5
@@ -416,17 +416,15 @@ body {
|
||||
}
|
||||
|
||||
/* Typography */
|
||||
.bs-example-type .table td {
|
||||
.bs-example-type .table td:last-child {
|
||||
color: #999;
|
||||
vertical-align: middle;
|
||||
}
|
||||
.bs-example-type .table td,
|
||||
.bs-example-type .table th {
|
||||
.bs-example-type .table td {
|
||||
padding: 15px 0;
|
||||
border-color: #eee;
|
||||
}
|
||||
.bs-example-type .table tr:first-child td,
|
||||
.bs-example-type .table tr:first-child th {
|
||||
.bs-example-type .table tr:first-child td {
|
||||
border-top: 0;
|
||||
}
|
||||
.bs-example-type h1,
|
||||
@@ -709,6 +707,11 @@ body {
|
||||
.bs-social-buttons .twitter-share-button {
|
||||
width: 98px !important;
|
||||
}
|
||||
/* Style the GitHub buttons via CSS instead of inline attributes */
|
||||
.github-btn {
|
||||
border: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user