mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-02 16:04:07 +03:00
Code Activity

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

Browse Source 
Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
This commit is contained in:
Jacob Thornton
2011-09-02 11:49:41 -07:00
parent 3f242bc70c a4dc2c8955
commit db43777ddf
5 changed files with 32 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap-1.2.0.css
Vendored
+13 -11
View File
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Sep 2 11:48:59 PDT 2011
* Date: Fri Sep 2 11:49:21 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -1144,7 +1144,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
font-size: normal;
font-weight: 13px;
line-height: 1;
width: 220px;
padding: 4px 9px;
color: #fff;
color: rgba(255, 255, 255, 0.75);
@@ -1228,7 +1227,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
margin-left: 10px;
margin-right: 0;
}
.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
.topbar div > ul.secondary-nav .menu-dropdown,
.nav.secondary-nav .menu-dropdown,
.topbar div > ul.secondary-nav .dropdown-menu,
.nav.secondary-nav .dropdown-menu {
right: 0;
}
.topbar div > ul a.menu:hover,
@@ -1452,19 +1454,19 @@ a.menu:after, .dropdown-toggle:after {
border-bottom: 0;
color: #808080;
}
.tabs .dropdown-menu {
.tabs .menu-dropdown, .tabs .dropdown-menu {
top: 35px;
border-width: 1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
}
.tabs .dropdown-toggle:after {
.tabs a.menu:after, .tabs .dropdown-toggle:after {
border-top-color: #999;
margin-top: 15px;
margin-left: 5px;
}
.tabs .dropdown.open .dropdown-toggle:after {
.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
.pills a {
@@ -1571,6 +1573,11 @@ footer {
border-color: #0064cd #0064cd #003f81;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn.disabled {
cursor: default;
background-image: none;
@@ -1593,11 +1600,6 @@ footer {
-moz-box-shadow: none;
box-shadow: none;
}
.btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn.large {
font-size: 16px;
line-height: normal;