mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Browse Source
This commit is contained in:
Jacob Thornton
2012-01-28 12:09:16 -08:00
parent 12d3c2fe74 39f70afed9
commit e1a1fdd35d
7 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
docs/assets/css/bootstrap.css vendored
View File

@@ -36,9 +36,6 @@ a:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
-moz-outline: 5px auto -moz-mac-focusring;
-moz-outline-radius: 6px;
-moz-outline-offset: 0;
}
a:hover, a:active {
outline: 0;
@@ -627,9 +624,6 @@ input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
-moz-outline: 5px auto -moz-mac-focusring;
-moz-outline-radius: 6px;
-moz-outline-offset: 0;
}
.input-mini {
width: 60px;
@@ -1490,9 +1484,12 @@ table .span12 {
.dropdown {
position: relative;
}
.dropdown .dropdown-toggle {
.dropdown-toggle {
*margin-bottom: -3px;
}
.dropdown-toggle:active, .open .dropdown-toggle {
outline: 0;
}
.caret {
display: inline-block;
width: 0;
@@ -1986,7 +1983,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
.navbar-search .search-query::-webkit-input-placeholder {
.navbar-search .search-query ::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
@@ -2303,7 +2300,7 @@ table .span12 {
top: 50%;
}
.modal-header {
padding: 5px 15px;
padding: 9px 15px;
border-bottom: 1px solid #eee;
}
.modal-header .close {
@@ -2653,9 +2650,6 @@ table .span12 {
outline: thin dotted;
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
-moz-outline: 5px auto -moz-mac-focusring;
-moz-outline-radius: 6px;
-moz-outline-offset: 0;
}
.btn.active, .btn:active {
background-image: none;
@@ -2665,6 +2659,7 @@ table .span12 {
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
color: rgba(0, 0, 0, 0.5);
outline: 0;
}
.btn.disabled, .btn[disabled] {
cursor: default;
@@ -2788,6 +2783,9 @@ button.btn.small, input[type="submit"].btn.small {
.btn-group .btn.active {
z-index: 2;
}
.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
outline: 0;
}
.btn-group .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;

17
docs/assets/css/docs.css
View File

@@ -173,10 +173,9 @@ hr.soften {
}
.subnav .nav > li > a {
margin: 0;
padding-top: 11px;
padding-top: 11px;
padding-bottom: 11px;
font-size: 13px;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
border-left: 1px solid #f5f5f5;
border-right: 1px solid #e5e5e5;
-webkit-border-radius: 0;
@@ -202,10 +201,18 @@ hr.soften {
.subnav .nav > li:first-child > a:hover {
border-left: 0;
padding-left: 12px;
-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;
}
.subnav .dropdown-menu {
-webkit-border-radius: 0 0 4px 4px;
-moz-border-radius: 0 0 4px 4px;
border-radius: 0 0 4px 4px;
}
/* Fixed subnav on scroll, but only for 940px and up (sorry IE!) */
@media (min-width: 940px) {
@@ -229,6 +236,12 @@ hr.soften {
margin: 0 auto;
padding: 0 1px;
}
.subnav .nav > li:first-child > a,
.subnav .nav > li:first-child > a:hover {
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
}