Permalink
Browse files

2.2.0

  • Loading branch information...
1 parent add0b80 commit a87da664ad72017361424f0c274c641c3b9d09c2 @mdo mdo committed Oct 30, 2012
Showing with 2,908 additions and 803 deletions.
  1. BIN assets/bootstrap.zip
  2. +29 −2 assets/css/bootstrap-responsive.css
  3. +377 −258 assets/css/bootstrap.css
  4. +22 −8 assets/css/docs.css
  5. BIN assets/img/example-sites/8020select.png
  6. BIN assets/img/example-sites/adoptahydrant.png
  7. BIN assets/img/example-sites/breakingnews.png
  8. BIN assets/img/example-sites/gathercontent.png
  9. BIN assets/img/example-sites/kippt.png
  10. BIN assets/img/examples/bootstrap-example-carousel.png
  11. BIN assets/img/examples/bootstrap-example-marketing-narrow.png
  12. BIN assets/img/examples/bootstrap-example-signin.png
  13. BIN assets/img/examples/bootstrap-example-sticky-footer.png
  14. BIN assets/img/examples/browser-icon-chrome.png
  15. BIN assets/img/examples/browser-icon-firefox.png
  16. BIN assets/img/examples/browser-icon-safari.png
  17. BIN assets/img/examples/slide-01.jpg
  18. BIN assets/img/examples/slide-02.jpg
  19. BIN assets/img/examples/slide-03.jpg
  20. +4 −2 assets/js/bootstrap-affix.js
  21. +2 −4 assets/js/bootstrap-alert.js
  22. +5 −7 assets/js/bootstrap-button.js
  23. +12 −12 assets/js/bootstrap-carousel.js
  24. +9 −11 assets/js/bootstrap-collapse.js
  25. +9 −11 assets/js/bootstrap-dropdown.js
  26. +20 −25 assets/js/bootstrap-modal.js
  27. +1 −1 assets/js/bootstrap-popover.js
  28. +1 −1 assets/js/bootstrap-scrollspy.js
  29. +5 −7 assets/js/bootstrap-tab.js
  30. +12 −11 assets/js/bootstrap-tooltip.js
  31. +5 −5 assets/js/bootstrap-transition.js
  32. +19 −9 assets/js/bootstrap-typeahead.js
  33. +105 −107 assets/js/bootstrap.js
  34. +2 −2 assets/js/bootstrap.min.js
  35. +2 −4 assets/js/jquery.js
  36. +176 −40 base-css.html
  37. +1 −1 build/index.js
  38. +304 −41 components.html
  39. +41 −8 customize.html
  40. +442 −0 examples/carousel.html
  41. +2 −2 examples/fluid.html
  42. +2 −2 examples/hero.html
  43. +172 −0 examples/marketing-alternate.html
  44. +137 −0 examples/marketing-narrow.html
  45. +94 −0 examples/signin.html
  46. +2 −2 examples/starter-template.html
  47. +124 −0 examples/sticky-footer.html
  48. +22 −20 extend.html
  49. +51 −20 getting-started.html
  50. +27 −14 index.html
  51. +41 −23 javascript.html
  52. +14 −12 scaffolding.html
  53. +8 −6 templates/layout.mustache
  54. +167 −33 templates/pages/base-css.mustache
  55. +296 −35 templates/pages/components.mustache
  56. +32 −1 templates/pages/customize.mustache
  57. +13 −13 templates/pages/extend.mustache
  58. +42 −13 templates/pages/getting-started.mustache
  59. +20 −9 templates/pages/index.mustache
  60. +32 −16 templates/pages/javascript.mustache
  61. +5 −5 templates/pages/scaffolding.mustache
View
Binary file not shown.
@@ -1,5 +1,5 @@
/*!
- * Bootstrap Responsive v2.1.1
+ * Bootstrap Responsive v2.2.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -215,6 +215,9 @@
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.564102564102564%;
+ }
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
@@ -562,6 +565,9 @@
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
+ .row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.7624309392265194%;
+ }
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
@@ -814,6 +820,7 @@
margin-left: 0;
}
[class*="span"],
+ .uneditable-input[class*="span"],
.row-fluid [class*="span"] {
display: block;
float: none;
@@ -830,6 +837,9 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
+ .row-fluid [class*="offset"]:first-child {
+ margin-left: 0;
+ }
.input-large,
.input-xlarge,
.input-xxlarge,
@@ -862,8 +872,11 @@
width: auto;
margin: 0;
}
+ .modal.fade {
+ top: -100px;
+ }
.modal.fade.in {
- top: auto;
+ top: 20px;
}
}
@@ -895,6 +908,16 @@
padding-right: 10px;
padding-left: 10px;
}
+ .media .pull-left,
+ .media .pull-right {
+ display: block;
+ float: none;
+ margin-bottom: 10px;
+ }
+ .media-object {
+ margin-right: 0;
+ margin-left: 0;
+ }
.modal {
top: 10px;
right: 10px;
@@ -979,6 +1002,10 @@
.nav-collapse .dropdown-menu a:hover {
background-color: #f2f2f2;
}
+ .navbar-inverse .nav-collapse .nav > li > a,
+ .navbar-inverse .nav-collapse .dropdown-menu a {
+ color: #999999;
+ }
.navbar-inverse .nav-collapse .nav > li > a:hover,
.navbar-inverse .nav-collapse .dropdown-menu a:hover {
background-color: #111111;
Oops, something went wrong.

0 comments on commit a87da66

Please sign in to comment.