forked from roots/sage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request roots#261 from coreywagehoft/d045e1be56130693dc48b…
…ae494654b900a13fc81 Upgrading Twitter Bootstrap to v.2.0.0
- Loading branch information
Showing
41 changed files
with
4,171 additions
and
17 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
// ACCORDION | ||
// --------- | ||
|
||
|
||
// Parent container | ||
.accordion { | ||
margin-bottom: @baseLineHeight; | ||
} | ||
|
||
// Group == heading + body | ||
.accordion-group { | ||
margin-bottom: 2px; | ||
border: 1px solid #e5e5e5; | ||
.border-radius(4px); | ||
} | ||
.accordion-heading { | ||
border-bottom: 0; | ||
} | ||
.accordion-heading .accordion-toggle { | ||
display: block; | ||
padding: 8px 15px; | ||
} | ||
|
||
// Inner needs the styles because you can't animate properly with any styles on the element | ||
.accordion-inner { | ||
padding: 9px 15px; | ||
border-top: 1px solid #e5e5e5; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
// ALERT STYLES | ||
// ------------ | ||
|
||
// Base alert styles | ||
.alert { | ||
padding: 8px 35px 8px 14px; | ||
margin-bottom: @baseLineHeight; | ||
text-shadow: 0 1px 0 rgba(255,255,255,.5); | ||
background-color: @warningBackground; | ||
border: 1px solid @warningBorder; | ||
.border-radius(4px); | ||
} | ||
.alert, | ||
.alert-heading { | ||
color: @warningText; | ||
} | ||
|
||
// Adjust close link position | ||
.alert .close { | ||
position: relative; | ||
top: -2px; | ||
right: -21px; | ||
line-height: 18px; | ||
} | ||
|
||
// Alternate styles | ||
// ---------------- | ||
|
||
.alert-success { | ||
background-color: @successBackground; | ||
border-color: @successBorder; | ||
} | ||
.alert-success, | ||
.alert-success .alert-heading { | ||
color: @successText; | ||
} | ||
.alert-danger, | ||
.alert-error { | ||
background-color: @errorBackground; | ||
border-color: @errorBorder; | ||
} | ||
.alert-danger, | ||
.alert-error, | ||
.alert-danger .alert-heading, | ||
.alert-error .alert-heading { | ||
color: @errorText; | ||
} | ||
.alert-info { | ||
background-color: @infoBackground; | ||
border-color: @infoBorder; | ||
} | ||
.alert-info, | ||
.alert-info .alert-heading { | ||
color: @infoText; | ||
} | ||
|
||
|
||
// Block alerts | ||
// ------------------------ | ||
.alert-block { | ||
padding-top: 14px; | ||
padding-bottom: 14px; | ||
} | ||
.alert-block > p, | ||
.alert-block > ul { | ||
margin-bottom: 0; | ||
} | ||
.alert-block p + p { | ||
margin-top: 5px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// BREADCRUMBS | ||
// ----------- | ||
|
||
.breadcrumb { | ||
padding: 7px 14px; | ||
margin: 0 0 @baseLineHeight; | ||
#gradient > .vertical(@white, #f5f5f5); | ||
border: 1px solid #ddd; | ||
.border-radius(3px); | ||
.box-shadow(inset 0 1px 0 @white); | ||
li { | ||
display: inline; | ||
text-shadow: 0 1px 0 @white; | ||
} | ||
.divider { | ||
padding: 0 5px; | ||
color: @grayLight; | ||
} | ||
.active a { | ||
color: @grayDark; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,147 @@ | ||
// BUTTON GROUPS | ||
// ------------- | ||
|
||
|
||
// Make the div behave like a button | ||
.btn-group { | ||
position: relative; | ||
.clearfix(); // clears the floated buttons | ||
.ie7-restore-left-whitespace(); | ||
} | ||
|
||
// Space out series of button groups | ||
.btn-group + .btn-group { | ||
margin-left: 5px; | ||
} | ||
|
||
// Optional: Group multiple button groups together for a toolbar | ||
.btn-toolbar { | ||
margin-top: @baseLineHeight / 2; | ||
margin-bottom: @baseLineHeight / 2; | ||
.btn-group { | ||
display: inline-block; | ||
.ie7-inline-block(); | ||
} | ||
} | ||
|
||
// Float them, remove border radius, then re-add to first and last elements | ||
.btn-group .btn { | ||
position: relative; | ||
float: left; | ||
margin-left: -1px; | ||
.border-radius(0); | ||
} | ||
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match | ||
.btn-group .btn:first-child { | ||
margin-left: 0; | ||
-webkit-border-top-left-radius: 4px; | ||
-moz-border-radius-topleft: 4px; | ||
border-top-left-radius: 4px; | ||
-webkit-border-bottom-left-radius: 4px; | ||
-moz-border-radius-bottomleft: 4px; | ||
border-bottom-left-radius: 4px; | ||
} | ||
.btn-group .btn:last-child, | ||
.btn-group .dropdown-toggle { | ||
-webkit-border-top-right-radius: 4px; | ||
-moz-border-radius-topright: 4px; | ||
border-top-right-radius: 4px; | ||
-webkit-border-bottom-right-radius: 4px; | ||
-moz-border-radius-bottomright: 4px; | ||
border-bottom-right-radius: 4px; | ||
} | ||
// Reset corners for large buttons | ||
.btn-group .btn.large:first-child { | ||
margin-left: 0; | ||
-webkit-border-top-left-radius: 6px; | ||
-moz-border-radius-topleft: 6px; | ||
border-top-left-radius: 6px; | ||
-webkit-border-bottom-left-radius: 6px; | ||
-moz-border-radius-bottomleft: 6px; | ||
border-bottom-left-radius: 6px; | ||
} | ||
.btn-group .btn.large:last-child, | ||
.btn-group .large.dropdown-toggle { | ||
-webkit-border-top-right-radius: 6px; | ||
-moz-border-radius-topright: 6px; | ||
border-top-right-radius: 6px; | ||
-webkit-border-bottom-right-radius: 6px; | ||
-moz-border-radius-bottomright: 6px; | ||
border-bottom-right-radius: 6px; | ||
} | ||
|
||
// On hover/focus/active, bring the proper btn to front | ||
.btn-group .btn:hover, | ||
.btn-group .btn:focus, | ||
.btn-group .btn:active, | ||
.btn-group .btn.active { | ||
z-index: 2; | ||
} | ||
|
||
// On active and open, don't show outline | ||
.btn-group .dropdown-toggle:active, | ||
.btn-group.open .dropdown-toggle { | ||
outline: 0; | ||
} | ||
|
||
|
||
|
||
// Split button dropdowns | ||
// ---------------------- | ||
|
||
// Give the line between buttons some depth | ||
.btn-group .dropdown-toggle { | ||
padding-left: 8px; | ||
padding-right: 8px; | ||
@shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); | ||
.box-shadow(@shadow); | ||
*padding-top: 5px; | ||
*padding-bottom: 5px; | ||
} | ||
|
||
.btn-group.open { | ||
// IE7's z-index only goes to the nearest positioned ancestor, which would | ||
// make the menu appear below buttons that appeared later on the page | ||
*z-index: @zindexDropdown; | ||
|
||
// Reposition menu on open and round all corners | ||
.dropdown-menu { | ||
display: block; | ||
margin-top: 1px; | ||
.border-radius(5px); | ||
} | ||
|
||
.dropdown-toggle { | ||
background-image: none; | ||
@shadow: inset 0 1px 6px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); | ||
.box-shadow(@shadow); | ||
} | ||
} | ||
|
||
// Reposition the caret | ||
.btn .caret { | ||
margin-top: 7px; | ||
margin-left: 0; | ||
} | ||
.btn:hover .caret, | ||
.open.btn-group .caret { | ||
.opacity(100); | ||
} | ||
|
||
|
||
// Account for other colors | ||
.btn-primary, | ||
.btn-danger, | ||
.btn-info, | ||
.btn-success { | ||
.caret { | ||
border-top-color: @white; | ||
.opacity(75); | ||
} | ||
} | ||
|
||
// Small button dropdowns | ||
.btn-small .caret { | ||
margin-top: 4px; | ||
} | ||
|
Oops, something went wrong.