Permalink
Browse files

Updated LESS files with 2.1 styles and moved into CSS folder

Signed-off-by: Rachel Baker <rachel@rachelbaker.me>
  • Loading branch information...
1 parent 49e1460 commit cd038f0ba0a5bea73f5126fea00dc94038a53d9d @rachelbaker committed Sep 10, 2012
Showing with 852 additions and 534 deletions.
  1. +431 −260 {less → css}/bootstrapwp.css
  2. 0 { → css}/less/accordion.less
  3. 0 { → css}/less/alerts.less
  4. +1 −1 { → css}/less/bootstrap.less
  5. +7 −4 { → css}/less/bootstrapwp.less
  6. 0 { → css}/less/breadcrumbs.less
  7. 0 { → css}/less/bswp-custom.less
  8. +41 −43 { → css}/less/bswp-docs.less
  9. 0 { → css}/less/bswp-overrides.less
  10. +21 −7 { → css}/less/button-groups.less
  11. +32 −13 { → css}/less/buttons.less
  12. 0 { → css}/less/carousel.less
  13. 0 { → css}/less/close.less
  14. +1 −1 { → css}/less/code.less
  15. +0 −1 { → css}/less/component-animations.less
  16. +16 −2 { → css}/less/dropdowns.less
  17. +38 −20 { → css}/less/forms.less
  18. 0 { → css}/less/grid.less
  19. 0 { → css}/less/hero-unit.less
  20. 0 { → css}/less/labels-badges.less
  21. 0 { → css}/less/layouts.less
  22. +26 −15 { → css}/less/mixins.less
  23. +7 −2 { → css}/less/modals.less
  24. +48 −19 { → css}/less/navbar.less
  25. 0 { → css}/less/navs.less
  26. +10 −6 { → css}/less/pager.less
  27. +17 −17 { → css}/less/pagination.less
  28. 0 { → css}/less/popovers.less
  29. +14 −10 { → css}/less/progress-bars.less
  30. +5 −2 { → css}/less/reset.less
  31. 0 { → css}/less/responsive-1200px-min.less
  32. +31 −20 { → css}/less/responsive-767px-max.less
  33. 0 { → css}/less/responsive-768px-979px.less
  34. +13 −39 { → css}/less/responsive-navbar.less
  35. 0 { → css}/less/responsive-utilities.less
  36. +1 −1 { → css}/less/responsive.less
  37. +6 −5 { → css}/less/scaffolding.less
  38. +8 −3 { → css}/less/sprites.less
  39. +26 −6 { → css}/less/tables.less
  40. 0 { → css}/less/thumbnails.less
  41. 0 { → css}/less/tooltip.less
  42. +38 −26 { → css}/less/type.less
  43. +2 −1 { → css}/less/utilities.less
  44. +11 −9 { → css}/less/variables.less
  45. 0 { → css}/less/wells.less
  46. +1 −1 functions.php

Large diffs are not rendered by default.

Oops, something went wrong.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.4
+ * Bootstrap v2.1.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -4,7 +4,7 @@ Theme URI: http://bootstrapwp.rachelbaker.me
Author: Rachel Baker
Author URI: http://www.rachelbaker.me
Description: A semantic HTML/CSS framework base theme for WordPress Developers ported from Twitter Bootstrap
-Version: .87
+Version: .91
=======
License: GNU General Public License
License URI: license.txt
@@ -17,7 +17,7 @@ Use it to make something cool, have fun, and share what you've learned with othe
//////// to safely retain the ability to update the less files with future
//////// versions of Bootstrap or BootstrapWP
-/* Loading Standard Bootstrap 2.03 LESS Files
+/* Loading Standard Bootstrap 2.1 LESS Files
----------------------------------------------------------------------------------------*/
// CSS Reset
@import "reset.less";
@@ -68,17 +68,17 @@ Use it to make something cool, have fun, and share what you've learned with othe
@import "accordion.less";
@import "carousel.less";
@import "hero-unit.less";
-
// Utility classes
@import "utilities.less"; // Has to be last to override when necessary
-/* Loading Responsive Bootstrap 2.04 LESS Files
+/* Loading Responsive Bootstrap 2.1 LESS Files
----------------------------------------------------------------------------------------*/
// RESPONSIVE CLASSES
// ------------------
@import "responsive-utilities.less";
+
// MEDIA QUERIES
// ------------------
@@ -91,13 +91,16 @@ Use it to make something cool, have fun, and share what you've learned with othe
// Phones to portrait tablets and narrow desktops
@import "responsive-767px-max.less";
+
// RESPONSIVE NAVBAR
// ------------------
// From 979px and below, show a button to toggle navbar contents
@import "responsive-navbar.less";
+
+
/* Custom BootstrapWP Overrides and Styles
----------------------------------------------------------------------------------------*/
// BSWP DOCS
File renamed without changes.
File renamed without changes.
@@ -46,7 +46,7 @@ body > .navbar-fixed-top .brand:hover, body > .navbar-fixed-relative .brand:hove
/* padding for in-page bookmarks and fixed navbar */
section {
- padding-top: 60px;
+ padding-top: 30px;
}
section > .page-header,
section > .lead {
@@ -123,6 +123,8 @@ hr.soften {
color: #fff;
text-shadow: 0 0 10px rgba(255,255,255,.25);
}
+
+/* Download button */
.masthead .btn {
padding: 14px 24px;
font-size: 24px;
@@ -132,19 +134,17 @@ hr.soften {
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01);
- -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01);
- box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25), 0 2px 10px rgba(0,68,204,.01);
- -webkit-animation-name: downloadButton;
- -moz-animation-name: downloadButton;
- -webkit-animation-duration: 1.5s;
- -moz-animation-duration: 1.5s;
- -webkit-animation-iteration-count: infinite;
- -moz-animation-iteration-count: infinite;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
-webkit-transition: none;
-moz-transition: none;
transition: none;
-
+}
+.masthead .btn:hover {
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 5px rgba(0,0,0,.25);
}
.masthead .btn:active {
-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.1);
@@ -199,13 +199,6 @@ hr.soften {
padding: 0 10px;
color: rgba(255,255,255,.25);
}
-.masthead-links a {
- color: #fff;
- color: rgba(255,255,255,.5);
-}
-.masthead-links a:hover {
- color: #fff;
-}
/* Social proof buttons from GitHub & Twitter */
.bs-docs-social {
@@ -227,6 +220,8 @@ hr.soften {
display: inline-block;
padding: 5px 8px;
line-height: 1;
+ *display: inline;
+ *zoom: 1;
}
/* Subhead (other pages)
@@ -246,7 +241,6 @@ hr.soften {
}
-
/* Marketing section of Overview
-------------------------------------------------- */
@@ -392,6 +386,15 @@ h2 + .row {
margin-top: 5px;
}
+/* Example sites showcase */
+.example-sites {
+ xmargin-left: 20px;
+}
+.example-sites img {
+ max-width: 100%;
+ margin: 0 auto;
+}
+
.scrollspy-example {
height: 200px;
overflow: auto;
@@ -430,7 +433,7 @@ h2 + .row {
background-color: rgba(255,0,0,.25);
}
-/* Eaxmples page
+/* Example page
------------------------- */
.bootstrap-examples p {
font-size: 13px;
@@ -451,6 +454,7 @@ h2 + .row {
position: relative;
margin: 15px 0;
padding: 39px 19px 14px;
+ *padding-top: 19px;
background-color: #fff;
border: 1px solid #ddd;
-webkit-border-radius: 4px;
@@ -535,10 +539,6 @@ h2 + .row {
form.bs-docs-example {
padding-bottom: 19px;
}
-.bs-docs-example .lead {
- font-size: 18px;
- line-height: 24px;
-}
/* Images */
.bs-docs-example-images img {
@@ -644,18 +644,11 @@ form.bs-docs-example {
/* Sidenav for Docs
-------------------------------------------------- */
-/* prevent column from collapsing when affixing */
-.span3 {
- min-height: 1px;
-}
-
.bs-docs-sidenav {
- width: 218px;
- margin-top: 30px;
+ width: 228px;
+ margin: 30px 0 0;
padding: 0;
- margin-right: 10px;
background-color: #fff;
- margin-left: 0;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
@@ -667,7 +660,6 @@ form.bs-docs-example {
display: block;
*width: 190px;
margin: 0 0 -1px;
- font-size: 14px;
padding: 8px 14px;
border: 1px solid #e5e5e5;
}
@@ -682,9 +674,14 @@ form.bs-docs-example {
border-radius: 0 0 6px 6px;
}
.bs-docs-sidenav > .active > a {
- border-color: #08c;
position: relative;
z-index: 2;
+ padding: 9px 15px;
+ border: 0;
+ text-shadow: 0 1px 0 rgba(0,0,0,.15);
+ -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+ -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
+ box-shadow: inset 1px 0 0 rgba(0,0,0,.1), inset -1px 0 0 rgba(0,0,0,.1);
}
/* Chevrons */
.bs-docs-sidenav .icon-chevron-right {
@@ -699,9 +696,10 @@ form.bs-docs-example {
.bs-docs-sidenav a:hover .icon-chevron-right {
opacity: .5;
}
-.bs-docs-sidenav .active .icon-chevron-right {
+.bs-docs-sidenav .active .icon-chevron-right,
+.bs-docs-sidenav .active a:hover .icon-chevron-right {
background-image: url(../img/glyphicons-halflings-white.png);
- opacity: .75;
+ opacity: 1;
}
.bs-docs-sidenav.affix {
top: 40px;
@@ -768,15 +766,16 @@ form.bs-docs-example {
/* Adjust sidenav width */
.bs-docs-sidenav {
width: 166px;
+ margin-top: 20px;
}
.bs-docs-sidenav.affix {
- top: 0px;
+ top: 0;
}
}
/* Tablet
------------------------- */
-@media (max-width: 768px) {
+@media (max-width: 767px) {
/* Remove any padding from the body */
body {
padding-top: 0;
@@ -811,10 +810,12 @@ form.bs-docs-example {
/* Sidenav */
.bs-docs-sidenav {
width: auto;
+ margin-bottom: 20px;
}
.bs-docs-sidenav.affix {
- position: relative;
+ position: static;
width: auto;
+ top: 0;
}
/* Unfloat the back to top link in footer */
@@ -827,9 +828,6 @@ form.bs-docs-example {
.footer p {
margin-bottom: 9px;
}
- .bs-docs-sidenav.affix {
- top: 0;
- }
}
/* Landscape phones
File renamed without changes.
@@ -7,6 +7,7 @@
.btn-group {
position: relative;
font-size: 0; // remove as part 1 of font-size inline-block hack
+ vertical-align: middle; // match .btn alignment given font-size hack above
white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
.ie7-restore-left-whitespace();
}
@@ -18,20 +19,28 @@
// 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;
- 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
@@ -111,21 +120,25 @@
.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;
+ .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: 5px;
+ *padding-bottom: 5px;
}
.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;
+ *padding-top: 5px;
*padding-bottom: 4px;
}
.btn-group > .btn-large + .dropdown-toggle {
padding-left: 12px;
padding-right: 12px;
+ *padding-top: 7px;
+ *padding-bottom: 7px;
}
.btn-group.open {
@@ -134,7 +147,7 @@
// Remove the gradient and set the same inset shadow as the :active state
.dropdown-toggle {
background-image: none;
- .box-shadow(~"inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05)");
+ .box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
}
// Keep the hover's background when dropdown is open
@@ -206,15 +219,16 @@
.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;
- margin-left: 0;
width: 100%;
.border-radius(0);
}
.btn-group-vertical .btn + .btn {
+ margin-left: 0;
margin-top: -1px;
}
.btn-group-vertical .btn:first-child {
Oops, something went wrong.

0 comments on commit cd038f0

Please sign in to comment.