bootstrap-sass 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (36) hide show
  1. data/README.md +4 -1
  2. data/vendor/assets/javascripts/bootstrap-alert.js +8 -5
  3. data/vendor/assets/javascripts/bootstrap-button.js +3 -3
  4. data/vendor/assets/javascripts/bootstrap-carousel.js +5 -2
  5. data/vendor/assets/javascripts/bootstrap-collapse.js +2 -2
  6. data/vendor/assets/javascripts/bootstrap-dropdown.js +2 -2
  7. data/vendor/assets/javascripts/bootstrap-modal.js +6 -5
  8. data/vendor/assets/javascripts/bootstrap-popover.js +2 -2
  9. data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
  10. data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
  11. data/vendor/assets/javascripts/bootstrap-tooltip.js +2 -2
  12. data/vendor/assets/javascripts/bootstrap-transition.js +3 -3
  13. data/vendor/assets/javascripts/bootstrap-typeahead.js +2 -2
  14. data/vendor/assets/stylesheets/_bootstrap-responsive.scss +9 -5
  15. data/vendor/assets/stylesheets/_bootstrap.scss +1 -1
  16. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +1 -1
  17. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +4 -4
  18. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +23 -9
  19. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +3 -3
  20. data/vendor/assets/stylesheets/bootstrap/_close.scss +3 -3
  21. data/vendor/assets/stylesheets/bootstrap/_code.scss +13 -0
  22. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +4 -5
  23. data/vendor/assets/stylesheets/bootstrap/_forms.scss +42 -37
  24. data/vendor/assets/stylesheets/bootstrap/_labels.scss +23 -7
  25. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +62 -11
  26. data/vendor/assets/stylesheets/bootstrap/_modals.scss +13 -2
  27. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +12 -6
  28. data/vendor/assets/stylesheets/bootstrap/_navs.scss +24 -15
  29. data/vendor/assets/stylesheets/bootstrap/_reset.scss +1 -1
  30. data/vendor/assets/stylesheets/bootstrap/_sprites.scss +4 -3
  31. data/vendor/assets/stylesheets/bootstrap/_tables.scss +12 -3
  32. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +2 -2
  33. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +2 -2
  34. data/vendor/assets/stylesheets/bootstrap/_type.scss +2 -2
  35. data/vendor/assets/stylesheets/bootstrap/_variables.scss +6 -2
  36. metadata +7 -7
data/README.md CHANGED
@@ -4,6 +4,9 @@
4
4
 
5
5
  Enjoy.
6
6
 
7
+ ## Updating
8
+ Updating your application to a new version of `bootstrap-sass`? See [our changelog](https://github.com/thomas-mcdonald/bootstrap-sass/blob/master/CHANGELOG.md), [Bootstrap's changelog](https://github.com/twitter/bootstrap/wiki/Changelog), and this [guide to updating to Bootstrap 2.0](http://twitter.github.com/bootstrap/upgrading.html)
9
+
7
10
  ## Usage
8
11
 
9
12
  ### Rails
@@ -11,7 +14,7 @@ Enjoy.
11
14
  In your Gemfile:
12
15
 
13
16
  gem 'sass-rails', '~> 3.1'
14
- gem 'bootstrap-sass', '~> 2.0.0'
17
+ gem 'bootstrap-sass', '~> 2.0.1'
15
18
 
16
19
  **Note**: previous versions of bootstrap-sass automatically required sass-rails. This is no longer the case, and you will *need* to require it in your Gemfile.
17
20
 
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-alert.js v2.0.0
2
+ * bootstrap-alert.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#alerts
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -51,11 +51,14 @@
51
51
 
52
52
  $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
53
53
 
54
- $parent.removeClass('in')
54
+ $parent
55
+ .trigger('close')
56
+ .removeClass('in')
55
57
 
56
58
  function removeElement() {
57
- $parent.remove()
58
- $parent.trigger('closed')
59
+ $parent
60
+ .trigger('closed')
61
+ .remove()
59
62
  }
60
63
 
61
64
  $.support.transition && $parent.hasClass('fade') ?
@@ -88,4 +91,4 @@
88
91
  $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
89
92
  })
90
93
 
91
- }( window.jQuery )
94
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-button.js v2.0.0
2
+ * bootstrap-button.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#buttons
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -91,8 +91,8 @@
91
91
 
