0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

fix topbar link with button bug

This commit is contained in:
Mark Otto 2011-09-12 19:00:44 -07:00
parent 8f5f35e6db
commit 3f64aaf82b
4 changed files with 17 additions and 9 deletions

5
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: Mon Sep 12 13:32:28 PDT 2011
* Date: Mon Sep 12 19:00: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).
@ -1298,7 +1298,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #bfbfbf;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.topbar a:hover, .topbar ul .active > a {
.topbar h3 a:hover, .topbar .brand a:hover, .topbar ul .active > a {
background-color: #333;
background-color: rgba(255, 255, 255, 0.05);
color: #ffffff;
@ -1323,6 +1323,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
}
.topbar p a:hover {
background-color: transparent;
color: #ffffff;
}
.topbar form {
float: left;

View File

@ -214,10 +214,10 @@ table .headerSortUp.orange,table .headerSortDown.orange{background-color:#fee9cc
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 a:hover,.topbar .brand 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,.topbar .brand{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 p{margin:0;line-height:40px;}.topbar p a:hover{background-color:transparent;color:#ffffff;}
.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;}
.topbar input{background-color:#444;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;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;-ms-transition:none;-o-transition:none;transition:none;}.topbar input:-moz-placeholder{color:#e6e6e6;}

View File

@ -118,9 +118,12 @@
<div class="row">
<div class="span-one-third">
<h3>History</h3>
<p>In the earlier days of Twitter, engineers used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented and development quickly accelerated during Twitters first Hackweek.</p>
<p>With the help and feedback of many engineers at Twitter, Bootstrap has grown significantly to encompass not only basic styles, but more elegant and durable front-end design patterns.</p>
<p>Engineers at Twitter have historically used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented. With the help of many awesome folks, Bootstrap has grown significantly.</p>
<p>Read more on <a href="https://dev.twitter.com/blog/bootstrap-twitter">dev.twitter.com &rsaquo;</a></p>
<p>
<a href="http://twitter.com/twbootstrap" class="twitter-follow-button">Follow @twbootstrap</a>
<script src="http://platform.twitter.com/widgets.js" type="text/javascript"></script>
</p>
</div>
<div class="span-one-third">
<h3>Browser support</h3>

View File

@ -23,7 +23,9 @@
}
// Hover and active states
a:hover,
// h3 for backwards compatibility
h3 a:hover,
.brand a:hover,
ul .active > a {
background-color: #333;
background-color: rgba(255,255,255,.05);
@ -54,6 +56,7 @@
line-height: 40px;
a:hover {
background-color: transparent;
color: @white;
}
}
@ -729,14 +732,15 @@ input[type=submit].btn {
// ------
.modal-backdrop {
background-color:#000;
&.fade { opacity: 0; }
background-color: #000;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 10000;
// Fade for backdrop
&.fade { opacity: 0; }
}
.modal-backdrop, .modal-backdrop.fade.in {