From e5b4a1ced5aef8bd050b48873d3e74fb2dfe799e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 Sep 2011 13:18:10 -0700 Subject: [PATCH] adding .brand to topbar for alternative to using an h3 for wordmark; spelling mistakes fixed --- bootstrap-1.3.0.css | 6 +++--- bootstrap-1.3.0.min.css | 2 +- lib/patterns.less | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index 9eef0b12aa..bf117ca81d 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.css @@ -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; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index d16ecebb6f..c4427af4fa 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -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;} diff --git a/lib/patterns.less b/lib/patterns.less index 0b72054f76..0fb7193c2c 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -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;