bootstrap-sass 3.0.1.0 → 3.0.3.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


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

Files changed (54) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/CHANGELOG.md +4 -0
  4. data/Gemfile +9 -1
  5. data/README.md +58 -15
  6. data/Rakefile +1 -3
  7. data/lib/bootstrap-sass/sass_functions.rb +45 -10
  8. data/lib/bootstrap-sass/version.rb +2 -2
  9. data/lib/bootstrap-sass.rb +56 -36
  10. data/tasks/converter/less_conversion.rb +27 -26
  11. data/templates/project/manifest.rb +14 -5
  12. data/test/dummy/app/views/pages/root.html.slim +19 -3
  13. data/test/dummy_sass_only/Gemfile +4 -0
  14. data/test/dummy_sass_only/compile.rb +13 -0
  15. data/test/dummy_sass_only/import_all.sass +2 -0
  16. data/test/gemfiles/sass_3_2.gemfile +9 -1
  17. data/test/gemfiles/sass_head.gemfile +11 -2
  18. data/test/sass_test.rb +23 -0
  19. data/test/test_helper.rb +0 -1
  20. data/vendor/assets/javascripts/bootstrap/affix.js +2 -2
  21. data/vendor/assets/javascripts/bootstrap/alert.js +2 -2
  22. data/vendor/assets/javascripts/bootstrap/button.js +12 -6
  23. data/vendor/assets/javascripts/bootstrap/carousel.js +6 -6
  24. data/vendor/assets/javascripts/bootstrap/collapse.js +2 -2
  25. data/vendor/assets/javascripts/bootstrap/dropdown.js +6 -6
  26. data/vendor/assets/javascripts/bootstrap/modal.js +2 -2
  27. data/vendor/assets/javascripts/bootstrap/popover.js +2 -2
  28. data/vendor/assets/javascripts/bootstrap/scrollspy.js +3 -3
  29. data/vendor/assets/javascripts/bootstrap/tab.js +2 -2
  30. data/vendor/assets/javascripts/bootstrap/tooltip.js +2 -2
  31. data/vendor/assets/javascripts/bootstrap/transition.js +2 -2
  32. data/vendor/assets/stylesheets/bootstrap/_badges.scss +6 -6
  33. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +7 -33
  34. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +2 -5
  35. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +1 -0
  36. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +3 -8
  37. data/vendor/assets/stylesheets/bootstrap/_forms.scss +17 -8
  38. data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +5 -5
  39. data/vendor/assets/stylesheets/bootstrap/_grid.scss +12 -26
  40. data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +1 -1
  41. data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +8 -2
  42. data/vendor/assets/stylesheets/bootstrap/_labels.scss +6 -0
  43. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +49 -62
  44. data/vendor/assets/stylesheets/bootstrap/_modals.scss +2 -5
  45. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +41 -53
  46. data/vendor/assets/stylesheets/bootstrap/_navs.scss +0 -20
  47. data/vendor/assets/stylesheets/bootstrap/_panels.scss +11 -1
  48. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +0 -12
  49. data/vendor/assets/stylesheets/bootstrap/_tables.scss +17 -22
  50. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +17 -10
  51. data/vendor/assets/stylesheets/bootstrap/_type.scss +54 -52
  52. data/vendor/assets/stylesheets/bootstrap/_variables.scss +17 -10
  53. metadata +10 -3
  54. data/lib/bootstrap-sass/compass_functions.rb +0 -24
data/test/sass_test.rb ADDED
@@ -0,0 +1,23 @@
1
+ require 'test_helper'
2
+
3
+ class SassTest < Test::Unit::TestCase
4
+ DUMMY_PATH = 'test/dummy_sass_only'
5
+
6
+ def test_font_helper
7
+ assert_match %r(url\(['"]?.*eot['"]?\)), @css
8
+ end
9
+
10
+ def setup
11
+ Dir.chdir DUMMY_PATH do
12
+ %x[bundle]
13
+ end
14
+ css_path = File.join Bootstrap.gem_path, 'tmp/bootstrap-sass-only.css'
15
+ command = "bundle exec ruby compile.rb #{css_path}"
16
+ Dir.chdir DUMMY_PATH do
17
+ assert silence_stream(STDOUT) {
18
+ system(command)
19
+ }, 'Sass-only compilation failed'
20
+ end
21
+ @css = File.read(css_path)
22
+ end
23
+ end
data/test/test_helper.rb CHANGED
@@ -6,7 +6,6 @@ require File.expand_path('dummy/config/environment', File.dirname(__FILE__))
6
6
  require 'test/unit'
7
7
 
8
8
  require 'sass'
9
- require 'lib/bootstrap-sass/compass_functions'
10
9
  require 'lib/bootstrap-sass/sass_functions'
11
10
 
12
11
  require 'rails/test_help'
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: affix.js v3.0.1
2
+ * Bootstrap: affix.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#affix
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -123,4 +123,4 @@
123
123
  })
124
124
  })