92
92
  $(function () {
93
93
  $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) {
94
- $(e.target).button('toggle')
94
+ $(e.currentTarget).button('toggle')
95
95
  })
96
96
  })
97
97
 
98
- }( window.jQuery )
98
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ==========================================================
2
- * bootstrap-carousel.js v2.0.0
2
+ * bootstrap-carousel.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#carousel
4
4
  * ==========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -61,6 +61,7 @@
61
61
 
62
62
  , pause: function () {
63
63
  clearInterval(this.interval)
64
+ this.interval = null
64
65
  return this
65
66
  }
66
67
 
@@ -82,6 +83,8 @@
82
83
  , fallback = type == 'next' ? 'first' : 'last'
83
84
  , that = this
84
85
 
86
+ if (!$next.length) return
87
+
85
88
  this.sliding = true
86
89
 
87
90
  isCycling && this.pause()
@@ -151,4 +154,4 @@
151
154
  })
152
155
  })
153
156
 
154
- }( window.jQuery )
157
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-collapse.js v2.0.0
2
+ * bootstrap-collapse.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#collapse
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -133,4 +133,4 @@
133
133
  })
134
134
  })
135
135
 
136
- }( window.jQuery )
136
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ============================================================
2
- * bootstrap-dropdown.js v2.0.0
2
+ * bootstrap-dropdown.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
4
4
  * ============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -89,4 +89,4 @@
89
89
  $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
90
90
  })
91
91
 
92
- }( window.jQuery )
92
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* =========================================================
2
- * bootstrap-modal.js v2.0.0
2
+ * bootstrap-modal.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#modals
4
4
  * =========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -26,7 +26,7 @@
26
26
  * ====================== */
27
27
 
28
28
  var Modal = function ( content, options ) {
29
- this.options = $.extend({}, $.fn.modal.defaults, options)
29
+ this.options = options
30
30
  this.$element = $(content)
31
31
  .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
32
32
  }
@@ -177,16 +177,17 @@
177
177
  return this.each(function () {
178
178
  var $this = $(this)
179
179
  , data = $this.data('modal')
180
- , options = typeof option == 'object' && option
180
+ , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
181
181
  if (!data) $this.data('modal', (data = new Modal(this, options)))
182
182
  if (typeof option == 'string') data[option]()
183
- else data.show()
183
+ else if (options.show) data.show()
184
184
  })
185
185
  }
186
186
 
187
187
  $.fn.modal.defaults = {
188
188
  backdrop: true
189
189
  , keyboard: true
190
+ , show: true
190
191
  }
191
192
 
192
193
  $.fn.modal.Constructor = Modal
@@ -206,4 +207,4 @@
206
207
  })
207
208
  })
208
209
 
209
- }( window.jQuery )
210
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-popover.js v2.0.0
2
+ * bootstrap-popover.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#popovers
4
4
  * ===========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -92,4 +92,4 @@
92
92
  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
93
93
  })
94
94
 
95
- }( window.jQuery )
95
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-scrollspy.js v2.0.0
2
+ * bootstrap-scrollspy.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#scrollspy
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -122,4 +122,4 @@
122
122
  })
123
123
  })
124
124
 
125
- }( window.jQuery )
125
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ========================================================
2
- * bootstrap-tab.js v2.0.0
2
+ * bootstrap-tab.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
4
4
  * ========================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -127,4 +127,4 @@
127
127
  })
128
128
  })
129
129
 
130
- }( window.jQuery )
130
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ===========================================================
2
- * bootstrap-tooltip.js v2.0.0
2
+ * bootstrap-tooltip.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#tooltips
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ===========================================================
@@ -267,4 +267,4 @@
267
267
  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
268
268
  }
269
269
 
270
- }( window.jQuery )
270
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* ===================================================
2
- * bootstrap-transition.js v2.0.0
2
+ * bootstrap-transition.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#transitions
4
4
  * ===================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -47,5 +47,5 @@
47
47
  })()
48
48
 
49
49
  })
