Permalink
Browse files

refs #337 - upgraded bootstrap to 2.2.2

  • Loading branch information...
n1k0 committed Dec 28, 2012
1 parent 058396e commit 18b8cbb5335073eaf0d1cd9a7c1f1634e394aa4b
Showing with 6,723 additions and 2,020 deletions.
  1. +6 −6 api.html
  2. BIN bootstrap/img/glyphicons-halflings.png
  3. +1 −1 bootstrap/js/bootstrap.min.js
  4. +4 −3 bootstrap/less/accordion.less
  5. +31 −10 bootstrap/less/alerts.less
  6. +2 −1 bootstrap/less/bootstrap.less
  7. +13 −13 bootstrap/less/breadcrumbs.less
  8. +88 −52 bootstrap/less/button-groups.less
  9. +114 −75 bootstrap/less/buttons.less
  10. +28 −18 bootstrap/less/carousel.less
  11. +4 −2 bootstrap/less/close.less
  12. +10 −6 bootstrap/less/code.less
  13. +4 −2 bootstrap/less/component-animations.less
  14. +108 −18 bootstrap/less/dropdowns.less
  15. +171 −67 bootstrap/less/forms.less
  16. +17 −1 bootstrap/less/grid.less
  17. +10 −7 bootstrap/less/hero-unit.less
  18. +31 −4 bootstrap/less/labels-badges.less
  19. +1 −2 bootstrap/less/layouts.less
  20. +55 −0 bootstrap/less/media.less
  21. +116 −76 bootstrap/less/mixins.less
  22. +19 −14 bootstrap/less/modals.less
  23. +260 −128 bootstrap/less/navbar.less
  24. +47 −19 bootstrap/less/navs.less
  25. +15 −10 bootstrap/less/pager.less
  26. +90 −25 bootstrap/less/pagination.less
  27. +115 −35 bootstrap/less/popovers.less
  28. +19 −14 bootstrap/less/progress-bars.less
  29. +96 −11 bootstrap/less/reset.less
  30. +9 −7 bootstrap/less/responsive-1200px-min.less
  31. +114 −70 bootstrap/less/responsive-767px-max.less
  32. +7 −5 bootstrap/less/responsive-768px-979px.less
  33. +40 −8 bootstrap/less/responsive-navbar.less
  34. +17 −15 bootstrap/less/responsive-utilities.less
  35. +14 −5 bootstrap/less/responsive.less
  36. +27 −4 bootstrap/less/scaffolding.less
  37. +21 −19 bootstrap/less/sprites.less
  38. +122 −61 bootstrap/less/tables.less
  39. +139 −0 bootstrap/less/tests/buttons.html
  40. +139 −0 bootstrap/less/tests/css-tests.css
  41. +1,345 −0 bootstrap/less/tests/css-tests.html
  42. +71 −0 bootstrap/less/tests/forms-responsive.html
  43. +179 −0 bootstrap/less/tests/forms.html
  44. +104 −0 bootstrap/less/tests/navbar-fixed-top.html
  45. +107 −0 bootstrap/less/tests/navbar-static-top.html
  46. +107 −0 bootstrap/less/tests/navbar.html
  47. +10 −5 bootstrap/less/thumbnails.less
  48. +48 −13 bootstrap/less/tooltip.less
  49. +90 −87 bootstrap/less/type.less
  50. +9 −2 bootstrap/less/utilities.less
  51. +126 −31 bootstrap/less/variables.less
  52. +10 −8 bootstrap/less/wells.less
  53. +6 −6 cli.html
  54. +2,176 −971 css/casper.css
  55. +6 −6 debugging.html
  56. +6 −6 events-filters.html
  57. +6 −6 extending.html
  58. +6 −6 faq.html
  59. +6 −6 index.html
  60. +6 −6 installation.html
  61. +41 −0 less/casper.less
  62. +110 −23 less/variables.less
  63. +6 −6 logging.html
  64. +6 −6 quickstart.html
  65. +6 −6 selectors.html
  66. +6 −6 testing.html