125
125
 
126
- }(window.jQuery);
126
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: alert.js v3.0.1
2
+ * Bootstrap: alert.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#alerts
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -95,4 +95,4 @@
95
95
 
96
96
  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
97
97
 
98
- }(window.jQuery);
98
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: button.js v3.0.1
2
+ * Bootstrap: button.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#buttons
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -54,15 +54,21 @@
54
54
 
55
55
  Button.prototype.toggle = function () {
56
56
  var $parent = this.$element.closest('[data-toggle="buttons"]')
57
+ var changed = true
57
58
 
58
59
  if ($parent.length) {
59
60
  var $input = this.$element.find('input')
60
- .prop('checked', !this.$element.hasClass('active'))
61
- .trigger('change')
62
- if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
61
+ if ($input.prop('type') === 'radio') {
62
+ // see if clicking on current one
63
+ if ($input.prop('checked') && this.$element.hasClass('active'))
64
+ changed = false
65
+ else
66
+ $parent.find('.active').removeClass('active')
67
+ }
68
+ if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
63
69
  }
64
70
 
65
- this.$element.toggleClass('active')
71
+ if (changed) this.$element.toggleClass('active')
66
72
  }
67
73
 
68
74
 
@@ -106,4 +112,4 @@
106
112
  e.preventDefault()
107
113
  })
108
114
 
109
- }(window.jQuery);
115
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: carousel.js v3.0.1
2
+ * Bootstrap: carousel.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#carousel
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -69,7 +69,7 @@
69
69
 
70
70
  if (pos > (this.$items.length - 1) || pos < 0) return
71
71
 
72
- if (this.sliding) return this.$element.one('slid', function () { that.to(pos) })
72
+ if (this.sliding) return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
73
73
  if (activeIndex == pos) return this.pause().cycle()
74
74
 
75
75
  return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
@@ -121,7 +121,7 @@
121
121
 
122
122
  if (this.$indicators.length) {
123
123
  this.$indicators.find('.active').removeClass('active')
124
- this.$element.one('slid', function () {
124
+ this.$element.one('slid.bs.carousel', function () {
125
125
  var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
126
126
  $nextIndicator && $nextIndicator.addClass('active')
127
127
  })
@@ -139,7 +139,7 @@
139
139
  $next.removeClass([type, direction].join(' ')).addClass('active')
140
140
  $active.removeClass(['active', direction].join(' '))
141
141
  that.sliding = false
142
- setTimeout(function () { that.$element.trigger('slid') }, 0)
142
+ setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
143
143
  })
144
144
  .emulateTransitionEnd(600)
145
145
  } else {
@@ -148,7 +148,7 @@
148
148
  $active.removeClass('active')
149
149
  $next.addClass('active')
150
150
  this.sliding = false
151
- this.$element.trigger('slid')
151
+ this.$element.trigger('slid.bs.carousel')
152
152
  }
153
153
 
154
154
  isCycling && this.cycle()
@@ -214,4 +214,4 @@
214
214
  })
215
215
  })
216
216
 
217
- }(window.jQuery);
217
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: collapse.js v3.0.1
2
+ * Bootstrap: collapse.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#collapse
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -176,4 +176,4 @@
176
176
  $target.collapse(option)
177
177
  })
178
178
 
179
- }(window.jQuery);
179
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: dropdown.js v3.0.1
2
+ * Bootstrap: dropdown.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#dropdowns
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -26,7 +26,7 @@
26
26
  var backdrop = '.dropdown-backdrop'
27
27
  var toggle = '[data-toggle=dropdown]'
28
28
  var Dropdown = function (element) {
29
- var $el = $(element).on('click.bs.dropdown', this.toggle)
29
+ $(element).on('click.bs.dropdown', this.toggle)
30
30
  }
31
31
 
