1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-07 22:26:57 +02:00

resolving deltas between that epic css selector specifity pull request and latest changes here

This commit is contained in:
Mark Otto
2011-08-29 21:24:00 -07:00
parent 650251228b
commit 654cc5ad3f
2 changed files with 160 additions and 166 deletions

View File

@@ -34,7 +34,7 @@
<!-- Topbar <!-- Topbar
================================================== --> ================================================== -->
<div class="topbar"> <div class="topbar">
<div class="wrapper"> <div class="fill">
<div class="container"> <div class="container">
<h3><a href="#">Bootstrap</a></h3> <h3><a href="#">Bootstrap</a></h3>
<ul class="nav"> <ul class="nav">
@@ -906,7 +906,7 @@
<h2>Fixed topbar</h2> <h2>Fixed topbar</h2>
<div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar-wrapper" style="z-index: 5;">
<div class="topbar"> <div class="topbar">
<div class="wrapper"> <div class="fill">
<div class="container"> <div class="container">
<h3><a href="#">Project Name</a></h3> <h3><a href="#">Project Name</a></h3>
<ul class="nav"> <ul class="nav">

View File

@@ -17,7 +17,7 @@
overflow: visible; overflow: visible;
// gradient is applied to it's own element because overflow visible is not honored by ie when filter is present // gradient is applied to it's own element because overflow visible is not honored by ie when filter is present
.wrapper { .fill {
background-color: #222; background-color: #222;
#gradient > .vertical(#333, #222); #gradient > .vertical(#333, #222);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); @shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
@@ -32,7 +32,7 @@
// Hover and active states // Hover and active states
a:hover, a:hover,
ul li.active a { ul .active a {
background-color: #333; background-color: #333;
background-color: rgba(255,255,255,.05); background-color: rgba(255,255,255,.05);
color: @white; color: @white;
@@ -60,6 +60,7 @@
margin: 5px 0 0 0; margin: 5px 0 0 0;
position: relative; position: relative;
.opacity(100); .opacity(100);
}
input { input {
background-color: #444; background-color: #444;
background-color: rgba(255,255,255,.3); background-color: rgba(255,255,255,.3);
@@ -100,7 +101,6 @@
} }
} }
} }
}
// NAVIGATION // NAVIGATION
@@ -118,6 +118,7 @@
display: block; display: block;
float: left; float: left;
font-size: 13px; font-size: 13px;
}
a { a {
display: block; display: block;
float: none; float: none;
@@ -129,18 +130,17 @@
text-decoration: none; text-decoration: none;
} }
} }
&.active a { .active a {
background-color: #222; background-color: #222;
background-color: rgba(0,0,0,.5); background-color: rgba(0,0,0,.5);
} }
}
// Secondary (floated right) nav in topbar // Secondary (floated right) nav in topbar
&.secondary-nav { &.secondary-nav {
float: right; float: right;
margin-left: 10px; margin-left: 10px;
margin-right: 0; margin-right: 0;
.dropdown .dropdown-menu { .dropdown-menu {
right: 0; right: 0;
} }
} }
@@ -221,6 +221,7 @@
float: none; float: none;
display: block; display: block;
background-color: none; background-color: none;
}
// Links within the dropdown menu // Links within the dropdown menu
a { a {
display: block; display: block;
@@ -240,7 +241,7 @@
} }
} }
// Dividers (basically an hr) within the dropdown // Dividers (basically an hr) within the dropdown
&.divider { .divider {
height: 1px; height: 1px;
margin: 5px 0; margin: 5px 0;
overflow: hidden; overflow: hidden;
@@ -248,7 +249,6 @@
border-bottom: 1px solid #fff; border-bottom: 1px solid #fff;
} }
} }
}
// Open state for the dropdown // Open state for the dropdown
.dropdown.open { .dropdown.open {
.dropdown-toggle { .dropdown-toggle {
@@ -320,7 +320,6 @@
// Basic pill nav // Basic pill nav
.pills { .pills {
li {
a { a {
margin: 5px 3px 5px 0; margin: 5px 3px 5px 0;
padding: 0 15px; padding: 0 15px;
@@ -334,13 +333,12 @@
text-shadow: 0 1px 1px rgba(0,0,0,.25); text-shadow: 0 1px 1px rgba(0,0,0,.25);
} }
} }
&.active a { .active a {
background: @linkColor; background: @linkColor;
color: #fff; color: #fff;
text-shadow: 0 1px 1px rgba(0,0,0,.25); text-shadow: 0 1px 1px rgba(0,0,0,.25);
} }
} }
}
// PAGE HEADERS // PAGE HEADERS
@@ -370,6 +368,7 @@ footer {
border-top: 1px solid #eee; border-top: 1px solid #eee;
} }
// PAGE HEADERS // PAGE HEADERS
// ------------ // ------------
@@ -382,10 +381,10 @@ footer {
} }
} }
// BUTTON STYLES // BUTTON STYLES
// ------------- // -------------
// Base .btn styles // Base .btn styles
.btn { .btn {
// Button Base // Button Base
@@ -424,7 +423,6 @@ footer {
background-image: none; background-image: none;
.opacity(65); .opacity(65);
} }
&:disabled { &:disabled {
// disabled pseudo can't be included with .disabled // disabled pseudo can't be included with .disabled
// def because IE8 and below will drop it ;_; // def because IE8 and below will drop it ;_;
@@ -432,7 +430,6 @@ footer {
background-image: none; background-image: none;
.opacity(65); .opacity(65);
} }
&:active { &:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow); .box-shadow(@shadow);
@@ -445,12 +442,10 @@ footer {
padding: 9px 14px 9px; padding: 9px 14px 9px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
padding: 7px 9px 7px; padding: 7px 9px 7px;
font-size: 11px; font-size: 11px;
} }
} }
// Help Firefox not be a jerk about adding extra padding to buttons // Help Firefox not be a jerk about adding extra padding to buttons
@@ -463,7 +458,6 @@ input[type=submit].btn {
} }
// ERROR STYLES // ERROR STYLES
// ------------ // ------------
@@ -558,8 +552,10 @@ input[type=submit].btn {
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
.border-radius(3px); .border-radius(3px);
.box-shadow(0 1px 2px rgba(0,0,0,.05)); .box-shadow(0 1px 2px rgba(0,0,0,.05));
}
li { li {
display: inline; display: inline;
}
a { a {
float: left; float: left;
padding: 0 14px; padding: 0 14px;
@@ -571,20 +567,18 @@ input[type=submit].btn {
text-decoration: none; text-decoration: none;
} }
a:hover, a:hover,
&.active a { .active a {
background-color: lighten(@blue, 45%); background-color: lighten(@blue, 45%);
} }
&.disabled a, .disabled a,
&.disabled a:hover { .disabled a:hover {
background-color: transparent; background-color: transparent;
color: @grayLight; color: @grayLight;
} }
&.next a { .next a {
border: 0; border: 0;
} }
} }
}
}
// WELLS // WELLS
@@ -628,6 +622,7 @@ input[type=submit].btn {
.border-radius(6px); .border-radius(6px);
.box-shadow(0 3px 7px rgba(0,0,0,0.3)); .box-shadow(0 3px 7px rgba(0,0,0,0.3));
.background-clip(padding-box); .background-clip(padding-box);
}
.modal-header { .modal-header {
border-bottom: 1px solid #eee; border-bottom: 1px solid #eee;
padding: 5px 20px; padding: 5px 20px;
@@ -656,7 +651,6 @@ input[type=submit].btn {
margin-left: 10px; margin-left: 10px;
} }
} }
}
// POPOVER ARROWS // POPOVER ARROWS
@@ -712,6 +706,7 @@ input[type=submit].btn {
&.left .twipsy-arrow { #popoverArrow > .left(); } &.left .twipsy-arrow { #popoverArrow > .left(); }
&.below .twipsy-arrow { #popoverArrow > .below(); } &.below .twipsy-arrow { #popoverArrow > .below(); }
&.right .twipsy-arrow { #popoverArrow > .right(); } &.right .twipsy-arrow { #popoverArrow > .right(); }
}
.twipsy-inner { .twipsy-inner {
padding: 3px 8px; padding: 3px 8px;
background-color: #000; background-color: #000;
@@ -726,7 +721,6 @@ input[type=submit].btn {
width: 0; width: 0;
height: 0; height: 0;
} }
}
// POPOVERS // POPOVERS