View
@@ -9,8 +9,8 @@
<meta name="description" content="CasperJS is a browser navigation scripting &amp; testing utility written in Javascript on top of PhantomJS.">
<meta name="google-site-verification" content="SEcGmVv4IsGYP6-xMJquQcrUrYjIZNXyX0VGfly2m1o">
<link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Asap:400,700,400italic,700italic&amp;subset=latin,latin-ext">
- <link rel="stylesheet" href="prettify/prettify.css?1356334815362">
- <link rel="stylesheet" href="css/casper.css?1356334815362">
+ <link rel="stylesheet" href="prettify/prettify.css?1356731246865">
+ <link rel="stylesheet" href="css/casper.css?1356731246865">
<link rel="shortcut icon" href="favicon.ico">
</head>
<body>
@@ -3048,10 +3048,10 @@ <h4>The <code>utils</code> module</h4>
</p>
</footer>
</div>
- <script type="text/javascript" src="js/jquery.min.js?1356334815362"></script>
- <script type="text/javascript" src="bootstrap/js/bootstrap.min.js?1356334815362"></script>
- <script type="text/javascript" src="prettify/prettify.js?1356334815362"></script>
- <script type="text/javascript" src="js/application.js?1356334815362"></script>
+ <script type="text/javascript" src="js/jquery.min.js?1356731246865"></script>
+ <script type="text/javascript" src="bootstrap/js/bootstrap.min.js?1356731246865"></script>
+ <script type="text/javascript" src="prettify/prettify.js?1356731246865"></script>
+ <script type="text/javascript" src="js/application.js?1356731246865"></script>
<script type="text/javascript">
(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,5 +1,6 @@
-// ACCORDION
-// ---------
+//
+// Accordion
+// --------------------------------------------------
// Parent container
@@ -11,7 +12,7 @@
.accordion-group {
margin-bottom: 2px;
border: 1px solid #e5e5e5;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
}
.accordion-heading {
border-bottom: 0;
View
@@ -1,34 +1,46 @@
-// ALERT STYLES
-// ------------
+//
+// Alerts
+// --------------------------------------------------
+
+
+// Base styles
+// -------------------------
-// Base alert styles
.alert {
padding: 8px 35px 8px 14px;
margin-bottom: @baseLineHeight;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
background-color: @warningBackground;
border: 1px solid @warningBorder;
- .border-radius(4px);
+ .border-radius(@baseBorderRadius);
+}
+.alert,
+.alert h4 {
+ // Specified for the h4 to prevent conflicts of changing @headingsColor
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-success h4 {
color: @successText;
}
.alert-danger,
@@ -37,14 +49,23 @@
border-color: @errorBorder;
color: @errorText;
}
+.alert-danger h4,
+.alert-error h4 {
+ color: @errorText;
+}
.alert-info {
background-color: @infoBackground;
border-color: @infoBorder;
color: @infoText;
}
+.alert-info h4 {
+ color: @infoText;
+}
+
// Block alerts
-// ------------------------
+// -------------------------
+
.alert-block {
padding-top: 14px;
padding-bottom: 14px;
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.0.4
+ * Bootstrap v2.2.2
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -52,6 +52,7 @@
// Components: Misc
@import "thumbnails.less";
+@import "media.less";
@import "labels-badges.less";
@import "progress-bars.less";
@import "accordion.less";
@@ -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);
- li {
+ background-color: #f5f5f5;
+ .border-radius(@baseBorderRadius);
+ > li {
display: inline-block;
.ie7-inline-block();
text-shadow: 0 1px 0 @white;
+ > .divider {
+ padding: 0 5px;
+ color: #ccc;
+ }
}
- .divider {
- padding: 0 5px;
+ > .active {
color: @grayLight;
}
- .active a {
- color: @grayDark;
- }
}
Oops, something went wrong.

0 comments on commit 18b8cbb

Please sign in to comment.