32
32
  Dropdown.prototype.toggle = function (e) {
@@ -41,7 +41,7 @@
41
41
 
42
42
  if (!isActive) {
43
43
  if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
44
- // if mobile we we use a backdrop because click events don't delegate
44
+ // if mobile we use a backdrop because click events don't delegate
45
45
  $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
46
46
  }
47
47
 
@@ -123,9 +123,9 @@
123
123
  $.fn.dropdown = function (option) {
124
124
  return this.each(function () {
125
125
  var $this = $(this)
126
- var data = $this.data('dropdown')
126
+ var data = $this.data('bs.dropdown')
127
127
 
128
- if (!data) $this.data('dropdown', (data = new Dropdown(this)))
128
+ if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
129
129
  if (typeof option == 'string') data[option].call($this)
130
130
  })
131
131
  }
@@ -151,4 +151,4 @@
151
151
  .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
152
152
  .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
153
153
 
154
- }(window.jQuery);
154
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: modal.js v3.0.1
2
+ * Bootstrap: modal.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#modals
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -243,4 +243,4 @@
243
243
  .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
244
244
  .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
245
245
 
246
- }(window.jQuery);
246
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: popover.js v3.0.1
2
+ * Bootstrap: popover.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#popovers
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -114,4 +114,4 @@
114
114
  return this
115
115
  }
116
116
 
117
- }(window.jQuery);
117
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: scrollspy.js v3.0.1
2
+ * Bootstrap: scrollspy.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#scrollspy
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -113,7 +113,7 @@
113
113
  .addClass('active')
114
114
  }
115
115
 
116
- active.trigger('activate')
116
+ active.trigger('activate.bs.scrollspy')
117
117
  }
118
118
 
119
119
 
@@ -155,4 +155,4 @@
155
155
  })
156
156
  })
157
157
 
158
- }(window.jQuery);
158
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: tab.js v3.0.1
2
+ * Bootstrap: tab.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#tabs
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -132,4 +132,4 @@
132
132
  $(this).tab('show')
133
133
  })
134
134
 
135
- }(window.jQuery);
135
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: tooltip.js v3.0.1
2
+ * Bootstrap: tooltip.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#tooltip
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ========================================================================
@@ -383,4 +383,4 @@
383
383
  return this
384
384
  }
385
385
 
386
- }(window.jQuery);
386
+ }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: transition.js v3.0.1
2
+ * Bootstrap: transition.js v3.0.3
3
3
  * http://getbootstrap.com/javascript/#transitions
4
4
  * ========================================================================
5
5
  * Copyright 2013 Twitter, Inc.
@@ -53,4 +53,4 @@
53
53
  $.support.transition = transitionEnd()
54
54
  })
55
55
 
56
- }(window.jQuery);
56
+ }(jQuery);
@@ -22,6 +22,12 @@
22
22
  &:empty {
23
23
  display: none;
24
24
  }
25
+
26
+ // Quick fix for badges in buttons
27
+ .btn & {
28
+ position: relative;
29
+ top: -1px;
30
+ }
25
31
  }
26
32
 
27
33
  // Hover state, but only for links
@@ -34,12 +40,6 @@ a.badge {
34
40
  }
35
41
  }
36
42
 
37
- // Quick fix for labels/badges in buttons
38
- .btn .badge {
39
- position: relative;
40
- top: -1px;
41
- }
42
-
43
43
  // Account for counters in navs
44
44
  a.list-group-item.active > .badge,
