Skip to content
Browse files

update to 2.0 stable

  • Loading branch information...
1 parent 6a8eec9 commit 78373033485ca2c2de37c1a898dea0201a7b8ecb @daz daz committed Feb 1, 2012
Showing with 1,209 additions and 850 deletions.
  1. BIN vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
  2. BIN vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
  3. +5 −4 vendor/toolkit/twitter/bootstrap/accordion.less
  4. +1 −0 vendor/toolkit/twitter/bootstrap/alerts.less
  5. +10 −8 vendor/toolkit/twitter/bootstrap/bootstrap.less
  6. +48 −17 vendor/toolkit/twitter/bootstrap/button-groups.less
  7. +137 −88 vendor/toolkit/twitter/bootstrap/buttons.less
  8. +12 −5 vendor/toolkit/twitter/bootstrap/carousel.less
  9. +44 −0 vendor/toolkit/twitter/bootstrap/code.less
  10. +23 −2 vendor/toolkit/twitter/bootstrap/dropdowns.less
  11. +81 −62 vendor/toolkit/twitter/bootstrap/forms.less
  12. +8 −0 vendor/toolkit/twitter/bootstrap/grid.less
  13. +20 −0 vendor/toolkit/twitter/bootstrap/hero-unit.less
  14. +4 −4 vendor/toolkit/twitter/bootstrap/labels.less
  15. +17 −0 vendor/toolkit/twitter/bootstrap/layouts.less
  16. +202 −38 vendor/toolkit/twitter/bootstrap/mixins.less
  17. +9 −2 vendor/toolkit/twitter/bootstrap/modals.less
  18. +71 −30 vendor/toolkit/twitter/bootstrap/navbar.less
  19. +68 −63 vendor/toolkit/twitter/bootstrap/navs.less
  20. +7 −2 vendor/toolkit/twitter/bootstrap/pager.less
  21. +1 −0 vendor/toolkit/twitter/bootstrap/pagination.less
  22. +0 −17 vendor/toolkit/twitter/bootstrap/patterns.less
  23. +25 −25 vendor/toolkit/twitter/bootstrap/popovers.less
  24. +14 −18 vendor/toolkit/twitter/bootstrap/progress-bars.less
  25. +2 −3 vendor/toolkit/twitter/bootstrap/reset.less
  26. +219 −164 vendor/toolkit/twitter/bootstrap/responsive.less
  27. +6 −89 vendor/toolkit/twitter/bootstrap/scaffolding.less
  28. +137 −99 vendor/toolkit/twitter/bootstrap/sprites.less
  29. +1 −54 vendor/toolkit/twitter/bootstrap/tables.less
  30. +2 −0 vendor/toolkit/twitter/bootstrap/thumbnails.less
  31. +12 −42 vendor/toolkit/twitter/bootstrap/type.less
  32. +23 −14 vendor/toolkit/twitter/bootstrap/variables.less