50
-
51
- }( window.jQuery )
50
+
51
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /* =============================================================
2
- * bootstrap-typeahead.js v2.0.0
2
+ * bootstrap-typeahead.js v2.0.1
3
3
  * http://twitter.github.com/bootstrap/javascript.html#typeahead
4
4
  * =============================================================
5
5
  * Copyright 2012 Twitter, Inc.
@@ -268,4 +268,4 @@
268
268
  })
269
269
  })
270
270
 
271
- }( window.jQuery )
271
+ }( window.jQuery );
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.0.0
2
+ * Bootstrap Responsive v2.0.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -54,7 +54,7 @@
54
54
  input[class*="span"], select[class*="span"], textarea[class*="span"], .uneditable-input {
55
55
  display: block;
56
56
  width: 100%;
57
- height: 28px; /* Make inputs at least the height of their button counterpart */
57
+ min-height: 28px; /* Make inputs at least the height of their button counterpart */
58
58
  /* Makes inputs behave like true block-level elements */
59
59
  -webkit-box-sizing: border-box; /* Older Webkit */
60
60
  -moz-box-sizing: border-box; /* Older FF */
@@ -119,7 +119,7 @@
119
119
  // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET
120
120
  // --------------------------------------------------
121
121
 
122
- @media (max-width: 768px) {
122
+ @media (max-width: 767px) {
123
123
  // GRID & CONTAINERS
124
124
  // -----------------
125
125
  // Remove width from containers
@@ -149,7 +149,7 @@
149
149
  // PORTRAIT TABLET TO DEFAULT DESKTOP
150
150
  // ----------------------------------
151
151
 
152
- @media (min-width: 768px) and (max-width: 980px) {
152
+ @media (min-width: 768px) and (max-width: 979px) {
153
153
 
154
154
  // Fixed grid
155
155
  @include gridSystemGenerate(12, 42px, 20px);
@@ -166,7 +166,7 @@
166
166
 
167
167
  // TABLETS AND BELOW
168
168
  // -----------------
169
- @media (max-width: 980px) {
169
+ @media (max-width: 979px) {
170
170
 
171
171
  // UNFIX THE TOPBAR
172
172
  // ----------------
@@ -210,6 +210,10 @@
210
210
  .navbar .nav > .divider-vertical {
211
211
  display: none;
212
212
  }
213
+ .navbar .nav .nav-header {
214
+ color: $navbarText;
215
+ text-shadow: none;
216
+ }
213
217
  // Nav and dropdown links in navbar
214
218
  .navbar .nav > li > a, .navbar .dropdown-menu a {
215
219
  padding: 6px 15px;
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap 2.0.0
2
+ * Bootstrap 2.0.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -9,7 +9,7 @@
9
9
  @include border-radius(3px);
10
10
  @include box-shadow(inset 0 1px 0 $white);
11
11
  li {
12
- display: inline;
12
+ display: inline-block;
13
13
  text-shadow: 0 1px 0 $white;
14
14
  }
15
15
  .divider {
@@ -118,19 +118,19 @@
118
118
  margin-left: 0;
119
119
  }
120
120
  .btn:hover .caret, .open.btn-group .caret {
121
- @include opacity(100);
121
+ @include opacity(1);
122
122
  }
123
123
 
124
124
 
125
125
  // Account for other colors
126
- .btn-primary, .btn-danger, .btn-info, .btn-success {
126
+ .btn-primary, .btn-danger, .btn-info, .btn-success, .btn-inverse {
127
127
  .caret {
128
128
  border-top-color: $white;
129
- @include opacity(75);
129
+ @include opacity(0.75);
130
130
  }
131
131
  }
132
132
 
133
133
  // Small button dropdowns
134
134
  .btn-small .caret {
135
135
  margin-top: 4px;
136
- }
136
+ }
@@ -9,12 +9,14 @@
9
9
  .btn {
10
10
  display: inline-block;
11
11
  padding: 4px 10px 4px;
12
+ margin-bottom: 0; // For input.btn
12
13
  font-size: $baseFontSize;
13
14
  line-height: $baseLineHeight;
14
15
  color: $grayDark;
15
16
  text-align: center;
16
17
  text-shadow: 0 1px 1px rgba(255,255,255,.75);
17
- @include gradient-vertical-three-colors($white, $white, 25%, darken($white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
18
+ vertical-align: middle;
19
+ @include buttonBackground($white, darken($white, 10%));
18
20
  border: 1px solid #ccc;
19
21
  border-bottom-color: #bbb;
20
22
  @include border-radius(4px);
@@ -23,6 +25,7 @@
23
25
  cursor: pointer;
24
26
 
25
27
  // Give IE7 some love
28
+ @include reset-filter();
26
29
  @include ie7-restore-left-whitespace();
27
30
  }
28
31
 
@@ -50,7 +53,6 @@
50
53
  @include box-shadow($shadow);
51
54
  background-color: darken($white, 10%);
52
55
  background-color: darken($white, 15%) \9;
53
- color: rgba(0,0,0,.5);
54
56
  outline: 0;
55
57
  }
56
58
 
@@ -59,7 +61,7 @@
59
61
  cursor: default;
60
62
  background-image: none;
61
63
  background-color: darken($white, 10%);
62
- @include opacity(65);
64
+ @include opacity(0.65);
63
65
  @include box-shadow(none);
64
66
  }
65
67
 
@@ -74,7 +76,7 @@
74
76
  line-height: normal;
75
77
  @include border-radius(5px);
76
78
  }
77
- .btn-large .icon {
79
+ .btn-large [class^="icon-"] {
78
80
  margin-top: 1px;
79
81
  }
80
82
 
@@ -84,22 +86,29 @@
84
86
  font-size: $baseFontSize - 2px;
85
87
  line-height: $baseLineHeight - 2px;
86
88
  }
87
- .btn-small .icon {
89
+ .btn-small [class^="icon-"] {
88
90
  margin-top: -1px;
89
91
  }
90
92
 
93
+ // Mini
94
+ .btn-mini {
95
+ padding: 2px 6px;
96
+ font-size: $baseFontSize - 2px;
97
+ line-height: $baseLineHeight - 4px;
98
+ }
99
+
91
100
 
92
101
  // Alternate buttons
93
102
  // --------------------------------------------------
94
103
 
95
104
  // Set text color
96
105
  // -------------------------
97
- .btn-primary, .btn-primary:hover, .btn-warning, .btn-warning:hover, .btn-danger, .btn-danger:hover, .btn-success, .btn-success:hover, .btn-info, .btn-info:hover {
106
+ .btn-primary, .btn-primary:hover, .btn-warning, .btn-warning:hover, .btn-danger, .btn-danger:hover, .btn-success, .btn-success:hover, .btn-info, .btn-info:hover, .btn-inverse, .btn-inverse:hover {
98
107
  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
99
- color: $white
108
+ color: $white;
100
109
  }
101
110
  // Provide *some* extra contrast for those who can get it
102
- .btn-primary.active, .btn-warning.active, .btn-danger.active, .btn-success.active, .btn-info.active {
111
+ .btn-primary.active, .btn-warning.active, .btn-danger.active, .btn-success.active, .btn-info.active, .btn-inverse.active {
103
112
  color: rgba(255,255,255,.75);
104
113
  }
105
114
 
@@ -124,12 +133,17 @@
124
133
  .btn-info {
125
134
  @include buttonBackground(#5bc0de, #2f96b4);
126
135
  }
136
+ .btn-inverse {
137
+ @include buttonBackground(#454545, #262626);
138
+ }
127
139
 
128
140
 
129
141
  // Cross-browser Jank
130
142
  // --------------------------------------------------
131
143
 
132
144
  button.btn, input[type="submit"].btn {
145
+
146
+ // Firefox 3.6 only I believe
133
147
  &::-moz-focus-inner {
134
148
  padding: 0;
135
149
  border: 0;
@@ -146,4 +160,4 @@ button.btn, input[type="submit"].btn {
146
160
  *padding-top: 3px;
147
161
  *padding-bottom: 3px;
148
162
  }
149
- }
163
+ }
@@ -76,7 +76,7 @@
76
76
  background: $grayDarker;
77
77
  border: 3px solid $white;
78
78
  @include border-radius(23px);
79
- @include opacity(50);
79
+ @include opacity(0.5);
80
80
 
81
81
  // we can't have this transition here
82
82
  // because webkit cancels the carousel
@@ -95,7 +95,7 @@
95
95
  &:hover {
96
96
  color: $white;
97
97
  text-decoration: none;
98
- @include opacity(90);
98
+ @include opacity(0.9);
99
99
  }
100
100
  }
101
101
 
@@ -113,4 +113,4 @@
113
113
  }
114
114
  .carousel-caption h4, .carousel-caption p {
115
115
  color: $white;
116
- }
116
+ }