Permalink
Browse files

update to bootstrap 2.1.0

  • Loading branch information...
1 parent 3fb04f9 commit 5f78912be323c58cc2462c64c2f84aee2588dcb3 @dryan committed Sep 15, 2012
Showing with 2,534 additions and 5,219 deletions.
  1. +2 −4,376 admin_bootstrap/static/admin/css/admin.css
  2. BIN admin_bootstrap/static/admin/img/glyphicons-halflings.png
  3. +3 −2 admin_bootstrap/static/admin/less/accordion.less
  4. +16 −9 admin_bootstrap/static/admin/less/alerts.less
  5. +1 −1 admin_bootstrap/static/admin/less/bootstrap.less
  6. +10 −10 admin_bootstrap/static/admin/less/breadcrumbs.less
  7. +76 −23 admin_bootstrap/static/admin/less/button-groups.less
  8. +85 −65 admin_bootstrap/static/admin/less/buttons.less
  9. +13 −3 admin_bootstrap/static/admin/less/carousel.less
  10. +4 −2 admin_bootstrap/static/admin/less/close.less
  11. +6 −5 admin_bootstrap/static/admin/less/code.less
  12. +8 −5 admin_bootstrap/static/admin/less/component-animations.less
  13. +84 −17 admin_bootstrap/static/admin/less/dropdowns.less
  14. +177 −126 admin_bootstrap/static/admin/less/forms.less
  15. +17 −1 admin_bootstrap/static/admin/less/grid.less
  16. +4 −2 admin_bootstrap/static/admin/less/hero-unit.less
  17. +19 −2 admin_bootstrap/static/admin/less/labels-badges.less
  18. +1 −2 admin_bootstrap/static/admin/less/layouts.less
  19. +118 −78 admin_bootstrap/static/admin/less/mixins.less
  20. +9 −2 admin_bootstrap/static/admin/less/modals.less
  21. +237 −132 admin_bootstrap/static/admin/less/navbar.less
  22. +38 −17 admin_bootstrap/static/admin/less/navs.less
  23. +5 −4 admin_bootstrap/static/admin/less/pager.less
  24. +16 −8 admin_bootstrap/static/admin/less/pagination.less
  25. +101 −33 admin_bootstrap/static/admin/less/popovers.less
  26. +18 −13 admin_bootstrap/static/admin/less/progress-bars.less
  27. +11 −3 admin_bootstrap/static/admin/less/reset.less
  28. +9 −7 admin_bootstrap/static/admin/less/responsive-1200px-min.less
  29. +86 −68 admin_bootstrap/static/admin/less/responsive-767px-max.less
  30. +7 −5 admin_bootstrap/static/admin/less/responsive-768px-979px.less
  31. +27 −7 admin_bootstrap/static/admin/less/responsive-navbar.less
  32. +17 −15 admin_bootstrap/static/admin/less/responsive-utilities.less
  33. +5 −5 admin_bootstrap/static/admin/less/responsive.less
  34. +26 −4 admin_bootstrap/static/admin/less/scaffolding.less
  35. +15 −19 admin_bootstrap/static/admin/less/sprites.less
  36. +60 −11 admin_bootstrap/static/admin/less/tables.less
  37. +9 −4 admin_bootstrap/static/admin/less/thumbnails.less
  38. +47 −12 admin_bootstrap/static/admin/less/tooltip.less
  39. +58 −87 admin_bootstrap/static/admin/less/type.less
  40. +9 −2 admin_bootstrap/static/admin/less/utilities.less
  41. +99 −27 admin_bootstrap/static/admin/less/variables.less
  42. +7 −5 admin_bootstrap/static/admin/less/wells.less
  43. +974 −0 admin_bootstrap/static/admin/responsive.css
Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,5 +1,6 @@
-// ACCORDION
-// ---------
+//
+// Accordion
+// --------------------------------------------------
// Parent container
@@ -1,7 +1,11 @@
-// ALERT STYLES
-// ------------
+//
+// Alerts
+// --------------------------------------------------
+
+
+// Base styles
+// -------------------------
-// Base alert styles
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: @baseLineHeight;
@@ -11,24 +15,25 @@
.border-radius(4px);
color: @warningText;
}
-.alert-heading {
- color: inherit;
+.alert h4 {
+ margin: 0;
}
// Adjust close link position
.alert .close {
position: relative;
top: -2px;
right: -21px;
- line-height: 18px;
+ line-height: @baseLineHeight;
}
+
// Alternate styles
-// ----------------
+// -------------------------
.alert-success {
background-color: @successBackground;
- border-color: @successBorder;
+ border-color: @successBorder;
color: @successText;
}
.alert-danger,
@@ -43,8 +48,10 @@
color: @infoText;
}
+
// Block alerts
-// ------------------------
+// -------------------------
+
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.3
+ * Bootstrap v2.1.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -1,24 +1,24 @@
-// BREADCRUMBS
-// -----------
+//
+// Breadcrumbs
+// --------------------------------------------------
+
.breadcrumb {
- padding: 7px 14px;
+ padding: 8px 15px;
margin: 0 0 @baseLineHeight;
list-style: none;
- #gradient > .vertical(@white, #f5f5f5);
- border: 1px solid #ddd;
- .border-radius(3px);
- .box-shadow(inset 0 1px 0 @white);
+ background-color: #f5f5f5;
+ .border-radius(4px);
li {
display: inline-block;
.ie7-inline-block();
text-shadow: 0 1px 0 @white;
}
.divider {
padding: 0 5px;
- color: @grayLight;
+ color: #ccc;
}
- .active a {
- color: @grayDark;
+ .active {
+ color: @grayLight;
}
}
@@ -1,11 +1,13 @@
-// BUTTON GROUPS
-// -------------
+//
+// Button groups
+// --------------------------------------------------
// Make the div behave like a button
.btn-group {
position: relative;
- .clearfix(); // clears the floated buttons
+ font-size: 0; // remove as part 1 of font-size inline-block hack
+ white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
.ie7-restore-left-whitespace();
}
@@ -16,21 +18,44 @@
// Optional: Group multiple button groups together for a toolbar
.btn-toolbar {
+ font-size: 0; // Hack to remove whitespace that results from using inline-block
margin-top: @baseLineHeight / 2;
margin-bottom: @baseLineHeight / 2;
.btn-group {
display: inline-block;
.ie7-inline-block();
}
+ .btn + .btn,
+ .btn-group + .btn,
+ .btn + .btn-group {
+ margin-left: 5px;
+ }
}
// 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);
}
+.btn-group > .btn + .btn {
+ margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu {
+ font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
+}
+
+// Reset fonts for other sizes
+.btn-group > .btn-mini {
+ font-size: 11px;
+}
+.btn-group > .btn-small {
+ font-size: 12px;
+}
+.btn-group > .btn-large {
+ font-size: 16px;
+}
+
// 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;
@@ -91,24 +116,28 @@
// ----------------------
// Give the line between buttons some depth
-.btn-group > .dropdown-toggle {
+.btn-group > .btn + .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
.box-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)");
- *padding-top: 4px;
- *padding-bottom: 4px;
+ *padding-top: 5px;
+ *padding-bottom: 5px;
}
-.btn-group > .btn-mini.dropdown-toggle {
+.btn-group > .btn-mini + .dropdown-toggle {
padding-left: 5px;
padding-right: 5px;
+ *padding-top: 2px;
+ *padding-bottom: 2px;
}
-.btn-group > .btn-small.dropdown-toggle {
- *padding-top: 4px;
+.btn-group > .btn-small + .dropdown-toggle {
+ *padding-top: 5px;
*padding-bottom: 4px;
}
-.btn-group > .btn-large.dropdown-toggle {
+.btn-group > .btn-large + .dropdown-toggle {
padding-left: 12px;
padding-right: 12px;
+ *padding-top: 7px;
+ *padding-bottom: 7px;
}
.btn-group.open {
@@ -147,22 +176,16 @@
// Reposition the caret
.btn .caret {
- margin-top: 7px;
+ margin-top: 8px;
margin-left: 0;
}
-.btn:hover .caret,
-.open.btn-group .caret {
- .opacity(100);
-}
// Carets in other button sizes
-.btn-mini .caret {
- margin-top: 5px;
-}
-.btn-small .caret {
+.btn-mini .caret,
+.btn-small .caret,
+.btn-large .caret {
margin-top: 6px;
}
.btn-large .caret {
- margin-top: 6px;
border-left-width: 5px;
border-right-width: 5px;
border-top-width: 5px;
@@ -185,7 +208,37 @@
.caret {
border-top-color: @white;
border-bottom-color: @white;
- .opacity(75);
}
}
+
+
+// Vertical button groups
+// ----------------------
+
+.btn-group-vertical {
+ display: inline-block; // makes buttons only take up the width they need
+ .ie7-inline-block();
+}
+.btn-group-vertical .btn {
+ display: block;
+ float: none;
+ width: 100%;
+ .border-radius(0);
+}
+.btn-group-vertical .btn + .btn {
+ margin-left: 0;
+ margin-top: -1px;
+}
+.btn-group-vertical .btn:first-child {
+ .border-radius(4px 4px 0 0);
+}
+.btn-group-vertical .btn:last-child {
+ .border-radius(0 0 4px 4px);
+}
+.btn-group-vertical .btn-large:first-child {
+ .border-radius(6px 6px 0 0);
+}
+.btn-group-vertical .btn-large:last-child {
+ .border-radius(0 0 6px 6px);
+}
Oops, something went wrong.

0 comments on commit 5f78912

Please sign in to comment.