View
BIN vendor/assets/images/twitter/bootstrap/glyphicons-halflings-white.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
9 vendor/toolkit/twitter/bootstrap/accordion.less
@@ -9,15 +9,16 @@
// Group == heading + body
.accordion-group {
- background-color: #f5f5f5;
+ margin-bottom: 2px;
+ border: 1px solid #e5e5e5;
.border-radius(4px);
}
.accordion-heading {
- padding: 8px 15px;
border-bottom: 0;
}
-.accordion-body {
- margin-bottom: 2px;
+.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
View
1 vendor/toolkit/twitter/bootstrap/alerts.less
@@ -18,6 +18,7 @@
// Adjust close link position
.alert .close {
position: relative;
+ top: -2px;
right: -21px;
line-height: 18px;
}
View
18 vendor/toolkit/twitter/bootstrap/bootstrap.less
@@ -1,12 +1,11 @@
/*!
- * Bootstrap @VERSION
+ * Bootstrap v2.0.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
*/
// CSS Reset
@@ -18,9 +17,12 @@
// Grid system and page structure
@import "scaffolding.less";
+@import "grid.less";
+@import "layouts.less";
// Base CSS
@import "type.less";
+@import "code.less";
@import "forms.less";
@import "tables.less";
@@ -31,6 +33,11 @@
@import "component-animations.less";
@import "close.less";
+// Components: Buttons & Alerts
+@import "buttons.less";
+@import "button-groups.less";
+@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
+
// Components: Nav
@import "navs.less";
@import "navbar.less";
@@ -43,18 +50,13 @@
@import "tooltip.less";
@import "popovers.less";
-// Components: Buttons & Alerts
-@import "buttons.less";
-@import "button-groups.less";
-@import "alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
// Components: Misc
@import "thumbnails.less";
@import "labels.less";
@import "progress-bars.less";
@import "accordion.less";
@import "carousel.less";
-@import "responsive.less";
+@import "hero-unit.less";
// Utility classes
@import "utilities.less"; // Has to be last to override when necessary
View
65 vendor/toolkit/twitter/bootstrap/button-groups.less
@@ -6,6 +6,7 @@
.btn-group {
position: relative;
.clearfix(); // clears the floated buttons
+ .ie7-restore-left-whitespace();
}
// Space out series of button groups
@@ -15,8 +16,11 @@
// 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();
}
}
@@ -69,10 +73,18 @@
// 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,
+.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
// ----------------------
@@ -81,36 +93,55 @@
.btn-group .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
- @shadow: inset 1px 0 0 rgba(255,255,255,.125), 0 1px 2px rgba(0,0,0,.05);
+ @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;
}
-// Reposition menu on open and round all corners
-.btn-group.open .dropdown-menu {
- display: block;
- margin-top: 1px;
- .border-radius(5px);
-}
-.btn-group.open .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);
+.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: 6px;
+ margin-top: 7px;
margin-left: 0;
}
+.btn:hover .caret,
+.open.btn-group .caret {
+ .opacity(100);
+}
+
// Account for other colors
-.primary,
-.danger,
-.info,
-.success {
+.btn-primary,
+.btn-danger,
+.btn-info,
+.btn-success {
.caret {
border-top-color: @white;
.opacity(75);
}
}
+// Small button dropdowns
+.btn-small .caret {
+ margin-top: 4px;
+}
+
View
225 vendor/toolkit/twitter/bootstrap/buttons.less
@@ -1,40 +1,18 @@
// BUTTON STYLES
// -------------
-// Shared colors for buttons and alerts
-.btn {
- // Set text color
- &.danger,
- &.danger:hover,
- &.success,
- &.success:hover,
- &.info,
- &.info:hover {
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- color: @white
- }
- // Danger and error appear as red
- &.danger {
- .gradientBar(#ee5f5b, #c43c35);
- }
- // Success appears as green
- &.success {
- .gradientBar(#62c462, #57a957);
- }
- // Info appears as a neutral blue
- &.info {
- .gradientBar(#5bc0de, #339bb9);
- }
-}
-// Base .btn styles
+// Base styles
+// --------------------------------------------------
+
+// Core
.btn {
- // Button Base
display: inline-block;
- padding: 5px 10px 6px;
+ padding: 4px 10px 4px;
font-size: @baseFontSize;
- line-height: normal;
+ line-height: @baseLineHeight;
color: @grayDark;
+ text-align: center;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
border: 1px solid #ccc;
@@ -44,73 +22,144 @@
.box-shadow(@shadow);
cursor: pointer;
- &:hover {
- color: @grayDark;
- text-decoration: none;
- background-position: 0 -15px;
- }
+ // Give IE7 some love
+ .ie7-restore-left-whitespace();
+}
- // Focus state for keyboard and accessibility
- &:focus {
- outline: 1px dotted #666;
- }
+// Hover state
+.btn:hover {
+ color: @grayDark;
+ text-decoration: none;
+ background-color: darken(@white, 10%);
+ background-position: 0 -15px;
- // Primary Button Type
- &.primary {
- color: @white;
- text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- .gradientBar(@blue, @blueDark)
- }
+ // transition is only when going to hover, otherwise the background
+ // behind the gradient (there for IE<=9 fallback) gets mismatched
+ .transition(background-position .1s linear);
+}
- // Transitions
- .transition(.1s linear all);
+// Focus state for keyboard and accessibility
+.btn:focus {
+ .tab-focus();
+}
- // Active and Disabled states
- &.active,
- &:active {
- background-image: none;
- @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
- .box-shadow(@shadow);
- }
- &.disabled {
- cursor: default;
- background-image: none;
- .reset-filter();
- .opacity(65);
- .box-shadow(none);
- }
- &[disabled] {
- // disabled pseudo can't be included with .disabled
- // def because IE8 and below will drop it ;_;
- cursor: default;
- background-image: none;
- .reset-filter();
- .opacity(65);
- .box-shadow(none);
- }
+// Active state
+.btn.active,
+.btn:active {
+ background-image: none;
+ @shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ .box-shadow(@shadow);
+ background-color: darken(@white, 10%);
+ background-color: darken(@white, 15%) e("\9");
+ color: rgba(0,0,0,.5);
+ outline: 0;
+}
- // Button Sizes
- &.large {
- padding: 9px 14px 9px;
- font-size: @baseFontSize + 2px;
- line-height: normal;
- .border-radius(5px);
- }
- &.small {
- padding: 7px 9px 7px;
- font-size: @baseFontSize - 2px;
- }
+// Disabled state
+.btn.disabled,
+.btn[disabled] {
+ cursor: default;
+ background-image: none;
+ background-color: darken(@white, 10%);
+ .opacity(65);
+ .box-shadow(none);
}
-// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .btn {
- border-radius: 0 \0;
+
+
+// Button Sizes
+// --------------------------------------------------
+
+// Large
+.btn-large {
+ padding: 9px 14px;
+ font-size: @baseFontSize + 2px;
+ line-height: normal;
+ .border-radius(5px);
}
+.btn-large .icon {
+ margin-top: 1px;
+}
+
+// Small
+.btn-small {
+ padding: 5px 9px;
+ font-size: @baseFontSize - 2px;
+ line-height: @baseLineHeight - 2px;
+}
+.btn-small .icon {
+ margin-top: -1px;
+}
+
+
+// Alternate buttons
+// --------------------------------------------------
+
+// Set text color
+// -------------------------
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover {
+ text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+ color: @white
+}
+// Provide *some* extra contrast for those who can get it
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active {
+ color: rgba(255,255,255,.75);
+}
+
+// Set the backgrounds
+// -------------------------
+.btn-primary {
+ .buttonBackground(@primaryButtonBackground, spin(@primaryButtonBackground, 20));
+}
+// Warning appears are orange
+.btn-warning {
+ .buttonBackground(lighten(@orange, 15%), @orange);
+}
+// Danger and error appear as red
+.btn-danger {
+ .buttonBackground(#ee5f5b, #bd362f);
+}
+// Success appears as green
+.btn-success {
+ .buttonBackground(#62c462, #51a351);
+}
+// Info appears as a neutral blue
+.btn-info {
+ .buttonBackground(#5bc0de, #2f96b4);
+}
+
+
+// Cross-browser Jank
+// --------------------------------------------------
-// Help Firefox not be a jerk about adding extra padding to buttons
button.btn,
-input[type=submit].btn {
+input[type="submit"].btn {
&::-moz-focus-inner {
- padding: 0;
- border: 0;
+ padding: 0;
+ border: 0;
}
-}
+
+ // IE7 has some default padding on button controls
+ *padding-top: 2px;
+ *padding-bottom: 2px;
+ &.large {
+ *padding-top: 7px;
+ *padding-bottom: 7px;
+ }
+ &.small {
+ *padding-top: 3px;
+ *padding-bottom: 3px;
+ }
+}
View
17 vendor/toolkit/twitter/bootstrap/carousel.less
@@ -3,6 +3,7 @@
.carousel {
position: relative;
+ margin-bottom: @baseLineHeight;
line-height: 1;
}
@@ -26,15 +27,15 @@
line-height: 1;
}
- .active,
- .next,
+ .active,
+ .next,
.prev { display: block; }
.active {
left: 0;
}
- .next,
+ .next,
.prev {
position: absolute;
top: 0;
@@ -47,7 +48,7 @@
.prev {
left: -100%;
}
- .next.left,
+ .next.left,
.prev.right {
left: 0;
}
@@ -80,7 +81,13 @@
border: 3px solid @white;
.border-radius(23px);
.opacity(50);
- .transition(all .2s linear);
+
+ // we can't have this transition here
+ // because webkit cancels the carousel
+ // animation if you trip this while
+ // in the middle of another animation
+ // ;_;
+ // .transition(opacity .2s linear);
// Reposition the right one
&.right {
View
44 vendor/toolkit/twitter/bootstrap/code.less
@@ -0,0 +1,44 @@
+// Code.less
+// Code typography styles for the <code> and <pre> elements
+// --------------------------------------------------------
+
+// Inline and block code styles
+code,
+pre {
+ padding: 0 3px 2px;
+ #font > #family > .monospace;
+ font-size: @baseFontSize - 1;
+ color: @grayDark;
+ .border-radius(3px);
+}
+code {
+ padding: 3px 4px;
+ color: #d14;
+ background-color: #f7f7f9;
+ border: 1px solid #e1e1e8;
+}
+pre {
+ display: block;
+ padding: (@baseLineHeight - 1) / 2;
+ margin: 0 0 @baseLineHeight / 2;
+ font-size: 12px;
+ line-height: @baseLineHeight;
+ background-color: #f5f5f5;
+ border: 1px solid #ccc; // fallback for IE7-8
+ border: 1px solid rgba(0,0,0,.15);
+ .border-radius(4px);
+ white-space: pre;
+ white-space: pre-wrap;
+ word-break: break-all;
+
+ // Make prettyprint styles more spaced out for readability
+ &.prettyprint {
+ margin-bottom: @baseLineHeight;
+ }
+
+ // Account for some code outputs that place code tags in pre tags
+ code {
+ padding: 0;
+ background-color: transparent;
+ }
+}
View
25 vendor/toolkit/twitter/bootstrap/dropdowns.less
@@ -5,12 +5,23 @@
.dropdown {
position: relative;
}
+.dropdown-toggle {
+ // The caret makes the toggle a bit too tall in IE7
+ *margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+ outline: 0;
+}
// Dropdown arrow/caret
.caret {
display: inline-block;
width: 0;
height: 0;
text-indent: -99999px;
+ // IE7 won't do the border trick if there's a text indent, but it doesn't
+ // do the content that text-indent is hiding, either, so we're ok.
+ *text-indent: 0;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
@@ -21,7 +32,6 @@
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
- *margin-top: 7px;
}
.dropdown:hover .caret,
.open.dropdown .caret {
@@ -31,6 +41,7 @@
.dropdown-menu {
position: absolute;
top: 100%;
+ left: 0;
z-index: @zindexDropdown;
float: left;
display: none; // none by default, but block on "open" of the menu
@@ -50,7 +61,6 @@
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
- zoom: 1; // do we need this?
*border-right-width: 2px;
*border-bottom-width: 2px;
@@ -68,6 +78,13 @@
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid @white;
+
+ // IE7 needs a set width since we gave a height. Restricting just
+ // to IE7 to keep the 1px left/right space in other browsers.
+ // It is unclear where IE is getting the extra space that we need
+ // to negative-margin away, but so it goes.
+ *width: 100%;
+ *margin: -5px 0 5px;
}
// Links within the dropdown menu
@@ -93,6 +110,10 @@
// Open state for the dropdown
.dropdown.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;
+
.dropdown-toggle {
color: @white;
background: #ccc;
View
143 vendor/toolkit/twitter/bootstrap/forms.less
@@ -28,7 +28,6 @@ legend {
color: @grayDark;
border: 0;
border-bottom: 1px solid #eee;
- -webkit-margin-collapse: separate;
}
// Set font for forms
@@ -68,22 +67,30 @@ select,
height: auto;
}
+// Inputs within a label
+label input,
+label textarea,
+label select {
+ display: block;
+}
+
// Mini reset for unique input types
-input[type=image],
-input[type=checkbox],
-input[type=radio] {
+input[type="image"],
+input[type="checkbox"],
+input[type="radio"] {
width: auto;
height: auto;
padding: 0;
margin: 3px 0;
*margin-top: 0; /* IE7 */
line-height: normal;
- border: none;
+ border: 0;
cursor: pointer;
+ border-radius: 0 e("\0/"); // Nuke border-radius for IE9 only
}
// Reset the file input to browser defaults
-input[type=file] {
+input[type="file"] {
padding: initial;
line-height: initial;
border: initial;
@@ -93,16 +100,16 @@ input[type=file] {
}
// Help out input buttons
-input[type=button],
-input[type=reset],
-input[type=submit] {
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
width: auto;
height: auto;
}
// Set the height of select and file controls to match text inputs
select,
-input[type=file] {
+input[type="file"] {
height: 28px; /* In IE7, the height of the select element cannot be changed by height, only font-size */
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
line-height: 28px;
@@ -111,7 +118,6 @@ input[type=file] {
// Chrome on Linux and Mobile Safari need background-color
select {
width: 220px; // default input width + 10px of padding that doesn't get applied
- vertical-align: baseline;
background-color: @white;
}
@@ -122,14 +128,20 @@ select[size] {
}
// Remove shadow from image inputs
-input[type=image] {
+input[type="image"] {
.box-shadow(none);
}
+// Make textarea height behave
textarea {
height: auto;
}
+// Hidden inputs
+input[type="hidden"] {
+ display: none;
+}
+
// CHECKBOXES & RADIOS
@@ -140,28 +152,34 @@ textarea {
.checkbox {
padding-left: 18px;
}
-.radio input[type=radio],
-.checkbox input[type=checkbox] {
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
float: left;
margin-left: -18px;
}
// Move the options list down to align with labels
.controls > .radio:first-child,
.controls > .checkbox:first-child {
- padding-top: 6px; // has to be padding because margin collaspes
+ padding-top: 5px; // has to be padding because margin collaspes
}
// Radios and checkboxes on same line
.radio.inline,
.checkbox.inline {
display: inline-block;
margin-bottom: 0;
+ vertical-align: middle;
}
.radio.inline + .radio.inline,
.checkbox.inline + .checkbox.inline {
margin-left: 10px; // space out consecutive inline controls
}
+// But don't forget to remove their padding on first-child
+.controls > .radio.inline:first-child,
+.controls > .checkbox.inline:first-child {
+ padding-top: 0;
+}
@@ -180,12 +198,13 @@ textarea:focus {
@shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow);
outline: 0;
+ outline: thin dotted \9; /* IE6-8 */
}
-input[type=file]:focus,
-input[type=checkbox]:focus,
+input[type="file"]:focus,
+input[type="checkbox"]:focus,
select:focus {
.box-shadow(none); // override for file inputs
- outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
+ .tab-focus();
}
@@ -210,45 +229,13 @@ textarea[class*="span"],
margin-left: 0;
}
-// This is a duplication of the main grid .columns() mixin, but subtracts 10px to account for input padding and border
-.inputColumns(@columnSpan: 1) {
- width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
-}
-input,
-textarea,
-.uneditable-input {
- // Default columns
- &.span1 { .inputColumns(1); }
- &.span2 { .inputColumns(2); }
- &.span3 { .inputColumns(3); }
- &.span4 { .inputColumns(4); }
- &.span5 { .inputColumns(5); }
- &.span6 { .inputColumns(6); }
- &.span7 { .inputColumns(7); }
- &.span8 { .inputColumns(8); }
- &.span9 { .inputColumns(9); }
- &.span10 { .inputColumns(10); }
- &.span11 { .inputColumns(11); }
- &.span12 { .inputColumns(12); }
-}
-
-.selectColumns(@columnSpan: 1) {
- width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) + 10;
-}
-select {
- &.span1 { .selectColumns(1); }
- &.span2 { .selectColumns(2); }
- &.span3 { .selectColumns(3); }
- &.span4 { .selectColumns(4); }
- &.span5 { .selectColumns(5); }
- &.span6 { .selectColumns(6); }
- &.span7 { .selectColumns(7); }
- &.span8 { .selectColumns(8); }
- &.span9 { .selectColumns(9); }
- &.span10 { .selectColumns(10); }
- &.span11 { .selectColumns(11); }
- &.span12 { .selectColumns(12); }
-}
+
+
+// GRID SIZING FOR INPUTS
+// ----------------------
+
+#inputGridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
+
@@ -363,9 +350,10 @@ select:focus:required:invalid {
}
.help-inline {
- *position: relative; /* IE6-7 */
- *top: -5px; /* IE6-7 */
- display: inline;
+ display: inline-block;
+ .ie7-inline-block();
+ margin-bottom: 9px;
+ vertical-align: middle;
padding-left: 5px;
}
@@ -382,6 +370,10 @@ select:focus:required:invalid {
input,
.uneditable-input {
.border-radius(0 3px 3px 0);
+ &:focus {
+ position: relative;
+ z-index: 2;
+ }
}
.uneditable-input {
border-left-color: #ccc;
@@ -393,7 +385,7 @@ select:focus:required:invalid {
min-width: 16px;
height: @baseLineHeight;
margin-right: -1px;
- padding: 4px 4px 4px 5px;
+ padding: 4px 5px;
font-weight: normal;
line-height: @baseLineHeight;
color: @grayLight;
@@ -427,6 +419,15 @@ select:focus:required:invalid {
margin-left: -1px;
.border-radius(0 3px 3px 0);
}
+ input:first-child {
+ // In IE7, having a hasLayout container (from clearfix's zoom:1) can make the first input
+ // inherit the sum of its ancestors' margins.
+ *margin-left: -160px;
+
+ &+.add-on {
+ *margin-left: -21px;
+ }
+ }
}
@@ -455,15 +456,27 @@ select:focus:required:invalid {
input,
textarea,
select,
+ .help-inline,
.uneditable-input {
display: inline-block;
margin-bottom: 0;
}
}
.form-search label,
-.form-inline label {
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
display: inline-block;
}
+// Make the prepend and append add-on vertical-align: middle;
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+ vertical-align: middle;
+}
// Margin to space out fieldsets
.control-group {
@@ -474,9 +487,15 @@ select:focus:required:invalid {
// --------------------------
.form-horizontal {
+ // Legend collapses margin, so we're relegated to padding
+ legend + .control-group {
+ margin-top: @baseLineHeight;
+ -webkit-margin-top-collapse: separate;
+ }
// Increase spacing between groups
.control-group {
margin-bottom: @baseLineHeight;
+ .clearfix();
}
// Float the labels left
.control-group > label {
View
8 vendor/toolkit/twitter/bootstrap/grid.less
@@ -0,0 +1,8 @@
+// GRID SYSTEM
+// -----------
+
+// Fixed (940px)
+#gridSystem > .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth);
+
+// Fluid (940px)
+#fluidGridSystem > .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth);
View
20 vendor/toolkit/twitter/bootstrap/hero-unit.less
@@ -0,0 +1,20 @@
+// HERO UNIT
+// ---------
+
+.hero-unit {
+ padding: 60px;
+ margin-bottom: 30px;
+ background-color: #f5f5f5;
+ .border-radius(6px);
+ h1 {
+ margin-bottom: 0;
+ font-size: 60px;
+ line-height: 1;
+ letter-spacing: -1px;
+ }
+ p {
+ font-size: 18px;
+ font-weight: 200;
+ line-height: @baseLineHeight * 1.5;
+ }
+}
View
8 vendor/toolkit/twitter/bootstrap/labels.less
@@ -9,8 +9,8 @@
text-transform: uppercase;
background-color: @grayLight;
.border-radius(3px);
- &.important { background-color: #c43c35; }
- &.warning { background-color: @orange; }
- &.success { background-color: @green; }
- &.notice { background-color: lighten(@blue, 25%); }
}
+.label-important { background-color: @errorText; }
+.label-warning { background-color: @orange; }
+.label-success { background-color: @successText; }
+.label-info { background-color: @infoText; }
View
17 vendor/toolkit/twitter/bootstrap/layouts.less
@@ -0,0 +1,17 @@
+//
+// Layouts
+// Fixed-width and fluid (with sidebar) layouts
+// --------------------------------------------
+
+
+// Container (centered, fixed-width layouts)
+.container {
+ .container-fixed();
+}
+
+// Fluid layouts (left aligned, with sidebar, min- & max-width content)
+.container-fluid {
+ padding-left: @gridGutterWidth;
+ padding-right: @gridGutterWidth;
+ .clearfix();
+}
View
240 vendor/toolkit/twitter/bootstrap/mixins.less
@@ -7,7 +7,7 @@
// --------------------------------------------------
// Clearfix
-// -------------------------
+// --------
// For clearing floats like a boss h5bp.com/q
.clearfix() {
*zoom: 1;
@@ -21,21 +21,53 @@
}
}
+// Webkit-style focus
+// ------------------
+.tab-focus() {
+ // Default
+ outline: thin dotted;
+ // Webkit
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px;
+}
+
// Center-align a block level element
-// -------------------------
+// ----------------------------------
.center-block() {
display: block;
margin-left: auto;
margin-right: auto;
}
// IE7 inline-block
-// -------------------------
+// ----------------
.ie7-inline-block() {
*display: inline; /* IE7 inline-block hack */
*zoom: 1;
}
+// IE7 likes to collapse whitespace on either side of the inline-block elements.
+// Ems because we're attempting to match the width of a space character. Left
+// version is for form buttons, which typically come after other elements, and
+// right version is for icons, which come before. Applying both is ok, but it will
+// mean that space between those elements will be .6em (~2 space characters) in IE7,
+// instead of the 1 space in other browsers.
+.ie7-restore-left-whitespace() {
+ *margin-left: .3em;
+
+ &:first-child {
+ *margin-left: 0;
+ }
+}
+
+.ie7-restore-right-whitespace() {
+ *margin-right: .3em;
+
+ &:last-child {
+ *margin-left: 0;
+ }
+}
+
// Sizing shortcuts
// -------------------------
.size(@height: 5px, @width: 5px) {
@@ -101,29 +133,134 @@
// Site container
// -------------------------
.container-fixed() {
- width: @siteWidth;
+ width: @gridRowWidth;
margin-left: auto;
margin-right: auto;
.clearfix();
}
-// Columns and offseting
+// Le grid system
// -------------------------
-.columns(@columns: 1) {
- width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
-}
-.offset(@columns: 1) {
- margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+#gridSystem {
+ // Setup the mixins to be used
+ .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) {
+ width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
+ }
+ .offset(@gridColumnWidth, @gridGutterWidth, @columns) {
+ margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1)) + (@gridGutterWidth * 2);
+ }
+ .gridColumn(@gridGutterWidth) {
+ float: left;
+ margin-left: @gridGutterWidth;
+ }
+ // Take these values and mixins, and make 'em do their thang
+ .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) {
+ // Row surrounds the columns
+ .row {
+ margin-left: @gridGutterWidth * -1;
+ .clearfix();
+ }
+ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
+ [class*="span"] {
+ #gridSystem > .gridColumn(@gridGutterWidth);
+ }
+ // Default columns
+ .span1 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
+ .span2 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
+ .span3 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); }
+ .span4 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); }
+ .span5 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); }
+ .span6 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); }
+ .span7 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); }
+ .span8 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); }
+ .span9 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
+ .span10 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
+ .span11 { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
+ .span12,
+ .container { #gridSystem > .columns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+ // Offset column options
+ .offset1 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 1); }
+ .offset2 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 2); }
+ .offset3 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 3); }
+ .offset4 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 4); }
+ .offset5 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 5); }
+ .offset6 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 6); }
+ .offset7 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 7); }
+ .offset8 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 8); }
+ .offset9 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 9); }
+ .offset10 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 10); }
+ .offset11 { #gridSystem > .offset(@gridColumnWidth, @gridGutterWidth, 11); }
+ }
}
-// Necessary grid styles for every column to make them appear next to each other horizontally
-.gridColumn() {
- float: left;
- margin-left: @gridGutterWidth;
+
+// Fluid grid system
+// -------------------------
+#fluidGridSystem {
+ // Setup the mixins to be used
+ .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, @columns) {
+ width: 1% * (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
+ }
+ .gridColumn(@fluidGridGutterWidth) {
+ float: left;
+ margin-left: @fluidGridGutterWidth;
+ }
+ // Take these values and mixins, and make 'em do their thang
+ .generate(@gridColumns, @fluidGridColumnWidth, @fluidGridGutterWidth) {
+ // Row surrounds the columns
+ .row-fluid {
+ width: 100%;
+ .clearfix();
+
+ // Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7, thanks @dhg)
+ > [class*="span"] {
+ #fluidGridSystem > .gridColumn(@fluidGridGutterWidth);
+ }
+ > [class*="span"]:first-child {
+ margin-left: 0;
+ }
+ // Default columns
+ .span1 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 1); }
+ .span2 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 2); }
+ .span3 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 3); }
+ .span4 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 4); }
+ .span5 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 5); }
+ .span6 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 6); }
+ .span7 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 7); }
+ .span8 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 8); }
+ .span9 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 9); }
+ .span10 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 10); }
+ .span11 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 11); }
+ .span12 { #fluidGridSystem > .columns(@fluidGridGutterWidth, @fluidGridColumnWidth, 12); }
+ }
+ }
}
-// makeColumn can be used to mark any element (e.g., .content-primary) as a column without changing markup to .span something
-.makeColumn(@columnSpan: 1) {
- .gridColumn();
- .columns(@columnSpan);
+
+
+
+// Input grid system
+// -------------------------
+#inputGridSystem {
+ .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, @columns) {
+ width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 10;
+ }
+ .generate(@gridColumns, @gridColumnWidth, @gridGutterWidth) {
+ input,
+ textarea,
+ .uneditable-input {
+ &.span1 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 1); }
+ &.span2 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 2); }
+ &.span3 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 3); }
+ &.span4 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 4); }
+ &.span5 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 5); }
+ &.span6 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 6); }
+ &.span7 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 7); }
+ &.span8 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 8); }
+ &.span9 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 9); }
+ &.span10 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 10); }
+ &.span11 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 11); }
+ &.span12 { #inputGridSystem > .inputColumns(@gridGutterWidth, @gridColumnWidth, @gridRowWidth, 12); }
+ }
+ }
}
@@ -176,9 +313,23 @@
-o-transform: translate(@x, @y);
transform: translate(@x, @y);
}
+.skew(@x: 0, @y: 0) {
+ -webkit-transform: translate(@x, @y);
+ -moz-transform: translate(@x, @y);
+ -ms-transform: translate(@x, @y);
+ -o-transform: translate(@x, @y);
+ transform: translate(@x, @y);
+}
+.skew(@x: 0, @y: 0) {
+ -webkit-transform: skew(@x, @y);
+ -moz-transform: skew(@x, @y);
+ -ms-transform: skew(@x, @y);
+ -o-transform: skew(@x, @y);
+ transform: skew(@x, @y);
+}
// Background clipping
-// Heads up: FF 3.6 and under need padding instead of padding-box
+// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
.background-clip(@clip) {
-webkit-background-clip: @clip;
-moz-background-clip: @clip;
@@ -228,9 +379,8 @@
// Opacity
.opacity(@opacity: 100) {
- filter: e(%("alpha(opacity=%d)", @opacity));
- -moz-opacity: @opacity / 100;
- opacity: @opacity / 100;
+ opacity: @opacity / 100;
+ filter: e(%("alpha(opacity=%d)", @opacity));
}
@@ -245,9 +395,7 @@
}
.border(@color: @white, @alpha: 1) {
border-color: hsla(hue(@color), saturation(@color), lightness(@color), @alpha);
- -webkit-background-clip: padding-box;
- -moz-background-clip: padding;
- background-clip: padding-box;
+ .background-clip(padding-box);
}
}
@@ -262,27 +410,25 @@
#gradient {
.horizontal(@startColor: #555, @endColor: #333) {
background-color: @endColor;
- background-image: -khtml-gradient(linear, left top, right top, from(@startColor), to(@endColor)); // Konqueror
background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+
background-image: -ms-linear-gradient(left, @startColor, @endColor); // IE10
- background-image: -webkit-gradient(linear, left top, right top, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+ background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(left, @startColor, @endColor); // Le standard
background-repeat: repeat-x;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",@startColor,@endColor)); // IE9 and down
}
.vertical(@startColor: #555, @endColor: #333) {
- background-color: @endColor;
- background-image: -khtml-gradient(linear, left top, left bottom, from(@startColor), to(@endColor)); // Konqueror
+ background-color: mix(@startColor, @endColor, 60%);
background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+
background-image: -ms-linear-gradient(top, @startColor, @endColor); // IE10
- background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, @startColor), color-stop(100%, @endColor)); // Safari 4+, Chrome 2+
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
background-image: linear-gradient(top, @startColor, @endColor); // The standard
background-repeat: repeat-x;
- filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
+ filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down
}
.directional(@startColor: #555, @endColor: #333, @deg: 45deg) {
background-color: @endColor;
@@ -294,7 +440,7 @@
background-image: linear-gradient(@deg, @startColor, @endColor); // The standard
}
.vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) {
- background-color: @endColor;
+ background-color: mix(@midColor, @endColor, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor));
background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor);
background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor);
@@ -305,11 +451,11 @@
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE9 and down, gets no color-stop at all for proper fallback
}
.radial(@innerColor: #555, @outerColor: #333) {
- background-color: @outsideColor;
- background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor));
- background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor);
- background-image: -moz-radial-gradient(circle, @centerColor, @outsideColor);
- background-image: -ms-radial-gradient(circle, @centerColor, @outsideColor);
+ background-color: @outerColor;
+ background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
+ background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
+ background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
+ background-image: -ms-radial-gradient(circle, @innerColor, @outerColor);
background-repeat: no-repeat;
// Opera cannot do radial gradients yet
}
@@ -323,13 +469,31 @@
background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
}
}
-
// Reset filters for IE
.reset-filter() {
filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)"));
}
+// Mixin for generating button backgrounds
+// ---------------------------------------
+.buttonBackground(@startColor, @endColor) {
+ // gradientBar will set the background to a pleasing blend of these, to support IE<=9
+ .gradientBar(@startColor, @endColor);
+ .reset-filter();
+
+ // in these cases the gradient won't cover the background, so we override
+ &:hover, &:active, &.active, &.disabled, &[disabled] {
+ background-color: @endColor;
+ }
+
+ // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
+ &:active,
+ &.active {
+ background-color: darken(@endColor, 10%) e("\9");
+ }
+}
+
// COMPONENT MIXINS
// --------------------------------------------------
View
11 vendor/toolkit/twitter/bootstrap/modals.less
@@ -1,6 +1,13 @@
// MODALS
// ------
+.modal-open {
+ .dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
+ .dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
+ .popover { z-index: @zindexPopover + @zindexModal; }
+ .tooltip { z-index: @zindexTooltip + @zindexModal; }
+}
+
.modal-backdrop {
position: fixed;
top: 0;
@@ -41,7 +48,7 @@
&.fade.in { top: 50%; }
}
.modal-header {
- padding: 5px 15px;
+ padding: 9px 15px;
border-bottom: 1px solid #eee;
// Close icon
.close { margin-top: 2px; }
@@ -60,6 +67,6 @@
.btn {
float: right;
margin-left: 5px;
- margin-bottom: 0; // account for input[type=submit] which gets the bottom margin like all other inputs
+ margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
}
}
View
101 vendor/toolkit/twitter/bootstrap/navbar.less
@@ -7,20 +7,51 @@
.navbar {
overflow: visible;
+ margin-bottom: @baseLineHeight;
}
-// 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
.navbar-inner {
- background-color: @navbarBackground;
+ padding-left: 20px;
+ padding-right: 20px;
#gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
+ .border-radius(4px);
@shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
.box-shadow(@shadow);
}
-// Text and links
+// Navbar button for toggling navbar items in responsive layouts
+.btn-navbar {
+ display: none;
+ float: right;
+ padding: 7px 10px;
+ margin-left: 5px;
+ margin-right: 5px;
+ .buttonBackground(@navbarBackgroundHighlight, @navbarBackground);
+ @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+ .box-shadow(@shadow);
+}
+.btn-navbar .icon-bar {
+ display: block;
+ width: 18px;
+ height: 2px;
+ background-color: #f5f5f5;
+ .border-radius(1px);
+ .box-shadow(0 1px 0 rgba(0,0,0,.25));
+}
+.btn-navbar .icon-bar + .icon-bar {
+ margin-top: 3px;
+}
+// Override the default collapsed state
+.nav-collapse.collapse {
+ height: auto;
+}
+
+
+// Brand, links, text, and buttons
.navbar {
// Hover and active states
.brand:hover {
- color: @white;
text-decoration: none;
}
// Website or project name
@@ -35,9 +66,10 @@
color: @white;
}
// Plain text in topbar
- p {
- margin: 0;
+ .navbar-text {
+ margin-bottom: 0;
line-height: 40px;
+ color: @navbarText;
a:hover {
color: @white;
background-color: transparent;
@@ -56,11 +88,22 @@
// Navbar forms
.navbar-form {
margin-bottom: 0; // remove default bottom margin
+ .clearfix();
input,
select {
display: inline-block;
+ margin-top: 5px;
margin-bottom: 0;
}
+ .radio,
+ .checkbox {
+ margin-top: 5px;
+ }
+ input[type="image"],
+ input[type="checkbox"],
+ input[type="radio"] {
+ margin-top: 3px;
+ }
}
// Navbar search
@@ -74,7 +117,7 @@
#font > .sans-serif(13px, normal, 1);
color: @white;
color: rgba(255,255,255,.75);
- background: #444;
+ background: #666;
background: rgba(255,255,255,.3);
border: 1px solid #111;
@shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
@@ -105,25 +148,21 @@
}
-// Static navbar
-.navbar-static {
- margin-bottom: @baseLineHeight;
-}
-.navbar-static .navbar-inner {
- padding-left: 20px;
- padding-right: 20px;
- .border-radius(4px);
-}
+// FIXED NAVBAR
+// ------------
-// Fixed navbar
-.navbar-fixed {
+.navbar-fixed-top {
position: fixed;
top: 0;
right: 0;
left: 0;
z-index: @zindexFixedNavbar;
}
-
+.navbar-fixed-top .navbar-inner {
+ padding-left: 0;
+ padding-right: 0;
+ .border-radius(0);
+}
// NAVIGATION
@@ -149,33 +188,34 @@
float: none;
padding: 10px 10px 11px;
line-height: 19px;
- color: @grayLight;
+ color: @navbarLinkColor;
text-decoration: none;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
}
// Hover
.navbar .nav > li > a:hover {
background-color: transparent;
- color: @white;
+ color: @navbarLinkColorHover;
text-decoration: none;
}
// Active nav items
-.navbar .nav .active > a {
- color: @white;
+.navbar .nav .active > a,
+.navbar .nav .active > a:hover {
+ color: @navbarLinkColorHover;
text-decoration: none;
- background-color: @grayDarker;
+ background-color: @navbarBackground;
background-color: rgba(0,0,0,.5);
}
// Dividers (basically a vertical hr)
-.navbar .vertical-divider {
- height: 40px;
+.navbar .divider-vertical {
+ height: @navbarHeight;
width: 1px;
- margin: 0 5px;
+ margin: 0 9px;
overflow: hidden;
- background-color: @grayDarker;
- border-right: 1px solid #444;
+ background-color: @navbarBackground;
+ border-right: 1px solid @navbarBackgroundHighlight;
}
// Secondary (floated right) nav in topbar
@@ -239,6 +279,7 @@
// Right aligned menus need alt position
.navbar .nav.pull-right .dropdown-menu {
+ left: auto;
right: 0;
&:before {
left: auto;
@@ -248,4 +289,4 @@
left: auto;
right: 13px;
}
-}
+}
View
131 vendor/toolkit/twitter/bootstrap/navs.less
@@ -26,51 +26,54 @@
// NAV LIST
// --------
-.nav.list {
+.nav-list {
padding-left: 14px;
padding-right: 14px;
margin-bottom: 0;
}
-.nav.list > li > a,
-.nav.list .nav-header {
+.nav-list > li > a,
+.nav-list .nav-header {
display: block;
padding: 3px 15px;
margin-left: -15px;
margin-right: -15px;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
}
-.nav.list .nav-header {
+.nav-list .nav-header {
font-size: 11px;
font-weight: bold;
line-height: @baseLineHeight;
color: @grayLight;
text-transform: uppercase;
}
-.nav.list > li + .nav-header {
+.nav-list > li + .nav-header {
margin-top: 9px;
}
-.nav.list .active > a {
+.nav-list .active > a {
color: @white;
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: @linkColor;
}
+.nav-list .icon {
+ margin-right: 2px;
+}
// TABS AND PILLS
// -------------
// Common styles
-.tabs,
-.pills {
+.nav-tabs,
+.nav-pills {
.clearfix();
}
-.tabs > li,
-.pills > li {
+.nav-tabs > li,
+.nav-pills > li {
float: left;
}
-.tabs > li > a,
-.pills > li > a {
+.nav-tabs > li > a,
+.nav-pills > li > a {
padding-right: 12px;
padding-left: 12px;
margin-right: 2px;
@@ -81,17 +84,17 @@
// ----
// Give the tabs something to sit on
-.tabs {
+.nav-tabs {
border-bottom: 1px solid #ddd;
}
// Make the list-items overlay the bottom border
-.tabs > li {
+.nav-tabs > li {
margin-bottom: -1px;
}
// Actual tabs (as links)
-.tabs > li > a {
+.nav-tabs > li > a {
padding-top: 9px;
padding-bottom: 9px;
border: 1px solid transparent;
@@ -101,8 +104,8 @@
}
}
// Active state, and it's :hover to override normal :hover
-.tabs > .active > a,
-.tabs > .active > a:hover {
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover {
color: @gray;
background-color: @white;
border: 1px solid #ddd;
@@ -114,7 +117,7 @@
// -----
// Links rendered as pills
-.pills > li > a {
+.nav-pills > li > a {
padding-top: 8px;
padding-bottom: 8px;
margin-top: 2px;
@@ -123,8 +126,8 @@
}
// Active state
-.pills .active > a,
-.pills .active > a:hover {
+.nav-pills .active > a,
+.nav-pills .active > a:hover {
color: @white;
background-color: @linkColor;
}
@@ -135,37 +138,37 @@
// -----------
// Stacked tabs and pills
-.nav.stacked > li {
+.nav-stacked > li {
float: none;
}
-.nav.stacked > li > a {
+.nav-stacked > li > a {
margin-right: 0; // no need for the gap between nav items
}
// Tabs
-.tabs.stacked {
+.nav-tabs.nav-stacked {
border-bottom: 0;
}
-.tabs.stacked > li > a {
+.nav-tabs.nav-stacked > li > a {
border: 1px solid #ddd;
.border-radius(0);
}
-.tabs.stacked > li:first-child > a {
+.nav-tabs.nav-stacked > li:first-child > a {
.border-radius(4px 4px 0 0);
}
-.tabs.stacked > li:last-child > a {
+.nav-tabs.nav-stacked > li:last-child > a {
.border-radius(0 0 4px 4px);
}
-.tabs.stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover {
border-color: #ddd;
z-index: 2;
}
// Pills
-.pills.stacked > li > a {
+.nav-pills.nav-stacked > li > a {
margin-bottom: 3px;
}
-.pills.stacked > li:last-child > a {
+.nav-pills.nav-stacked > li:last-child > a {
margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
}
@@ -175,32 +178,32 @@
// ---------
// Position the menu
-.pills .dropdown-menu,
-.tabs .dropdown-menu {
+.nav-tabs .dropdown-menu,
+.nav-pills .dropdown-menu {
margin-top: 1px;
border-width: 1px;
}
-.pills .dropdown-menu {
+.nav-pills .dropdown-menu {
.border-radius(4px);
}
// Default dropdown links
// -------------------------
// Make carets use linkColor to start
-.tabs .dropdown-toggle .caret,
-.pills .dropdown-toggle .caret {
+.nav-tabs .dropdown-toggle .caret,
+.nav-pills .dropdown-toggle .caret {
border-top-color: @linkColor;
margin-top: 6px;
}
-.tabs .dropdown-toggle:hover .caret,
-.pills .dropdown-toggle:hover .caret {
+.nav-tabs .dropdown-toggle:hover .caret,
+.nav-pills .dropdown-toggle:hover .caret {
border-top-color: @linkColorHover;
}
// Active dropdown links
// -------------------------
-.tabs .active .dropdown-toggle .caret,
-.pills .active .dropdown-toggle .caret {
+.nav-tabs .active .dropdown-toggle .caret,
+.nav-pills .active .dropdown-toggle .caret {
border-top-color: @grayDark;
}
@@ -213,8 +216,8 @@
// Open dropdowns
// -------------------------
-.tabs .open .dropdown-toggle,
-.pills .open .dropdown-toggle,
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
.nav > .open.active > a:hover {
color: @white;
background-color: @grayLight;
@@ -228,7 +231,7 @@
}
// Dropdowns in stacked tabs
-.tabs.stacked .open > a:hover {
+.tabs-stacked .open > a:hover {
border-color: @grayLight;
}
@@ -247,9 +250,9 @@
}
// Remove border on bottom, left, right
-.tabs-below .tabs,
-.tabs-right .tabs,
-.tabs-left .tabs {
+.tabs-below .nav-tabs,
+.tabs-right .nav-tabs,
+.tabs-left .nav-tabs {
border-bottom: 0;
}
@@ -267,72 +270,74 @@
// BOTTOM
// ------
-.tabs-below .tabs {
+.tabs-below .nav-tabs {
border-top: 1px solid #ddd;
}
-.tabs-below .tabs > li {
+.tabs-below .nav-tabs > li {
margin-top: -1px;
margin-bottom: 0;
}
-.tabs-below .tabs > li > a {
+.tabs-below .nav-tabs > li > a {
.border-radius(0 0 4px 4px);
&:hover {
border-bottom-color: transparent;
border-top-color: #ddd;
}
}
-.tabs-below .tabs .active > a,
-.tabs-below .tabs .active > a:hover {
+.tabs-below .nav-tabs .active > a,
+.tabs-below .nav-tabs .active > a:hover {
border-color: transparent #ddd #ddd #ddd;
}
// LEFT & RIGHT
// ------------
// Common styles
-.tabs-left .tabs > li,
-.tabs-right .tabs > li {
+.tabs-left .nav-tabs > li,
+.tabs-right .nav-tabs > li {
float: none;
}
-.tabs-left .tabs > li > a,
-.tabs-right .tabs > li > a {
+.tabs-left .nav-tabs > li > a,
+.tabs-right .nav-tabs > li > a {
min-width: 74px;
margin-right: 0;
margin-bottom: 3px;
}
// Tabs on the left
-.tabs-left .tabs {
+.tabs-left .nav-tabs {
float: left;
margin-right: 19px;
border-right: 1px solid #ddd;
}
-.tabs-left .tabs > li > a {
+.tabs-left .nav-tabs > li > a {
margin-right: -1px;
.border-radius(4px 0 0 4px);
}
-.tabs-left .tabs > li > a:hover {
+.tabs-left .nav-tabs > li > a:hover {
border-color: @grayLighter #ddd @grayLighter @grayLighter;
}
-.tabs-left .tabs .active > a,
-.tabs-left .tabs .active > a:hover {
+.tabs-left .nav-tabs .active > a,
+.tabs-left .nav-tabs .active > a:hover {
border-color: #ddd transparent #ddd #ddd;
+ *border-right-color: @white;
}
// Tabs on the right
-.tabs-right .tabs {
+.tabs-right .nav-tabs {
float: right;
margin-left: 19px;
border-left: 1px solid #ddd;
}
-.tabs-right .tabs > li > a {
+.tabs-right .nav-tabs > li > a {
margin-left: -1px;
.border-radius(0 4px 4px 0);
}
-.tabs-right .tabs > li > a:hover {
+.tabs-right .nav-tabs > li > a:hover {
border-color: @grayLighter @grayLighter @grayLighter #ddd;
}
-.tabs-right .tabs .active > a,
-.tabs-right .tabs .active > a:hover {
+.tabs-right .nav-tabs .active > a,
+.tabs-right .nav-tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent;
+ *border-left-color: @white;
}
View
9 vendor/toolkit/twitter/bootstrap/pager.less
@@ -13,10 +13,15 @@
}
.pager a {
display: inline-block;
- padding: 6px 15px;
- background-color: #f5f5f5;
+ padding: 5px 14px;
+ background-color: #fff;
+ border: 1px solid #ddd;
.border-radius(15px);
}
+.pager a:hover {
+ text-decoration: none;
+ background-color: #f5f5f5;
+}
.pager .next a {
float: right;
}
View
1 vendor/toolkit/twitter/bootstrap/pagination.less
@@ -30,6 +30,7 @@
}
.pagination .active a {
color: @grayLight;
+ cursor: default;
}
.pagination .disabled a,
.pagination .disabled a:hover {
View
17 vendor/toolkit/twitter/bootstrap/patterns.less
@@ -6,23 +6,6 @@
// PAGE HEADERS
// ------------
-.hero-unit {
- padding: 60px;
- margin-bottom: 30px;
- background-color: #f5f5f5;
- .border-radius(6px);
- h1 {
- margin-bottom: 0;
- font-size: 60px;
- line-height: 1;
- letter-spacing: -1px;
- }
- p {
- font-size: 18px;
- font-weight: 200;
- line-height: @baseLineHeight * 1.5;
- }
-}
footer {
padding-top: @baseLineHeight - 1;
margin-top: @baseLineHeight - 1;
View
50 vendor/toolkit/twitter/bootstrap/popovers.less
@@ -21,29 +21,29 @@
width: 0;
height: 0;
}
- .inner {
- padding: 3px;
- width: 280px;
- overflow: hidden;
- background: @black; // has to be full background declaration for IE fallback
- background: rgba(0,0,0,.8);
- .border-radius(6px);
- .box-shadow(0 3px 7px rgba(0,0,0,0.3));
+}
+.popover-inner {
+ padding: 3px;
+ width: 280px;
+ overflow: hidden;
+ background: @black; // has to be full background declaration for IE fallback
+ background: rgba(0,0,0,.8);