Skip to content

B
bootstrap
Commit db43777d authored by Jacob Thornton's avatar Jacob Thornton
Browse files
Options

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

Conflicts:
	bootstrap-1.2.0.css
	bootstrap-1.2.0.min.css
parents 3f242bc7 a4dc2c89
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 63 deletions
bootstrap-1.2.0.css
View file @ db43777d
......@@ -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 Sep 2 11:48:59 PDT 2011
* Date: Fri Sep 2 11:49:21 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).
......@@ -1144,7 +1144,6 @@ table .headerSortUp.purple, table .headerSortDown.purple {
font-size: normal;
font-weight: 13px;
line-height: 1;
width: 220px;
padding: 4px 9px;
color: #fff;
color: rgba(255, 255, 255, 0.75);
......@@ -1228,7 +1227,10 @@ table .headerSortUp.purple, table .headerSortDown.purple {
margin-left: 10px;
margin-right: 0;
}
.topbar div > ul.secondary-nav .dropdown-menu, .nav.secondary-nav .dropdown-menu {
.topbar div > ul.secondary-nav .menu-dropdown,
.nav.secondary-nav .menu-dropdown,
.topbar div > ul.secondary-nav .dropdown-menu,
.nav.secondary-nav .dropdown-menu {
right: 0;
}
.topbar div > ul a.menu:hover,
......@@ -1452,19 +1454,19 @@ a.menu:after, .dropdown-toggle:after {
border-bottom: 0;
color: #808080;
}
.tabs .dropdown-menu {
.tabs .menu-dropdown, .tabs .dropdown-menu {
top: 35px;
border-width: 1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
}
.tabs .dropdown-toggle:after {
.tabs a.menu:after, .tabs .dropdown-toggle:after {
border-top-color: #999;
margin-top: 15px;
margin-left: 5px;
}
.tabs .dropdown.open .dropdown-toggle:after {
.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
.pills a {
......@@ -1571,6 +1573,11 @@ footer {
border-color: #0064cd #0064cd #003f81;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
}
.btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn.disabled {
cursor: default;
background-image: none;
......@@ -1593,11 +1600,6 @@ footer {
-moz-box-shadow: none;
box-shadow: none;
}
.btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.btn.large {
font-size: 16px;
line-height: normal;
......
bootstrap-1.2.0.min.css
View file @ db43777d
This diff is collapsed.
docs/index.html
View file @ db43777d
......@@ -945,47 +945,6 @@
</div><!-- /topbar -->
</div><!-- /topbar-wrapper -->
<div class="topbar-wrapper" style="z-index: 4;">
<div class="topbar">
<div class="fill">
<div class="container">
<h3><a href="#">Project Name</a></h3>
<ul class="">
<li class="active"><a href="#">Home</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li><a href="#">Link</a></li>
<li class="menu">
<a href="#" class="menu">Dropdown</a>
<ul class="menu-dropdown">
<li><a href="#">Secondary link</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Another link</a></li>
</ul>
</li>
</ul>
<form action="">
<input type="text" placeholder="Search" />
</form>
<ul class="secondary-nav">
<li class="menu">
<a href="#" class="menu">Dropdown</a>
<ul class="menu-dropdown">
<li><a href="#">Secondary link</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Another link</a></li>
</ul>
</li>
</ul>
</div>
</div><!-- /topbar-inner -->
</div><!-- /topbar -->
</div><!-- /topbar-wrapper -->
<div class="row">
<div class="span5 columns">
<h4>What is it</h4>
......
lib/patterns.less
View file @ db43777d
......@@ -57,7 +57,6 @@
background-color: #444;
background-color: rgba(255,255,255,.3);
#font > .sans-serif(13px, normal, 1);
width: 220px;
padding: 4px 9px;
color: #fff;
color: rgba(255,255,255,.75);
......@@ -143,6 +142,8 @@
float: right;
margin-left: 10px;
margin-right: 0;
// backwards compatibility
.menu-dropdown,
.dropdown-menu {
right: 0;
}
......@@ -335,16 +336,22 @@ a.menu:after,
color: @gray;
}
}
// first one for backwards compatibility
.menu-dropdown,
.dropdown-menu {
top: 35px;
border-width: 1px;
.border-radius(0 6px 6px 6px);
}
// first one for backwards compatibility
a.menu:after,
.dropdown-toggle:after {
border-top-color: #999;
margin-top: 15px;
margin-left: 5px;
}
// first one for backwards compatibility
li.open a.menu:after,
.dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
......@@ -450,6 +457,10 @@ footer {
.transition(.1s linear all);
// Active and Disabled states
&:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
}
&.disabled {
cursor: default;
background-image: none;
......@@ -464,10 +475,6 @@ footer {
.opacity(65);
.box-shadow(none);
}
&:active {
@shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05);
.box-shadow(@shadow);
}
// Button Sizes
&.large {
......
lib/scaffolding.less
View file @ db43777d
......@@ -85,6 +85,7 @@ body {
float: left;
width: 220px;
}
// TODO in v2: rename this and .popover .content to be more specific
> .content {
min-width: 700px;
max-width: 1180px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment