Skip to content
Browse files

Continuing .86 Development

__Bootstrap Styles and Scripts__

*	Updated JS files from Bootstrap 2.0.3 branch as of April 7, 2012
*	Updated CSS files from Bootstrap 2.0.3 branch as of April 7, 2012
*	Updated LESS files from Bootstrap 2.0.3 branch as of April 7, 2012

__Functions.php__

*    Added `bootstrapwp_autoset_featured_image()` function to replace
previous `catch_that_image()` function that was causing issues for some
theme users.  The post thumbnail will now automatically be set to the
first image added to a post if a featured image was not manually
declared.

__Page-blog.php__

*    Replaced `catch_that_image()` function with `the_post_thumbnail()`

__Author.php__

*    Replaced `catch_that_image()` function with `the_post_thumbnail()`

__Archive.php__

*    Replaced `catch_that_image()` function with `the_post_thumbnail()`

__Header.php__

*	Added `<?php bloginfo( 'template_url' );?>` to favicon link

__Misc.__

*	Updated favicons and moved them to /ico/ folder
  • Loading branch information...
1 parent acddb52 commit 57955b6911b9d397821753f25b4607807f91a8e1 @rachelbaker committed
Showing with 1,613 additions and 1,163 deletions.
  1. +27 −6 README.md
  2. +18 −17 archive.php
  3. +17 −24 author.php
  4. +238 −196 css/bootstrap-responsive.css
  5. +350 −211 css/bootstrap.css
  6. +8 −6 css/docs.css
  7. BIN favicon.ico
  8. +7 −6 header.php
  9. BIN ico/apple-touch-icon-114-precomposed.png
  10. BIN ico/apple-touch-icon-57-precomposed.png
  11. BIN ico/apple-touch-icon-72-precomposed.png
  12. BIN ico/bootstrap-apple-114x114.png
  13. BIN ico/bootstrap-apple-57x57.png
  14. BIN ico/bootstrap-apple-72x72.png
  15. BIN ico/favicon.ico
  16. +7 −6 js/bootstrap-alert.js
  17. +3 −2 js/bootstrap-button.js
  18. +18 −14 js/bootstrap-carousel.js
  19. +29 −13 js/bootstrap-collapse.js
  20. +5 −3 js/bootstrap-dropdown.js
  21. +14 −9 js/bootstrap-modal.js
  22. +4 −6 js/bootstrap-popover.js
  23. +28 −8 js/bootstrap-scrollspy.js
  24. +9 −5 js/bootstrap-tab.js
  25. +19 −7 js/bootstrap-tooltip.js
  26. +27 −18 js/bootstrap-transition.js
  27. +13 −10 js/bootstrap-typeahead.js
  28. +0 −36 less/badges.less
  29. +2 −3 less/bootstrap.less
  30. +59 −33 less/button-groups.less
  31. +12 −4 less/buttons.less
  32. +11 −0 less/close.less
  33. +4 −2 less/component-animations.less
  34. +9 −18 less/dropdowns.less
  35. +59 −34 less/forms.less
  36. +55 −0 less/labels-badges.less
  37. +0 −37 less/labels.less
  38. +77 −27 less/mixins.less
  39. +5 −1 less/modals.less
  40. +28 −17 less/navbar.less
  41. +10 −10 less/navs.less
  42. +14 −6 less/progress-bars.less
  43. +2 −1 less/reset.less
  44. +23 −0 less/responsive-1200px-min.less
  45. +145 −0 less/responsive-767px-max.less
  46. +15 −0 less/responsive-768px-979px.less
  47. +130 −0 less/responsive-navbar.less
  48. +41 −0 less/responsive-utilities.less
  49. +14 −335 less/responsive.less
  50. +12 −3 less/tables.less
  51. +11 −2 less/thumbnails.less
  52. +1 −0 less/type.less
  53. +9 −4 less/variables.less
  54. +24 −23 page-blog.php
View
33 README.md
@@ -10,9 +10,29 @@ Version .86 (still baking)
__Bootstrap Styles and Scripts__
-* Updated JS files from Bootstrap 2.0.2 branch as of March 11, 2012
-* Updated CSS files from Bootstrap 2.0.2 branch as of March 11, 2012
-* Updated LESS files from Bootstrap 2.0.2 branch as of March 11, 2012
+* Updated JS files from Bootstrap 2.0.3 branch as of April 7, 2012
+* Updated CSS files from Bootstrap 2.0.3 branch as of April 7, 2012
+* Updated LESS files from Bootstrap 2.0.3 branch as of April 7, 2012
+
+__Functions.php__
+
+* Added `bootstrapwp_autoset_featured_image()` function to replace previous `catch_that_image()` function that was causing issues for some theme users. The post thumbnail will now automatically be set to the first image added to a post if a featured image was not manually declared.
+
+__Page-blog.php__
+
+* Replaced `catch_that_image()` function with `the_post_thumbnail()`
+
+__Author.php__
+
+* Replaced `catch_that_image()` function with `the_post_thumbnail()`
+
+__Archive.php__
+
+* Replaced `catch_that_image()` function with `the_post_thumbnail()`
+
+__Header.php__
+
+* Added `<?php bloginfo( 'template_url' );?>` to favicon link
__Style.css__
@@ -22,6 +42,7 @@ __Style.css__
__Misc.__
* Fixed JavaScript guide link in Readme (props to fsimmons)
+* Updated favicons and moved them to /ico/ folder
@@ -39,7 +60,7 @@ __Functions.php__
* Added widget area for footer-content
* Fixed content_width size, now 770px
* Added theme language text domain
-* Added after_theme_setup hook to enable post formats
+* Added after_theme_setup hook to enable post formats
* Removed .css and .js from string names of enqueuing script and style functions
__Style.css__
@@ -103,9 +124,9 @@ Usage
Download the BootstrapWP theme, and install to your WordPress site.
-This is meant to be a base theme for WordPress custom theme development.
+This is meant to be a base theme for WordPress custom theme development.
-You can override any of the styles using style.css file. All .css and .js files are loaded in functions.php. Don't forget to disable any of the .js files you do not need.
+You can override any of the styles using style.css file. All .css and .js files are loaded in functions.php. Don't forget to disable any of the .js files you do not need.
View
35 archive.php
@@ -12,7 +12,7 @@
* @since WP-Bootstrap 0.6
*/
-get_header();
+get_header();
if (have_posts() ) ;?>
<div class="row">
<div class="container">
@@ -53,21 +53,22 @@
<div <?php post_class(); ?>>
<a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
<p class="meta"><?php echo bootstrapwp_posted_on();?></p>
- <div class="row">
- <div class="span2">
- <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
- <?php echo catch_that_image();?></a>
- </div><!-- /.span2 -->
- <div class="span6">
- <?php the_excerpt();?>
- </div><!-- /.span6 -->
- </div><!-- /.row -->
- <hr />
- </div><!-- /.post_class -->
- <?php endwhile; ?>
- <?php bootstrapwp_content_nav('nav-below');?>
+ <div class="row">
+ <div class="span2"><?php // Checking for a post thumbnail
+ if ( has_post_thumbnail() ) ?>
+ <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
+ <?php the_post_thumbnail();?></a>
+ </div><!-- /.span2 -->
+ <div class="span6">
+ <?php the_excerpt();?>
+ </div><!-- /.span6 -->
+ </div><!-- /.row -->
+ <hr />
+ </div><!-- /.post_class -->
+ <?php endwhile; ?>
+ <?php bootstrapwp_content_nav('nav-below');?>
- </div><!-- /.span8 -->
- <?php get_sidebar('blog'); ?>
+ </div><!-- /.span8 -->
+ <?php get_sidebar('blog'); ?>
- <?php get_footer(); ?>
+ <?php get_footer(); ?>
View
41 author.php
@@ -27,10 +27,8 @@
</div><!--/.row -->
<div class="container">
<header class="jumbotron subhead" id="overview">
-
<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'bootstrapwp' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
</header>
-
<?php
/* Since we called the_post() above, we need to
* rewind the loop back to the beginning that way
@@ -38,8 +36,6 @@
*/
rewind_posts();
?>
-
-
<div class="row content">
<div class="span8">
<?php /* Start the Loop */ ?>
@@ -47,24 +43,21 @@
<div <?php post_class(); ?>>
<a href="<?php the_permalink(); ?>" title="<?php the_title();?>"><h3><?php the_title();?></h3></a>
<p class="meta"><?php echo bootstrapwp_posted_on();?></p>
- <div class="row">
- <div class="span2">
- <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
- <?php echo catch_that_image();?></a>
- </div><!-- /.span2 -->
- <div class="span6">
- <?php the_excerpt();?>
- </div><!-- /.span6 -->
- </div><!-- /.row -->
- <hr />
- </div><!-- /.post_class -->
- <?php endwhile; ?>
-
-
- <?php endif; ?>
-
-
- </div><!-- /.span8 -->
- <?php get_sidebar('blog'); ?>
+ <div class="row">
+ <div class="span2"><?php // Checking for a post thumbnail
+ if ( has_post_thumbnail() ) ?>
+ <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" >
+ <?php the_post_thumbnail();?></a>
+ </div><!-- /.span2 -->
+ <div class="span6">
+ <?php the_excerpt();?>
+ </div><!-- /.span6 -->
+ </div><!-- /.row -->
+ <hr />
+ </div><!-- /.post_class -->
+ <?php endwhile; ?>
+ <?php endif; ?>
+ </div><!-- /.span8 -->
+ <?php get_sidebar('blog'); ?>
- <?php get_footer(); ?>
+ <?php get_footer(); ?>
View
434 css/bootstrap-responsive.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.0.1
+ * Bootstrap Responsive v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -18,54 +18,65 @@
.clearfix:after {
clear: both;
}
+.hide-text {
+ border: 0;
+ font: 0/0 a;
+ text-shadow: none;
+ color: transparent;
+ background-color: transparent;
+}
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
.hidden {
display: none;
visibility: hidden;
}
.visible-phone {
- display: none;
+ display: none !important;
}
.visible-tablet {
- display: none;
-}
-.visible-desktop {
- display: block;
-}
-.hidden-phone {
- display: block;
-}
-.hidden-tablet {
- display: block;
+ display: none !important;
}
.hidden-desktop {
- display: none;
+ display: none !important;
}
@media (max-width: 767px) {
.visible-phone {
- display: block;
+ display: inherit !important;
}
.hidden-phone {
- display: none;
+ display: none !important;
}
.hidden-desktop {
- display: block;
+ display: inherit !important;
}
.visible-desktop {
- display: none;
+ display: none !important;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.visible-tablet {
- display: block;
+ display: inherit !important;
}
.hidden-tablet {
- display: none;
+ display: none !important;
}
.hidden-desktop {
- display: block;
+ display: inherit !important;
}
.visible-desktop {
- display: none;
+ display: none !important ;
}
}
@media (max-width: 480px) {
@@ -76,34 +87,6 @@
display: block;
line-height: 18px;
}
- input[class*="span"],
- select[class*="span"],
- textarea[class*="span"],
- .uneditable-input {
- display: block;
- width: 100%;
- min-height: 28px;
- /* Make inputs at least the height of their button counterpart */
-
- /* Makes inputs behave like true block-level elements */
-
- -webkit-box-sizing: border-box;
- /* Older Webkit */
-
- -moz-box-sizing: border-box;
- /* Older FF */
-
- -ms-box-sizing: border-box;
- /* IE8 */
-
- box-sizing: border-box;
- /* CSS3 spec*/
-
- }
- .input-prepend input[class*="span"],
- .input-append input[class*="span"] {
- width: auto;
- }
input[type="checkbox"],
input[type="radio"] {
border: 1px solid #ccc;
@@ -148,10 +131,23 @@
padding-left: 20px;
padding-right: 20px;
}
- .navbar-fixed-top {
+ .navbar-fixed-top,
+ .navbar-fixed-bottom {
margin-left: -20px;
margin-right: -20px;
}
+ .container-fluid {
+ padding: 0;
+ }
+ .dl-horizontal dt {
+ float: none;
+ clear: none;
+ width: auto;
+ text-align: left;
+ }
+ .dl-horizontal dd {
+ margin-left: 0;
+ }
.container {
width: auto;
}
@@ -161,13 +157,36 @@
.row {
margin-left: 0;
}
- .row > [class*="span"],
- .row-fluid > [class*="span"] {
+ [class*="span"],
+ .row-fluid [class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
+ input[class*="span"],
+ select[class*="span"],
+ textarea[class*="span"],
+ .uneditable-input {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+ }
+ .input-prepend input,
+ .input-append input,
+ .input-prepend input[class*="span"],
+ .input-append input[class*="span"] {
+ display: inline-block;
+ width: auto;
+ }
}
@media (min-width: 768px) and (max-width: 979px) {
.row {
@@ -275,47 +294,58 @@
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
float: left;
margin-left: 2.762430939%;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
- .row-fluid > .span12 {
+ .row-fluid .span12 {
width: 99.999999993%;
}
- .row-fluid > .span11 {
+ .row-fluid .span11 {
width: 91.436464082%;
}
- .row-fluid > .span10 {
+ .row-fluid .span10 {
width: 82.87292817100001%;
}
- .row-fluid > .span9 {
+ .row-fluid .span9 {
width: 74.30939226%;
}
- .row-fluid > .span8 {
+ .row-fluid .span8 {
width: 65.74585634900001%;
}
- .row-fluid > .span7 {
+ .row-fluid .span7 {
width: 57.182320438000005%;
}
- .row-fluid > .span6 {
+ .row-fluid .span6 {
width: 48.618784527%;
}
- .row-fluid > .span5 {
+ .row-fluid .span5 {
width: 40.055248616%;
}
- .row-fluid > .span4 {
+ .row-fluid .span4 {
width: 31.491712705%;
}
- .row-fluid > .span3 {
+ .row-fluid .span3 {
width: 22.928176794%;
}
- .row-fluid > .span2 {
+ .row-fluid .span2 {
width: 14.364640883%;
}
- .row-fluid > .span1 {
+ .row-fluid .span1 {
width: 5.801104972%;
}
input,
@@ -360,120 +390,6 @@
width: 32px;
}
}
-@media (max-width: 979px) {
- body {
- padding-top: 0;
- }
- .navbar-fixed-top {
- position: static;
- margin-bottom: 18px;
- }
- .navbar-fixed-top .navbar-inner {
- padding: 5px;
- }
- .navbar .container {
- width: auto;
- padding: 0;
- }
- .navbar .brand {
- padding-left: 10px;
- padding-right: 10px;
- margin: 0 0 0 -5px;
- }
- .navbar .nav-collapse {
- clear: left;
- }
- .navbar .nav {
- float: none;
- margin: 0 0 9px;
- }
- .navbar .nav > li {
- float: none;
- }
- .navbar .nav > li > a {
- margin-bottom: 2px;
- }
- .navbar .nav > .divider-vertical {
- display: none;
- }
- .navbar .nav .nav-header {
- color: #999999;
- text-shadow: none;
- }
- .navbar .nav > li > a,
- .navbar .dropdown-menu a {
- padding: 6px 15px;
- font-weight: bold;
- color: #999999;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- }
- .navbar .dropdown-menu li + li a {
- margin-bottom: 2px;
- }
- .navbar .nav > li > a:hover,
- .navbar .dropdown-menu a:hover {
- background-color: #222222;
- }
- .navbar .dropdown-menu {
- position: static;
- top: auto;
- left: auto;
- float: none;
- display: block;
- max-width: none;
- margin: 0 15px;
- padding: 0;
- background-color: transparent;
- border: none;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
- }
- .navbar .dropdown-menu:before,
- .navbar .dropdown-menu:after {
- display: none;
- }
- .navbar .dropdown-menu .divider {
- display: none;
- }
- .navbar-form,
- .navbar-search {
- float: none;
- padding: 9px 15px;
- margin: 9px 0;
- border-top: 1px solid #222222;
- border-bottom: 1px solid #222222;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
- }
- .navbar .nav.pull-right {
- float: none;
- margin-left: 0;
- }
- .navbar-static .navbar-inner {
- padding-left: 10px;
- padding-right: 10px;
- }
- .btn-navbar {
- display: block;
- }
- .nav-collapse {
- overflow: hidden;
- height: 0;
- }
-}
-@media (min-width: 980px) {
- .nav-collapse.collapse {
- height: auto !important;
- overflow: visible !important;
- }
-}
@media (min-width: 1200px) {
.row {
margin-left: -30px;
@@ -580,47 +496,58 @@
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
float: left;
margin-left: 2.564102564%;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
- .row-fluid > .span12 {
+ .row-fluid .span12 {
width: 100%;
}
- .row-fluid > .span11 {
+ .row-fluid .span11 {
width: 91.45299145300001%;
}
- .row-fluid > .span10 {
+ .row-fluid .span10 {
width: 82.905982906%;
}
- .row-fluid > .span9 {
+ .row-fluid .span9 {
width: 74.358974359%;
}
- .row-fluid > .span8 {
+ .row-fluid .span8 {
width: 65.81196581200001%;
}
- .row-fluid > .span7 {
+ .row-fluid .span7 {
width: 57.264957265%;
}
- .row-fluid > .span6 {
+ .row-fluid .span6 {
width: 48.717948718%;
}
- .row-fluid > .span5 {
+ .row-fluid .span5 {
width: 40.170940171000005%;
}
- .row-fluid > .span4 {
+ .row-fluid .span4 {
width: 31.623931624%;
}
- .row-fluid > .span3 {
+ .row-fluid .span3 {
width: 23.076923077%;
}
- .row-fluid > .span2 {
+ .row-fluid .span2 {
width: 14.529914530000001%;
}
- .row-fluid > .span1 {
+ .row-fluid .span1 {
width: 5.982905983%;
}
input,
@@ -667,7 +594,122 @@
.thumbnails {
margin-left: -30px;
}
- .thumbnails > li {
- margin-left: 30px;
+ .row-fluid .thumbnails {
+ margin-left: 0;
+ }
+}
+@media (max-width: 979px) {
+ body {
+ padding-top: 0;
+ }
+ .navbar-fixed-top {
+ position: static;
+ margin-bottom: 18px;
+ }
+ .navbar-fixed-top .navbar-inner {
+ padding: 5px;
+ }
+ .navbar .container {
+ width: auto;
+ padding: 0;
+ }
+ .navbar .brand {
+ padding-left: 10px;
+ padding-right: 10px;
+ margin: 0 0 0 -5px;
+ }
+ .navbar .nav-collapse {
+ clear: left;
+ }
+ .navbar .nav {
+ float: none;
+ margin: 0 0 9px;
+ }
+ .navbar .nav > li {
+ float: none;
+ }
+ .navbar .nav > li > a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > .divider-vertical {
+ display: none;
+ }
+ .navbar .nav .nav-header {
+ color: #999999;
+ text-shadow: none;
+ }
+ .navbar .nav > li > a,
+ .navbar .dropdown-menu a {
+ padding: 6px 15px;
+ font-weight: bold;
+ color: #999999;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
+ }
+ .navbar .dropdown-menu li + li a {
+ margin-bottom: 2px;
+ }
+ .navbar .nav > li > a:hover,
+ .navbar .dropdown-menu a:hover {
+ background-color: #222222;
+ }
+ .navbar .dropdown-menu {
+ position: static;
+ top: auto;
+ left: auto;
+ float: none;
+ display: block;
+ max-width: none;
+ margin: 0 15px;
+ padding: 0;
+ background-color: transparent;
+ border: none;
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .navbar .dropdown-menu:before,
+ .navbar .dropdown-menu:after {
+ display: none;
+ }
+ .navbar .dropdown-menu .divider {
+ display: none;
+ }
+ .navbar-form,
+ .navbar-search {
+ float: none;
+ padding: 9px 15px;
+ margin: 9px 0;
+ border-top: 1px solid #222222;
+ border-bottom: 1px solid #222222;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+ }
+ .navbar .nav.pull-right {
+ float: none;
+ margin-left: 0;
+ }
+ .navbar-static .navbar-inner {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ .btn-navbar {
+ display: block;
+ }
+ .nav-collapse,
+ .nav-collapse.collapse {
+ overflow: hidden;
+ height: 0;
+ }
+}
+@media (min-width: 980px) {
+ .nav-collapse.collapse {
+ height: auto !important;
+ overflow: visible !important;
}
}
View
561 css/bootstrap.css
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.1
+ * Bootstrap v2.0.3
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -57,9 +57,10 @@ sub {
bottom: -0.25em;
}
img {
- height: auto;
+ max-width: 100%;
border: 0;
-ms-interpolation-mode: bicubic;
+ vertical-align: middle;
}
button,
input,
@@ -111,6 +112,26 @@ textarea {
.clearfix:after {
clear: both;
}
+.hide-text {
+ border: 0;
+ font: 0/0 a;
+ text-shadow: none;
+ color: transparent;
+ background-color: transparent;
+}
+.input-block-level {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
+}
body {
margin: 0;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -232,47 +253,58 @@ a:hover {
.row-fluid:after {
clear: both;
}
-.row-fluid > [class*="span"] {
+.row-fluid [class*="span"] {
+ display: block;
+ width: 100%;
+ min-height: 28px;
+ /* Make inputs at least the height of their button counterpart */
+
+ /* Makes inputs behave like true block-level elements */
+
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+ box-sizing: border-box;
float: left;
margin-left: 2.127659574%;
}
-.row-fluid > [class*="span"]:first-child {
+.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
-.row-fluid > .span12 {
+.row-fluid .span12 {
width: 99.99999998999999%;
}
-.row-fluid > .span11 {
+.row-fluid .span11 {
width: 91.489361693%;
}
-.row-fluid > .span10 {
+.row-fluid .span10 {
width: 82.97872339599999%;
}
-.row-fluid > .span9 {
+.row-fluid .span9 {
width: 74.468085099%;
}
-.row-fluid > .span8 {
+.row-fluid .span8 {
width: 65.95744680199999%;
}
-.row-fluid > .span7 {
+.row-fluid .span7 {
width: 57.446808505%;
}
-.row-fluid > .span6 {
+.row-fluid .span6 {
width: 48.93617020799999%;
}
-.row-fluid > .span5 {
+.row-fluid .span5 {
width: 40.425531911%;
}
-.row-fluid > .span4 {
+.row-fluid .span4 {
width: 31.914893614%;
}
-.row-fluid > .span3 {
+.row-fluid .span3 {
width: 23.404255317%;
}
-.row-fluid > .span2 {
+.row-fluid .span2 {
width: 14.89361702%;
}
-.row-fluid > .span1 {
+.row-fluid .span1 {
width: 6.382978723%;
}
.container {
@@ -426,6 +458,9 @@ dd {
margin-left: 9px;
}
.dl-horizontal dt {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
float: left;
clear: left;
width: 120px;
@@ -729,9 +764,9 @@ textarea {
input:focus,
textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
outline: 0;
outline: thin dotted \9;
/* IE6-9 */
@@ -769,7 +804,11 @@ select:focus {
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
-.uneditable-input {
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
float: none;
margin-left: 0;
}
@@ -917,7 +956,7 @@ select:focus:required:invalid:focus {
padding: 17px 20px 18px;
margin-top: 18px;
margin-bottom: 18px;
- background-color: #eeeeee;
+ background-color: #f5f5f5;
border-top: 1px solid #ddd;
*zoom: 1;
}
@@ -930,7 +969,6 @@ select:focus:required:invalid:focus {
clear: both;
}
.uneditable-input {
- display: block;
background-color: #ffffff;
border-color: #eee;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
@@ -964,18 +1002,6 @@ select:focus:required:invalid:focus {
.input-prepend,
.input-append {
margin-bottom: 5px;
- *zoom: 1;
-}
-.input-prepend:before,
-.input-append:before,
-.input-prepend:after,
-.input-append:after {
- display: table;
- content: "";
-}
-.input-prepend:after,
-.input-append:after {
- clear: both;
}
.input-prepend input,
.input-append input,
@@ -983,6 +1009,10 @@ select:focus:required:invalid:focus {
.input-append select,
.input-prepend .uneditable-input,
.input-append .uneditable-input {
+ position: relative;
+ margin-bottom: 0;
+ *margin-left: 0;
+ vertical-align: middle;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
@@ -993,7 +1023,6 @@ select:focus:required:invalid:focus {
.input-append select:focus,
.input-prepend .uneditable-input:focus,
.input-append .uneditable-input:focus {
- position: relative;
z-index: 2;
}
.input-prepend .uneditable-input,
@@ -1002,19 +1031,23 @@ select:focus:required:invalid:focus {
}
.input-prepend .add-on,
.input-append .add-on {
- float: left;
- display: block;
+ display: inline-block;
width: auto;
min-width: 16px;
height: 18px;
- margin-right: -1px;
padding: 4px 5px;
font-weight: normal;
line-height: 18px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
+ vertical-align: middle;
background-color: #eeeeee;
border: 1px solid #ccc;
+}
+.input-prepend .add-on,
+.input-append .add-on,
+.input-prepend .btn,
+.input-append .btn {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
@@ -1024,14 +1057,13 @@ select:focus:required:invalid:focus {
background-color: #a9dba9;
border-color: #46a546;
}
-.input-prepend .add-on {
- *margin-top: 1px;
- /* IE6-7 */
-
+.input-prepend .add-on,
+.input-prepend .btn {
+ margin-right: -1px;
}
.input-append input,
-.input-append select .uneditable-input {
- float: left;
+.input-append select,
+.input-append .uneditable-input {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
@@ -1040,22 +1072,41 @@ select:focus:required:invalid:focus {
border-left-color: #eee;
border-right-color: #ccc;
}
-.input-append .add-on {
- margin-right: 0;
+.input-append .add-on,
+.input-append .btn {
margin-left: -1px;
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
-.input-append input:first-child {
- *margin-left: -160px;
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+ -webkit-border-radius: 0;
+ -moz-border-radius: 0;
+ border-radius: 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+ margin-right: -1px;
+ -webkit-border-radius: 3px 0 0 3px;
+ -moz-border-radius: 3px 0 0 3px;
+ border-radius: 3px 0 0 3px;
}
-.input-append input:first-child + .add-on {
- *margin-left: -21px;
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+ margin-left: -1px;
+ -webkit-border-radius: 0 3px 3px 0;
+ -moz-border-radius: 0 3px 3px 0;
+ border-radius: 0 3px 3px 0;
}
.search-query {
padding-left: 14px;
padding-right: 14px;
+ padding-left: 4px \9;
+ /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+ padding-right: 4px \9;
margin-bottom: 0;
-webkit-border-radius: 14px;
-moz-border-radius: 14px;
@@ -1075,8 +1126,18 @@ select:focus:required:invalid:focus {
.form-horizontal .help-inline,
.form-search .uneditable-input,
.form-inline .uneditable-input,
-.form-horizontal .uneditable-input {
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
margin-bottom: 0;
}
.form-search .hide,
@@ -1085,18 +1146,14 @@ select:focus:required:invalid:focus {
display: none;
}
.form-search label,
-.form-inline label,
+.form-inline label {
+ display: inline-block;
+}
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
- display: inline-block;
-}
-.form-search .input-append .add-on,
-.form-search .input-prepend .add-on,
-.form-inline .input-append .add-on,
-.form-inline .input-prepend .add-on {
- vertical-align: middle;
+ margin-bottom: 0;
}
.form-search .radio,
.form-search .checkbox,
@@ -1141,6 +1198,14 @@ legend + .control-group {
}
.form-horizontal .controls {
margin-left: 160px;
+ /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */
+
+ *display: inline-block;
+ *margin-left: 0;
+ *padding-left: 20px;
+}
+.form-horizontal .controls:first-child {
+ *padding-left: 160px;
}
.form-horizontal .help-block {
margin-top: 9px;
@@ -1173,8 +1238,12 @@ table {
.table thead th {
vertical-align: bottom;
}
-.table thead:first-child tr th,
-.table thead:first-child tr td {
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
border-top: 0;
}
.table tbody + tbody {
@@ -1197,11 +1266,16 @@ table {
.table-bordered td {
border-left: 1px solid #dddddd;
}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
.table-bordered thead:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child th,
.table-bordered tbody:first-child tr:first-child td {
border-top: 0;
- border-bottom: 1px solid #dddddd;
}
.table-bordered thead:first-child tr:first-child th:first-child,
.table-bordered tbody:first-child tr:first-child td:first-child {
@@ -1734,6 +1808,7 @@ table .span24 {
.icon-resize-horizontal {
background-position: -456px -118px;
}
+.dropup,
.dropdown {
position: relative;
}
@@ -1748,22 +1823,20 @@ table .span24 {
display: inline-block;
width: 0;
height: 0;
- text-indent: -99999px;
- *text-indent: 0;
vertical-align: top;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #000000;
opacity: 0.3;
filter: alpha(opacity=30);
- content: "\2193";
+ content: "";
}
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
.dropdown:hover .caret,
-.open.dropdown .caret {
+.open .caret {
opacity: 1;
filter: alpha(opacity=100);
}
@@ -1776,16 +1849,14 @@ table .span24 {
display: none;
min-width: 160px;
padding: 4px 0;
- margin: 0;
+ margin: 1px 0 0;
list-style: none;
background-color: #ffffff;
- border-color: #ccc;
- border-color: rgba(0, 0, 0, 0.2);
- border-style: solid;
- border-width: 1px;
- -webkit-border-radius: 0 0 5px 5px;
- -moz-border-radius: 0 0 5px 5px;
- border-radius: 0 0 5px 5px;
+ border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
@@ -1824,15 +1895,10 @@ table .span24 {
text-decoration: none;
background-color: #0088cc;
}
-.dropdown.open {
+.open {
*z-index: 1000;
}
-.dropdown.open .dropdown-toggle {
- color: #ffffff;
- background: #ccc;
- background: rgba(0, 0, 0, 0.3);
-}
-.dropdown.open .dropdown-menu {
+.open .dropdown-menu {
display: block;
}
.pull-right .dropdown-menu {
@@ -1928,8 +1994,19 @@ table .span24 {
filter: alpha(opacity=40);
cursor: pointer;
}
+button.close {
+ padding: 0;
+ cursor: pointer;
+ background-color: transparent;
+ border: 0;
+ -webkit-appearance: none;
+}
.btn {
display: inline-block;
+ *display: inline;
+ /* IE7 inline-block hack */
+
+ *zoom: 1;
padding: 4px 10px 4px;
margin-bottom: 0;
font-size: 13px;
@@ -1949,17 +2026,24 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #e6e6e6;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
border: 1px solid #cccccc;
border-bottom-color: #b3b3b3;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
cursor: pointer;
*margin-left: .3em;
+ /* Remove the border to prevent IE7's black border on input:focus */
+
+ *border: 0;
+ *line-height: 20px;
}
.btn:hover,
.btn:active,
@@ -1967,6 +2051,7 @@ table .span24 {
.btn.disabled,
.btn[disabled] {
background-color: #e6e6e6;
+ *background-color: #d9d9d9;
}
.btn:active,
.btn.active {
@@ -1979,6 +2064,9 @@ table .span24 {
color: #333333;
text-decoration: none;
background-color: #e6e6e6;
+ *background-color: #d9d9d9;
+ /* Buttons in IE7 don't get borders, so darken on hover */
+
background-position: 0 -15px;
-webkit-transition: background-position 0.1s linear;
-moz-transition: background-position 0.1s linear;
@@ -1994,9 +2082,9 @@ table .span24 {
.btn.active,
.btn:active {
background-image: none;
- -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ -moz-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);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
outline: 0;
@@ -2071,7 +2159,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);
border-color: #0055cc #0055cc #003580;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #0055cc;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-primary:hover,
.btn-primary:active,
@@ -2079,6 +2170,7 @@ table .span24 {
.btn-primary.disabled,
.btn-primary[disabled] {
background-color: #0055cc;
+ *background-color: #004ab3;
}
.btn-primary:active,
.btn-primary.active {
@@ -2096,7 +2188,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
border-color: #f89406 #f89406 #ad6704;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #f89406;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-warning:hover,
.btn-warning:active,
@@ -2104,6 +2199,7 @@ table .span24 {
.btn-warning.disabled,
.btn-warning[disabled] {
background-color: #f89406;
+ *background-color: #df8505;
}
.btn-warning:active,
.btn-warning.active {
@@ -2121,7 +2217,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #bd362f;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-danger:hover,
.btn-danger:active,
@@ -2129,6 +2228,7 @@ table .span24 {
.btn-danger.disabled,
.btn-danger[disabled] {
background-color: #bd362f;
+ *background-color: #a9302a;
}
.btn-danger:active,
.btn-danger.active {
@@ -2146,7 +2246,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
border-color: #51a351 #51a351 #387038;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #51a351;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-success:hover,
.btn-success:active,
@@ -2154,6 +2257,7 @@ table .span24 {
.btn-success.disabled,
.btn-success[disabled] {
background-color: #51a351;
+ *background-color: #499249;
}
.btn-success:active,
.btn-success.active {
@@ -2171,7 +2275,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #2f96b4;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-info:hover,
.btn-info:active,
@@ -2179,6 +2286,7 @@ table .span24 {
.btn-info.disabled,
.btn-info[disabled] {
background-color: #2f96b4;
+ *background-color: #2a85a0;
}
.btn-info:active,
.btn-info.active {
@@ -2196,7 +2304,10 @@ table .span24 {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);
border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #222222;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
}
.btn-inverse:hover,
.btn-inverse:active,
@@ -2204,6 +2315,7 @@ table .span24 {
.btn-inverse.disabled,
.btn-inverse[disabled] {
background-color: #222222;
+ *background-color: #151515;
}
.btn-inverse:active,
.btn-inverse.active {
@@ -2229,6 +2341,11 @@ input[type="submit"].btn.btn-small {
*padding-top: 3px;
*padding-bottom: 3px;
}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+ *padding-top: 1px;
+ *padding-bottom: 1px;
+}
.btn-group {
position: relative;
*zoom: 1;
@@ -2259,7 +2376,7 @@ input[type="submit"].btn.btn-small {
*zoom: 1;
}
-.btn-group .btn {
+.btn-group > .btn {
position: relative;
float: left;
margin-left: -1px;
@@ -2267,7 +2384,7 @@ input[type="submit"].btn.btn-small {
-moz-border-radius: 0;
border-radius: 0;
}
-.btn-group .btn:first-child {
+.btn-group > .btn:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
@@ -2276,8 +2393,8 @@ input[type="submit"].btn.btn-small {
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
-.btn-group .btn:last-child,
-.btn-group .dropdown-toggle {
+.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;
@@ -2285,7 +2402,7 @@ input[type="submit"].btn.btn-small {
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
}
-.btn-group .btn.large:first-child {
+.btn-group > .btn.large:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px;
@@ -2294,8 +2411,8 @@ input[type="submit"].btn.btn-small {
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
}
-.btn-group .btn.large:last-child,
-.btn-group .large.dropdown-toggle {
+.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;
@@ -2303,48 +2420,65 @@ input[type="submit"].btn.btn-small {
-moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px;
}
-.btn-group .btn:hover,
-.btn-group .btn:focus,
-.btn-group .btn:active,
-.btn-group .btn.active {
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
z-index: 2;
}
.btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle {
outline: 0;
}
-.btn-group .dropdown-toggle {
+.btn-group > .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
- -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
- *padding-top: 5px;
- *padding-bottom: 5px;
+ -webkit-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);
+ -moz-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);
+ 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: 3px;
+ *padding-bottom: 3px;
}
-.btn-group .btn-mini.dropdown-toggle {
+.btn-group > .btn-mini.dropdown-toggle {
padding-left: 5px;
padding-right: 5px;
+ *padding-top: 1px;
+ *padding-bottom: 1px;
}
-.btn-group .btn-large.dropdown-toggle {
+.btn-group > .btn-small.dropdown-toggle {
+ *padding-top: 4px;
+ *padding-bottom: 4px;
+}
+.btn-group > .btn-large.dropdown-toggle {
padding-left: 12px;
padding-right: 12px;
}
-.btn-group.open {
- *z-index: 1000;
-}
-.btn-group.open .dropdown-menu {
- display: block;
- margin-top: 1px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
.btn-group.open .dropdown-toggle {
background-image: none;
- -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
- box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+ -moz-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);
+}
+.btn-group.open .btn.dropdown-toggle {
+ background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+ background-color: #0055cc;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+ background-color: #f89406;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+ background-color: #bd362f;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+ background-color: #51a351;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+ background-color: #2f96b4;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+ background-color: #222222;
}
.btn .caret {
margin-top: 7px;
@@ -2363,9 +2497,13 @@ input[type="submit"].btn.btn-small {
}
.btn-large .caret {
margin-top: 6px;
- border-left: 5px solid transparent;
- border-right: 5px solid transparent;
- border-top: 5px solid #000000;
+ border-left-width: 5px;
+ border-right-width: 5px;
+ border-top-width: 5px;
+}
+.dropup .btn-large .caret {
+ border-bottom: 5px solid #000000;
+ border-top: 0;
}
.btn-primary .caret,
.btn-warning .caret,
@@ -2437,6 +2575,9 @@ input[type="submit"].btn.btn-small {
text-decoration: none;
background-color: #eeeeee;
}
+.nav > .pull-right {
+ float: right;
+}
.nav .nav-header {
display: block;
padding: 3px 15px;
@@ -2583,10 +2724,10 @@ input[type="submit"].btn.btn-small {
.nav-pills.nav-stacked > li:last-child > a {
margin-bottom: 1px;
}
-.nav-tabs .dropdown-menu,
-.nav-pills .dropdown-menu {
- margin-top: 1px;
- border-width: 1px;
+.nav-tabs .dropdown-menu {
+ -webkit-border-radius: 0 0 5px 5px;
+ -moz-border-radius: 0 0 5px 5px;
+ border-radius: 0 0 5px 5px;
}
.nav-pills .dropdown-menu {
-webkit-border-radius: 4px;
@@ -2643,8 +2784,7 @@ input[type="submit"].btn.btn-small {
clear: both;
}
.tab-content {
- display: table;
- width: 100%;
+ overflow: auto;
}
.tabs-below .nav-tabs,
.tabs-right .nav-tabs,
@@ -2728,10 +2868,13 @@ input[type="submit"].btn.btn-small {
*border-left-color: #ffffff;
}
.navbar {
+ *position: relative;
+ *z-index: 2;
overflow: visible;
margin-bottom: 18px;
}
.navbar-inner {
+ min-height: 40px;
padding-left: 20px;
padding-right: 20px;
background-color: #2c2c2c;
@@ -2746,9 +2889,9 @@ input[type="submit"].btn.btn-small {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
- -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);
+ -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+ -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
+ box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
}
.navbar .container {
width: auto;
@@ -2770,10 +2913,13 @@ input[type="submit"].btn.btn-small {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
- -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
- -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
- box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ *background-color: #222222;
+ /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+ -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
}
.btn-navbar:hover,
.btn-navbar:active,
@@ -2781,6 +2927,7 @@ input[type="submit"].btn.btn-small {
.btn-navbar.disabled,
.btn-navbar[disabled] {
background-color: #222222;
+ *background-color: #151515;
}
.btn-navbar:active,
.btn-navbar.active {
@@ -2818,12 +2965,18 @@ input[type="submit"].btn.btn-small {
font-size: 20px;
font-weight: 200;
line-height: 1;
- color: #ffffff;
+ color: #999999;
}
.navbar .navbar-text {
margin-bottom: 0;
line-height: 40px;
}
+.navbar .navbar-link {
+ color: #999999;
+}
+.navbar .navbar-link:hover {
+ color: #ffffff;
+}
.navbar .btn,
.navbar .btn-group {
margin-top: 5px;
@@ -2883,9 +3036,9 @@ input[type="submit"].btn.btn-small {
color: #ffffff;
background-color: #626262;
border: 1px solid #151515;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+ -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
+ -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
+ box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
@@ -2952,7 +3105,7 @@ input[type="submit"].btn.btn-small {
}
.navbar .nav > li > a {
float: none;
- padding: 10px 10px 11px;
+ padding: 9px 10px 11px;
line-height: 19px;
color: #999999;
text-decoration: none;
@@ -2981,12 +3134,6 @@ input[type="submit"].btn.btn-small {
margin-left: 10px;
margin-right: 0;
}
-.navbar .dropdown-menu {
- margin-top: 1px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- border-radius: 4px;
-}
.navbar .dropdown-menu:before {
content: '';
display: inline-block;
@@ -3022,7 +3169,7 @@ input[type="submit"].btn.btn-small {
top: auto;
}
.navbar .nav .dropdown-toggle .caret,
-.navbar .nav .open.dropdown .caret {
+.navbar .nav .open .caret {
border-top-color: #ffffff;
border-bottom-color: #ffffff;
}
@@ -3299,6 +3446,9 @@ input[type="submit"].btn.btn-small {
margin-left: 5px;
margin-bottom: 0;
}
+.modal-footer .btn-group .btn + .btn {
+ margin-left: -1px;
+}
.tooltip {
position: absolute;
z-index: 1020;
@@ -3480,9 +3630,11 @@ input[type="submit"].btn.btn-small {
.thumbnails:after {
clear: both;
}
+.row-fluid .thumbnails {
+ margin-left: 0;
+}
.thumbnails > li {
- float: left;
- margin: 0 0 18px 20px;
+ margin-bottom: 18px;
}
.thumbnail {
display: block;
@@ -3511,117 +3663,101 @@ a.thumbnail:hover {
.thumbnail .caption {
padding: 9px;
}
-.label {
- padding: 1px 4px 2px;
+.label,
+.badge {
font-size: 10.998px;
font-weight: bold;
- line-height: 13px;
+ line-height: 14px;
color: #ffffff;
+ vertical-align: middle;
white-space: nowrap;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #999999;
+}
+.label {
+ padding: 1px 4px 2px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
-.label:hover {
- color: #ffffff;
- text-decoration: none;
-}
-.label-important {
- background-color: #b94a48;
-}
-.label-important:hover {
- background-color: #953b39;
-}
-.label-warning {
- background-color: #f89406;
-}
-.label-warning:hover {
- background-color: #c67605;
-}
-.label-success {
- background-color: #468847;
-}
-.label-success:hover {
- background-color: #356635;
-}
-.label-info {
- background-color: #3a87ad;
-}
-.label-info:hover {
- background-color: #2d6987;
-}
-.label-inverse {
- background-color: #333333;
-}
-.label-inverse:hover {
- background-color: #1a1a1a;
-}
.badge {
padding: 1px 9px 2px;
- font-size: 12.025px;
- font-weight: bold;
- white-space: nowrap;
- color: #ffffff;
- background-color: #999999;
-webkit-border-radius: 9px;
-moz-border-radius: 9px;
border-radius: 9px;
}
-.badge:hover {
+a.label:hover,
+a.badge:hover {
color: #ffffff;
text-decoration: none;
cursor: pointer;
}
-.badge-error {
+.label-important,
+.badge-important {
background-color: #b94a48;
}
-.badge-error:hover {
+.label-important[href],
+.badge-important[href] {
background-color: #953b39;
}
+.label-warning,
.badge-warning {
background-color: #f89406;
}
-.badge-warning:hover {
+.label-warning[href],
+.badge-warning[href] {
background-color: #c67605;
}
+.label-success,
.badge-success {
background-color: #468847;
}
-.badge-success:hover {
+.label-success[href],
+.badge-success[href] {
background-color: #356635;
}
+.label-info,
.badge-info {
background-color: #3a87ad;
}
-.badge-info:hover {
+.label-info[href],
+.badge-info[href] {
background-color: #2d6987;
}
+.label-inverse,
.badge-inverse {
background-color: #333333;
}
-.badge-inverse:hover {
+.label-inverse[href],
+.badge-inverse[href] {
background-color: #1a1a1a;
}
@-webkit-keyframes progress-bar-stripes {
from {
- background-position: 0 0;
+ background-position: 40px 0;
}
to {