45
45
  .nav-pills > .active > a > .badge {
@@ -2,37 +2,6 @@
2
2
  // Button groups
3
3
  // --------------------------------------------------
4
4
 
5
- // Button carets
6
- //
7
- // Match the button text color to the arrow/caret for indicating dropdown-ness.
8
-
9
- .caret {
10
- .btn-default & {
11
- border-top-color: $btn-default-color;
12
- }
13
- .btn-primary &,
14
- .btn-success &,
15
- .btn-warning &,
16
- .btn-danger &,
17
- .btn-info & {
18
- border-top-color: #fff;
19
- }
20
- }
21
- .dropup {
22
- .btn-default .caret {
23
- border-bottom-color: $btn-default-color;
24
- }
25
- .btn-primary,
26
- .btn-success,
27
- .btn-warning,
28
- .btn-danger,
29
- .btn-info {
30
- .caret {
31
- border-bottom-color: #fff;
32
- }
33
- }
34
- }
35
-
36
5
  // Make the div behave like a button
37
6
  .btn-group,
38
7
  .btn-group-vertical {
@@ -178,7 +147,8 @@
178
147
 
179
148
  .btn-group-vertical {
180
149
  > .btn,
181
- > .btn-group {
150
+ > .btn-group,
151
+ > .btn-group > .btn {
182
152
  display: block;
183
153
  float: none;
184
154
  width: 100%;
@@ -238,11 +208,15 @@
238
208
  width: 100%;
239
209
  table-layout: fixed;
240
210
  border-collapse: separate;
241
- .btn {
211
+ > .btn,
212
+ > .btn-group {
242
213
  float: none;
243
214
  display: table-cell;
244
215
  width: 1%;
245
216
  }
217
+ > .btn-group .btn {
218
+ width: 100%;
219
+ }
246
220
  }
247
221
 
248
222
 
@@ -6,7 +6,6 @@
6
6
  // Base styles
7
7
  // --------------------------------------------------
8
8
 
9
- // Core styles
10
9
  .btn {
11
10
  display: inline-block;
12
11
  margin-bottom: 0; // For input.btn
@@ -45,7 +44,6 @@
45
44
  @include opacity(.65);
46
45
  @include box-shadow(none);
47
46
  }
48
-
49
47
  }
50
48
 
51
49
 
@@ -123,13 +121,12 @@
123
121
  // line-height: ensure even-numbered height of button next to large input
124
122
  @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
125
123
  }
126
- .btn-sm,
127
- .btn-xs {
124
+ .btn-sm {
128
125
  // line-height: ensure proper height of button next to small input
129
126
  @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
130
127
  }
131
128
  .btn-xs {
132
- padding: 1px 5px;
129
+ @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
133
130
  }
134
131
 
135
132
 
@@ -91,6 +91,7 @@
91
91
  // Hover/focus state
92
92
  &:hover,
93
93
  &:focus {
94
+ outline: none;
94
95
  color: $carousel-control-color;
95
96
  text-decoration: none;
96
97
  @include opacity(.9);
@@ -10,12 +10,9 @@
10
10
  height: 0;
11
11
  margin-left: 2px;
12
12
  vertical-align: middle;
13
- border-top: $caret-width-base solid $dropdown-caret-color;
13
+ border-top: $caret-width-base solid;
14
14
  border-right: $caret-width-base solid transparent;
15
15
  border-left: $caret-width-base solid transparent;
16
- // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
17
- // we can just straight up remove this.
18
- border-bottom: 0 dotted;
19
16
  }
20
17
 
21
18
  // The dropdown wrapper (div)
@@ -163,10 +160,8 @@
163
160
  .navbar-fixed-bottom .dropdown {
164
161
  // Reverse the caret
165
162
  .caret {
166
- // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
167
- // gets fixed, restore `border-top: 0;`.
168
- border-top: 0 dotted;
169
- border-bottom: $caret-width-base solid $dropdown-caret-color;
163
+ border-top: 0;
164
+ border-bottom: $caret-width-base solid;
170
165
  content: "";
171
166
  }
172
167
  // Different positioning for bottom up menu
@@ -92,14 +92,6 @@ output {
92
92
  vertical-align: middle;
93
93
  }
94
94
 
95
- // Placeholder
96
- //
97
- // Placeholder text gets special styles because when browsers invalidate entire
98
- // lines if it doesn't understand a selector/
99
- .form-control {
100
- @include placeholder();
101
- }
102
-
103
95
 
104
96
  // Common form controls
105
97
  //
@@ -142,6 +134,12 @@ output {
142
134
  // Customize the `:focus` state to imitate native WebKit styles.
143
135
  @include form-control-focus();
144
136
 
137
+ // Placeholder
138
+ //
139
+ // Placeholder text gets special styles because when browsers invalidate entire
140
+ // lines if it doesn't understand a selector/
141
+ @include placeholder();
142
+
145
143
  // Disabled and read-only inputs
146
144
  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
147
145
  // be disabled if the fieldset is disabled. Due to implementation difficulty,
@@ -310,6 +308,11 @@ input[type="checkbox"],
310
308
  display: inline-block;
311
309
  }
312
310
 
311
+ // Override `width: 100%;` when not within a `.form-group`
312
+ select.form-control {
313
+ width: auto;
314
+ }
315
+
313
316
  // Remove default margin on radios/checkboxes that were used for stacking, and
314
317
  // then undo the floating of radios and checkboxes to match (which also avoids
315
318
  // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
@@ -346,6 +349,12 @@ input[type="checkbox"],
346
349
  margin-bottom: 0;
347
350
  padding-top: ($padding-base-vertical + 1); // Default padding plus a border
348
351
  }
352
+ // Account for padding we're adding to ensure the alignment and of help text
353
+ // and other content below items
354
+ .radio,
355
+ .checkbox {
356
+ min-height: $line-height-computed + ($padding-base-vertical + 1);
357
+ }
349
358
 
350
359
  // Make form groups behave like rows
351
360
  .form-group {
@@ -10,11 +10,11 @@
10
10
  // Import the fonts
11
11
  @font-face {
12
12
  font-family: 'Glyphicons Halflings';
13
- src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
14
- src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
15
- font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
16
- font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
17
- font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
13
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
14
+ src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
15
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
16
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
17
+ url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular'), '#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular')) format('svg');
18
18
  }
19
19
 
20
20
  // Catchall baseclass
@@ -5,6 +5,16 @@
5
5
  // Set the container width, and override it for fixed navbars in media queries
6
6
  .container {
7
7
  @include container-fixed();
8
+
9
+ @media (min-width: $screen-sm) {
10
+ width: $container-sm;
11
+ }
12
+ @media (min-width: $screen-md) {
13
+ width: $container-md;
14
+ }
15
+ @media (min-width: $screen-lg-min) {
16
+ width: $container-lg;
17
+ }
8
18
  }
9
19
 
10
20
  // mobile first defaults
@@ -18,11 +28,8 @@
18
28
 
19
29
  // Extra small grid
20
30
  //
21
- // Grid classes for extra small devices like smartphones. No offset, push, or
22
- // pull classes are present here due to the size of the target.
23
- //
24
- // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
25
- // it's full-width.
31
+ // Columns, offsets, pushes, and pulls for extra small devices like
32
+ // smartphones.
26
33
 
27
34
  @include make-grid-columns-float(xs);
28
35
  @include make-grid($grid-columns, xs, width);
@@ -35,15 +42,8 @@
35
42
  //
36
43
  // Columns, offsets, pushes, and pulls for the small device range, from phones
37
44
  // to tablets.
38
- //
39
- // Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
40
- // it's full-width.
41
45
 
42
46
  @media (min-width: $screen-sm-min) {
43
- .container {
44
- width: $container-sm;
45
- }
46
-
47
47
  @include make-grid-columns-float(sm);
48
48
  @include make-grid($grid-columns, sm, width);
49
49
  @include make-grid($grid-columns, sm, pull);
@@ -55,15 +55,8 @@
55
55
  // Medium grid
56
56
  //
57
57
  // Columns, offsets, pushes, and pulls for the desktop device range.
58
- //
59
- // Note that `.col-md-12` doesn't get floated on purpose--there's no need since
60
- // it's full-width.
61
58
 
62
59
  @media (min-width: $screen-md-min) {
63
- .container {
64
- width: $container-md;
65
- }
66
-
67
60
  @include make-grid-columns-float(md);
68
61
  @include make-grid($grid-columns, md, width);
69
62
  @include make-grid($grid-columns, md, pull);
@@ -75,15 +68,8 @@
75
68
  // Large grid
76
69
  //
77
70
  // Columns, offsets, pushes, and pulls for the large desktop device range.
78
- //
79
- // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
80
- // it's full-width.
81
71
 
82
72
  @media (min-width: $screen-lg-min) {
83
- .container {
84
- width: $container-lg;
85
- }
86
-
87
73
  @include make-grid-columns-float(lg);
88
74
  @include make-grid($grid-columns, lg, width);
89
75
  @include make-grid($grid-columns, lg, pull);
@@ -10,7 +10,7 @@
10
10
  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
11
11
 
12
12
  // Undo padding and float of grid classes
13
- &.col {
13
+ &[class*="col-"] {
14
14
  float: none;
15
15
  padding-left: 0;
16
16
  padding-right: 0;
@@ -12,7 +12,8 @@
12
12
  color: $jumbotron-color;
13
13
  background-color: $jumbotron-bg;
14
14
 
15
- h1 {
15
+ h1,
16
+ .h1 {
16
17
  line-height: 1;
17
18
  color: $jumbotron-heading-color;
18
19
  }
@@ -24,6 +25,10 @@
24
25
  border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
25
26
  }
26
27
 
28
+ .container {
29
+ max-width: 100%;
30
+ }
31
+
27
32
  @media screen and (min-width: $screen-sm-min) {
28
33
  padding-top: ($jumbotron-padding * 1.6);
29
34
  padding-bottom: ($jumbotron-padding * 1.6);
@@ -33,7 +38,8 @@
33
38
  padding-right: ($jumbotron-padding * 2);
34
39
  }
35
40
 
36
- h1 {
41
+ h1,
42
+ .h1 {
37
43
  font-size: ($font-size-base * 4.5);
38
44
  }
39
45
  }
@@ -28,6 +28,12 @@
28
28
  &:empty {
29
29
  display: none;
30
30
  }
31
+
32
+ // Quick fix for labels in buttons
33
+ .btn & {
34
+ position: relative;
35
+ top: -1px;
36
+ }
31
37
  }
32
38
 
33
39
  // Colors