Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added dropdown buttons #192

Closed
wants to merge 14 commits into from
Closed

Added dropdown buttons #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8ec57f1
Added dropdown buttons
kasperp Sep 11, 2011
ec8619a
update docs to remove old stuff, update to all new classes; no more b…
mdo Sep 18, 2011
b5acabe
fix broken topbars in javascript
mdo Sep 18, 2011
b7c442a
-updated dropdown-btns to 1.3
kasperp Sep 21, 2011
6d541a6
pulling out more stuff and fixing file name at top of file
mdo Sep 29, 2011
1b21d5e
updated forms.less to have better comments while pulling out all the …
mdo Sep 29, 2011
2d81d65
initial idea for handling closing of modals from whatever element you…
mdo Sep 29, 2011
a0df073
fixed focus overflow
kasperp Oct 2, 2011
d9cedf3
added check for disabled dropdown button
kbond Oct 3, 2011
f115d94
Merge pull request #1 from kbond/dropdown-btn-disabled
kasperp Oct 3, 2011
3e5c158
design suggestions from markdotto - take one
kasperp Oct 9, 2011
ab2d46a
design suggestions from markdotto - take two
kasperp Oct 10, 2011
ea51b67
merged 1.4-wip branch
kasperp Oct 21, 2011
6ae3ed8
refactoring
kasperp Oct 21, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 75 additions & 115 deletions bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: Sun Sep 18 14:19:52 PDT 2011
* Date: Fri Oct 21 14:51:54 CEST 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).
Expand Down Expand Up @@ -173,7 +173,7 @@ textarea {
/* Variables.less
* Variables to customize the look and feel of Bootstrap
* ----------------------------------------------------- */
/* Variables.less
/* Mixins.less
* Snippets of reusable CSS to develop faster and keep code readable
* ----------------------------------------------------------------- */
/*
Expand Down Expand Up @@ -747,45 +747,24 @@ form div.clearfix.error .input-prepend span.add-on, form div.clearfix.error .inp
border-color: #c87872;
color: #b9554d;
}
.input-mini,
input.mini,
textarea.mini,
select.mini {
.input-mini {
width: 60px;
}
.input-small,
input.small,
textarea.small,
select.small {
.input-small {
width: 90px;
}
.input-medium,
input.medium,
textarea.medium,
select.medium {
.input-medium {
width: 150px;
}
.input-large,
input.large,
textarea.large,
select.large {
.input-large {
width: 210px;
}
.input-xlarge,
input.xlarge,
textarea.xlarge,
select.xlarge {
.input-xlarge {
width: 270px;
}
.input-xxlarge,
input.xxlarge,
textarea.xxlarge,
select.xxlarge {
.input-xxlarge {
width: 530px;
}
textarea.xxlarge {
overflow-y: auto;
}
input.span1, textarea.span1, select.span1 {
display: inline-block;
float: none;
Expand Down Expand Up @@ -1238,16 +1217,13 @@ table .headerSortUp.purple, table .headerSortDown.purple {
color: #bfbfbf;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.topbar h3 a:hover, .topbar .brand a:hover, .topbar ul .active > a {
.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 {
.topbar .brand {
float: left;
display: block;
padding: 8px 20px 12px;
Expand Down Expand Up @@ -1322,7 +1298,7 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
}
.topbar-inner, .topbar .fill {
.topbar-inner {
background-color: #222;
background-color: #222222;
background-repeat: repeat-x;
Expand All @@ -1338,92 +1314,59 @@ table .headerSortUp.purple, table .headerSortDown.purple {
-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);
}
.topbar div > ul, .nav {
.nav {
display: block;
float: left;
margin: 0 10px 0 0;
position: relative;
left: 0;
}
.topbar div > ul > li, .nav > li {
.nav > li {
display: block;
float: left;
}
.topbar div > ul a, .nav a {
.nav a {
display: block;
float: none;
padding: 10px 10px 11px;
line-height: 19px;
text-decoration: none;
}
.topbar div > ul a:hover, .nav a:hover {
.nav a:hover {
color: #ffffff;
text-decoration: none;
}
.topbar div > ul .active > a, .nav .active > a {
.nav .active > a {
background-color: #222;
background-color: rgba(0, 0, 0, 0.5);
}
.topbar div > ul.secondary-nav, .nav.secondary-nav {
.nav.secondary-nav {
float: right;
margin-left: 10px;
margin-right: 0;
}
.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;
border: 0;
}
.topbar div > ul a.menu:hover,
.nav a.menu:hover,
.topbar div > ul li.open .menu,
.nav li.open .menu,
.topbar div > ul .dropdown-toggle:hover,
.nav .dropdown-toggle:hover,
.topbar div > ul .dropdown.open .dropdown-toggle,
.nav .dropdown.open .dropdown-toggle {
.nav .dropdown-toggle:hover, .nav .dropdown.open .dropdown-toggle {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
.topbar div > ul .menu-dropdown,
.nav .menu-dropdown,
.topbar div > ul .dropdown-menu,
.nav .dropdown-menu {
background-color: #333;
}
.topbar div > ul .menu-dropdown a.menu,
.nav .menu-dropdown a.menu,
.topbar div > ul .dropdown-menu a.menu,
.nav .dropdown-menu a.menu,
.topbar div > ul .menu-dropdown .dropdown-toggle,
.nav .menu-dropdown .dropdown-toggle,
.topbar div > ul .dropdown-menu .dropdown-toggle,
.nav .dropdown-menu .dropdown-toggle {
color: #ffffff;
}
.topbar div > ul .menu-dropdown a.menu.open,
.nav .menu-dropdown a.menu.open,
.topbar div > ul .dropdown-menu a.menu.open,
.nav .dropdown-menu a.menu.open,
.topbar div > ul .menu-dropdown .dropdown-toggle.open,
.nav .menu-dropdown .dropdown-toggle.open,
.topbar div > ul .dropdown-menu .dropdown-toggle.open,
.nav .dropdown-menu .dropdown-toggle.open {
background: #444;
background: rgba(255, 255, 255, 0.05);
}
.topbar div > ul .menu-dropdown li a,
.nav .menu-dropdown li a,
.topbar div > ul .dropdown-menu li a,
.nav .dropdown-menu li a {
color: #999;
text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
}
.topbar div > ul .menu-dropdown li a:hover,
.nav .menu-dropdown li a:hover,
.topbar div > ul .dropdown-menu li a:hover,
.nav .dropdown-menu li a:hover {
background-color: #191919;
background-repeat: repeat-x;
Expand All @@ -1437,26 +1380,21 @@ table .headerSortUp.purple, table .headerSortDown.purple {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
color: #ffffff;
}
.topbar div > ul .menu-dropdown .active a,
.nav .menu-dropdown .active a,
.topbar div > ul .dropdown-menu .active a,
.nav .dropdown-menu .active a {
color: #ffffff;
}
.topbar div > ul .menu-dropdown .divider,
.nav .menu-dropdown .divider,
.topbar div > ul .dropdown-menu .divider,
.nav .dropdown-menu .divider {
background-color: #222;
border-color: #444;
}
.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a {
.topbar ul .dropdown-menu li a {
padding: 4px 15px;
}
li.menu, .dropdown {
.dropdown {
position: relative;
display: inline-block;
}
a.menu:after, .dropdown-toggle:after {
.dropdown-toggle:after {
width: 0;
height: 0;
display: inline-block;
Expand All @@ -1473,7 +1411,43 @@ a.menu:after, .dropdown-toggle:after {
-moz-opacity: 0.5;
opacity: 0.5;
}
.menu-dropdown, .dropdown-menu {
.btn.dropdown-toggle, .btn.large.dropdown-toggle, .btn.small.dropdown-toggle {
padding-right: 11px;
}
.btn.dropdown-toggle:after {
filter: alpha(opacity=80);
-khtml-opacity: 0.8;
-moz-opacity: 0.8;
opacity: 0.8;
margin-top: 6px;
margin-left: 10px;
}
.btn.small.dropdown-toggle:after {
margin-top: 4px;
}
.btn.danger.dropdown-toggle:after,
.btn.info.dropdown-toggle:after,
.btn.primary.dropdown-toggle:after,
.btn.success.dropdown-toggle:after {
border-top-color: #ffffff;
}
.btn.dropdown-toggle:after {
border-top-color: #999;
}
.btn.dropdown-toggle {
overflow: hidden;
}
.btn.dropdown-toggle + .dropdown-menu {
top: 29px;
border-width: 1px;
-webkit-border-radius: 6px 6px 6px 6px;
-moz-border-radius: 6px 6px 6px 6px;
border-radius: 6px 6px 6px 6px;
}
.btn.dropdown-toggle.large + .dropdown-menu {
top: 39px;
}
.dropdown-menu {
background-color: #ffffff;
float: left;
display: none;
Expand Down Expand Up @@ -1501,12 +1475,12 @@ a.menu:after, .dropdown-toggle:after {
-moz-background-clip: padding-box;
background-clip: padding-box;
}
.menu-dropdown li, .dropdown-menu li {
.dropdown-menu li {
float: none;
display: block;
background-color: none;
}
.menu-dropdown .divider, .dropdown-menu .divider {
.dropdown-menu .divider {
height: 1px;
margin: 5px 0;
overflow: hidden;
Expand Down Expand Up @@ -1539,17 +1513,20 @@ a.menu:after, .dropdown-toggle:after {
-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
}
.open .menu,
.dropdown.open .menu,
.open .dropdown-toggle,
.dropdown.open .dropdown-toggle {
li.dropdown.open .dropdown-toggle {
color: #ffffff;
background: #ccc;
background: rgba(0, 0, 0, 0.3);
}
.open .menu-dropdown,
.dropdown.open .menu-dropdown,
.open .dropdown-menu,
div.dropdown.open .dropdown-toggle {
-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);
background-position: 0 -15px;
}
.dropdown.open {
z-index: 100;
}
.dropdown.open .dropdown-menu {
display: block;
}
Expand Down Expand Up @@ -1606,22 +1583,22 @@ a.menu:after, .dropdown-toggle:after {
border: 1px solid #ddd;
border-bottom-color: transparent;
}
.tabs .menu-dropdown, .tabs .dropdown-menu {
.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 a.menu:after, .tabs .dropdown-toggle:after {
.tabs .dropdown-toggle:after {
border-top-color: #999;
margin-top: 15px;
margin-left: 5px;
}
.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
.tabs .open.dropdown .dropdown-toggle {
border-color: #999;
}
.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
.tabs .dropdown.open .dropdown-toggle:after {
border-top-color: #555;
}
.tab-content {
Expand Down Expand Up @@ -1688,23 +1665,6 @@ a.menu:after, .dropdown-toggle:after {
.hero-unit {
background-color: #f5f5f5;
margin-bottom: 30px;
padding: 60px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.hero-unit h1 {
margin-bottom: 0;
font-size: 60px;
line-height: 1;
letter-spacing: -1px;
}
.hero-unit p {
font-size: 18px;
font-weight: 200;
line-height: 27px;
}
footer {
margin-top: 17px;
padding-top: 17px;
border-top: 1px solid #eee;
Expand Down
Loading