diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index 37e03dee70693f40296c00b132f9f5c6b6a81c71..a654061b579fb6c868598e20d94bd61f6804f7ba 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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: Fri Aug 19 20:19:39 PDT 2011 + * Date: Fri Aug 19 22:27:16 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). @@ -594,14 +594,14 @@ blockquote p { line-height: 18px; margin-bottom: 0; } -blockquote small, blockquote cite { +blockquote small { display: block; font-size: 12px; font-weight: 300; line-height: 18px; color: #bfbfbf; } -blockquote small:before, blockquote cite:before { +blockquote small:before { content: '\2014 \00A0'; } address { @@ -1118,13 +1118,13 @@ div.topbar a { color: #bfbfbf; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } -div.topbar ul li a:hover, div.topbar ul li.active a, div.topbar a.logo:hover { +div.topbar a:hover, div.topbar ul li.active a { background-color: #333; - background-color: rgba(255, 255, 255, 0.15); + background-color: rgba(255, 255, 255, 0.05); color: #ffffff; text-decoration: none; } -div.topbar a.logo { +div.topbar h3 a { float: left; display: block; padding: 8px 20px 12px; @@ -1134,10 +1134,6 @@ div.topbar a.logo { font-weight: 200; line-height: 1; } -div.topbar a.logo img { - float: left; - margin-right: 6px; -} div.topbar form { float: left; margin: 5px 0 0 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index ddfa4a604ce18d3208bce094771907aedd841afd..716e3cb888ee3ceb0b053c49b74e9b1d091cfbad 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -77,7 +77,7 @@ strong{font-style:inherit;font-weight:bold;line-height:inherit;} em{font-style:italic;font-weight:inherit;line-height:inherit;} .muted{color:#e6e6e6;} blockquote{margin-bottom:18px;border-left:5px solid #eee;padding-left:15px;}blockquote p{font-size:14px;font-weight:300;line-height:18px;margin-bottom:0;} -blockquote small,blockquote cite{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before,blockquote cite:before{content:'\2014 \00A0';} +blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;color:#bfbfbf;}blockquote small:before{content:'\2014 \00A0';} address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} @@ -154,8 +154,8 @@ table.zebra-striped th.headerSortUp.orange,table.zebra-striped th.headerSortDown table.zebra-striped th.purple{color:#7a43b6;border-bottom-color:#7a43b6;} table.zebra-striped th.headerSortUp.purple,table.zebra-striped th.headerSortDown.purple{background-color:#e2d5f0;} div.topbar{background-color:#222222;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(#333333, #222222);background-image:-ms-linear-gradient(#333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(#333333, #222222);background-image:-o-linear-gradient(#333333, #222222);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);background-image:linear-gradient(#333333, #222222);height:40px;position:fixed;top:0;left:0;right:0;z-index:10000;overflow:visible;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}div.topbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -div.topbar ul li a:hover,div.topbar ul li.active a,div.topbar a.logo:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.15);color:#ffffff;text-decoration:none;} -div.topbar a.logo{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;color:#ffffff;font-size:20px;font-weight:200;line-height:1;}div.topbar a.logo img{float:left;margin-right:6px;} +div.topbar a:hover,div.topbar ul li.active a{background-color:#333;background-color:rgba(255, 255, 255, 0.05);color:#ffffff;text-decoration:none;} +div.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;} div.topbar form{float:left;margin:5px 0 0 0;position:relative;filter:alpha(opacity=100);-khtml-opacity:1;-moz-opacity:1;opacity:1;}div.topbar form input{background-color:#bfbfbf;background-color:rgba(255, 255, 255, 0.3);font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:1;width:220px;padding:4px 9px;color:#fff;color:rgba(255, 255, 255, 0.75);border:1px solid #111;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.25);-webkit-transition:none;-moz-transition:none;transition:none;}div.topbar form input:-moz-placeholder{color:#e6e6e6;} div.topbar form input::-webkit-input-placeholder{color:#e6e6e6;} div.topbar form input:hover{background-color:#444;background-color:rgba(255, 255, 255, 0.5);color:#fff;} diff --git a/docs/index.html b/docs/index.html index 8c6c43515d6a131cc3adc0a2fb9bf9ba6eb1006b..9fc2a9b90dc6390e8491760ef70315194cbefdbc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Twitter Bootstrap</title> + <title>Bootstrap, from Twitter</title> <!-- Le styles --> <link href="../bootstrap-1.0.0.css" rel="stylesheet"> @@ -20,8 +20,8 @@ <div class="topbar"> <div class="container fixed"> - <h3><a class="logo" href="#"> - <!-- <img src="assets/img/twitter-logo-no-bird.png" alt="Twitter" /> --> <span>Bootstrap</span> + <h3><a href="#"> + Bootstrap </a></h3> <ul> <li class="active"><a href="#masthead">Overview</a></li> @@ -41,7 +41,7 @@ <div id="masthead"> <div class="inner"> <div class="container"> - <h1>Twitter Bootstrap</h1> + <h1>Bootstrap, from Twitter</h1> <p class="lead"> Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.<br /> It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.<br /> diff --git a/lib/patterns.less b/lib/patterns.less index a60a9baab3b8ef7206570dd6bc57467e3a58ef13..e540bd6010b4b6b667e80e43724cb041925b1340 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -25,30 +25,25 @@ div.topbar { text-shadow: 0 -1px 0 rgba(0,0,0,.25); } - // Hover and active states for links - ul li a:hover, - ul li.active a, - a.logo:hover { + // Hover and active states + a:hover, + ul li.active a { background-color: #333; - background-color: rgba(255,255,255,.15); + background-color: rgba(255,255,255,.05); color: @white; text-decoration: none; } - // Logo - a.logo { + // Website name + h3 a { float: left; display: block; padding: 8px 20px 12px; - margin-left: -20px; + margin-left: -20px; // negative indent to left-align the text down the page color: @white; font-size: 20px; font-weight: 200; line-height: 1; - img { - float: left; - margin-right: 6px; - } } // Search Form