mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 05:58:25 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Thornton 2011-09-10 14:04:51 -07:00
commit 39fc13093e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap-1.3.0.css vendored
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: Sat Sep 10 13:04:12 PDT 2011
* Date: Sat Sep 10 13:17:50 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).
@ -1215,10 +1215,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #ffffff;
text-decoration: none;
}
.topbar h3 {
.topbar .brand, .topbar h3 {
position: relative;
}
.topbar h3 a {
.topbar .brand a, .topbar h3 a {
float: left;
display: block;
padding: 8px 20px 12px;

2
bootstrap-1.3.0.min.css vendored
View File

@ -196,7 +196,7 @@ table .purple{color:#7a43b6;border-bottom-color:#7a43b6;}
table .headerSortUp.purple,table .headerSortDown.purple{background-color:#e2d5f0;}
.topbar{height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;}.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
.topbar a:hover,.topbar ul .active>a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;}
.topbar h3{position:relative;}.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
.topbar .brand,.topbar h3{position:relative;}.topbar .brand a,.topbar h3 a{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}
.topbar p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;}
.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}
.topbar form.pull-right{float:right;}

6
lib/patterns.less
View File

@ -32,6 +32,8 @@
}
// Website name
// h3 left for backwards compatibility
.brand,
h3 {
position: relative;
a {
@ -107,7 +109,7 @@
}
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
// For backwards compatability, include .topbar .fill
// For backwards compatibility, include .topbar .fill
.topbar-inner,
.topbar .fill {
background-color: #222;
@ -201,7 +203,7 @@
}
}
// For backwards compatability with new dropdowns, redeclare dropdown link padding
// For backwards compatibility with new dropdowns, redeclare dropdown link padding
.topbar ul .menu-dropdown li a,
.topbar ul .dropdown-menu li a {
padding: 4px 15px;