twbs_sass_rails 1.0.1 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (31) hide show
  1. checksums.yaml +4 -4
  2. data/Appraisals +0 -9
  3. data/CHANGELOG.md +5 -0
  4. data/README.md +5 -8
  5. data/lib/twbs_sass_rails/version.rb +1 -1
  6. data/twbs_sass_rails.gemspec +1 -1
  7. data/vendor/assets/javascripts/twbs/bootstrap/affix.js +2 -2
  8. data/vendor/assets/javascripts/twbs/bootstrap/alert.js +2 -2
  9. data/vendor/assets/javascripts/twbs/bootstrap/button.js +3 -3
  10. data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +3 -2
  11. data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +2 -2
  12. data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +3 -3
  13. data/vendor/assets/javascripts/twbs/bootstrap/modal.js +48 -5
  14. data/vendor/assets/javascripts/twbs/bootstrap/popover.js +2 -2
  15. data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +2 -2
  16. data/vendor/assets/javascripts/twbs/bootstrap/tab.js +2 -2
  17. data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +2 -2
  18. data/vendor/assets/javascripts/twbs/bootstrap/transition.js +1 -1
  19. data/vendor/assets/stylesheets/twbs/bootstrap/_badges.scss +7 -1
  20. data/vendor/assets/stylesheets/twbs/bootstrap/_button-groups.scss +0 -4
  21. data/vendor/assets/stylesheets/twbs/bootstrap/_forms.scss +19 -32
  22. data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +2 -1
  23. data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +0 -8
  24. data/vendor/assets/stylesheets/twbs/bootstrap/_modals.scss +1 -2
  25. data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +1 -0
  26. data/vendor/assets/stylesheets/twbs/bootstrap/_popovers.scss +1 -0
  27. data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +12 -0
  28. data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +12 -4
  29. data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +1 -1
  30. metadata +5 -6
  31. data/gemfiles/rails_3.2.gemfile +0 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6d55b242d387aed47a09aac3a0694e7c7549c910
4
- data.tar.gz: 961bcd0463dabc5605bee7e31399e9acc2c8894d
3
+ metadata.gz: 9a3b6ff8a337c229817a4b01bb2124f5fada7c75
4
+ data.tar.gz: c24c630abc7297e0692902ee13a604b52823dd97
5
5
  SHA512:
6
- metadata.gz: fed33a71d8e6ef0b4e2096af145ff7183dd23a3c8421b8a4f2f2719860b05071daadeb8ad99615897a45eadb9d8a73f07c9311bb33cb816dfebc51714b1f0e03
7
- data.tar.gz: 5fd3662cf2b8ab28fee1c59aaa1f5cf7986b6bec3f6dbaf171041b4e3c5187ff47741f1cf9f3ce553c02a880e1edf4889bf4d2a980602a659b599f6e653d6c5c
6
+ metadata.gz: f494d7830c815a0b52d4aeeba0b155e00fb483f889145bb17e14c9954f8fb096a5a538a1b0be99451df796d0bc14b9334e27d2edcae5bceb6585618da4bfb710
7
+ data.tar.gz: 86bc29179fcf68b366e0e6c145c09ffeedb4ea788abdc35735e5c52bdfd99fa3e18e9bce5893dba260690c333f6e8a25f085538107ea485484f1d1fdac6c5592
data/Appraisals CHANGED
@@ -1,12 +1,3 @@
1
- appraise 'rails-3.2' do
2
- gem 'rails', '3.2.20'
3
- gem 'uglifier'
4
- gem 'minitest', '~> 4'
5
- gem 'sprockets-rails', '=2.0.0.backport1'
6
- gem 'sprockets', '=2.2.2.backport2'
7
- gem 'sass-rails', github: 'guilleiguaran/sass-rails', branch: 'backport'
8
- end
9
-
10
1
  appraise 'rails-4.0' do
11
2
  gem 'rails', '4.0.11'
12
3
  gem 'uglifier'
data/CHANGELOG.md CHANGED
@@ -1,5 +1,10 @@
1
1
  # Changelog
2
2
 
3
+ ## 2.0.0
4
+
5
+ * Removed Rails 3.2 compatibility
6
+ * bootstrap-sass 3.3.1
7
+
3
8
  ## 1.0.1
4
9
 
5
10
  * Tested against Rails 3.2.20, 4.0.11 and 4.1.7
data/README.md CHANGED
@@ -27,14 +27,11 @@ $ rails g twbs_sass_rails:install
27
27
 
28
28
  Rails 3.2 is [no longer maintained for bugfixes](http://guides.rubyonrails.org/maintenance_policy.html), and you should upgrade as soon as possible.
29
29
 
30
- Starting with bootstrap-sass v3.1.1.1, due to the structural changes from upstream you will need these
31
- backported asset pipeline gems on Rails 3.2. There is more on why this is necessary in
32
- https://github.com/twbs/bootstrap-sass/issues/523 and https://github.com/twbs/bootstrap-sass/issues/578.
33
-
34
- ```ruby
35
- gem 'sprockets-rails', '=2.0.0.backport1'
36
- gem 'sprockets', '=2.2.2.backport2'
37
- gem 'sass-rails', github: 'guilleiguaran/sass-rails', branch: 'backport'
30
+ Due to the structural changes, the last version working on Rails 3.2 is 0.6.4, which provides Boostrap 3.1.1 and Fontawesome 4.0.3.
31
+
32
+ Add the gem to your Gemfile
33
+ ```rb
34
+ gem 'twbs_sass_rails', '0.6.4'
38
35
  ```
39
36
 
40
37
 
@@ -1,3 +1,3 @@
1
1
  module TwbsSassRails
2
- VERSION = "1.0.1"
2
+ VERSION = "2.0.0"
3
3
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
20
20
  s.require_paths = ['lib']
21
21
 
22
- s.add_runtime_dependency 'rails', '>= 3.2.20', '< 5.0.0'
22
+ s.add_runtime_dependency 'rails', '>= 4.0.0', '< 5.0.0'
23
23
  s.add_runtime_dependency 'sass-rails', '~> 4'
24
24
 
25
25
  s.add_development_dependency 'appraisal'
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: affix.js v3.3.0
2
+ * Bootstrap: affix.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#affix
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -28,7 +28,7 @@
28
28
  this.checkPosition()
29
29
  }
30
30
 
31
- Affix.VERSION = '3.3.0'
31
+ Affix.VERSION = '3.3.1'
32
32
 
33
33
  Affix.RESET = 'affix affix-top affix-bottom'
34
34
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: alert.js v3.3.0
2
+ * Bootstrap: alert.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#alerts
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -18,7 +18,7 @@
18
18
  $(el).on('click', dismiss, this.close)
19
19
  }
20
20
 
21
- Alert.VERSION = '3.3.0'
21
+ Alert.VERSION = '3.3.1'
22
22
 
23
23
  Alert.TRANSITION_DURATION = 150
24
24
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: button.js v3.3.0
2
+ * Bootstrap: button.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#buttons
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
19
19
  this.isLoading = false
20
20
  }
21
21
 
22
- Button.VERSION = '3.3.0'
22
+ Button.VERSION = '3.3.1'
23
23
 
24
24
  Button.DEFAULTS = {
25
25
  loadingText: 'loading...'
@@ -110,7 +110,7 @@
110
110
  e.preventDefault()
111
111
  })
112
112
  .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
113
- $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
113
+ $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
114
114
  })
115
115
 
116
116
  }(jQuery);
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: carousel.js v3.3.0
2
+ * Bootstrap: carousel.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#carousel
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
30
30
  .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
31
31
  }
32
32
 
33
- Carousel.VERSION = '3.3.0'
33
+ Carousel.VERSION = '3.3.1'
34
34
 
35
35
  Carousel.TRANSITION_DURATION = 600
36
36
 
@@ -42,6 +42,7 @@
42
42
  }
43
43
 
44
44
  Carousel.prototype.keydown = function (e) {
45
+ if (/input|textarea/i.test(e.target.tagName)) return
45
46
  switch (e.which) {
46
47
  case 37: this.prev(); break
47
48
  case 39: this.next(); break
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: collapse.js v3.3.0
2
+ * Bootstrap: collapse.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#collapse
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -28,7 +28,7 @@
28
28
  if (this.options.toggle) this.toggle()
29
29
  }
30
30
 
31
- Collapse.VERSION = '3.3.0'
31
+ Collapse.VERSION = '3.3.1'
32
32
 
33
33
  Collapse.TRANSITION_DURATION = 350
34
34
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: dropdown.js v3.3.0
2
+ * Bootstrap: dropdown.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#dropdowns
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
19
19
  $(element).on('click.bs.dropdown', this.toggle)
20
20
  }
21
21
 
22
- Dropdown.VERSION = '3.3.0'
22
+ Dropdown.VERSION = '3.3.1'
23
23
 
24
24
  Dropdown.prototype.toggle = function (e) {
25
25
  var $this = $(this)
@@ -55,7 +55,7 @@
55
55
  }
56
56
 
57
57
  Dropdown.prototype.keydown = function (e) {
58
- if (!/(38|40|27|32)/.test(e.which)) return
58
+ if (!/(38|40|27|32)/.test(e.which) || /input|textarea/i.test(e.target.tagName)) return
59
59
 
60
60
  var $this = $(this)
61
61
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: modal.js v3.3.0
2
+ * Bootstrap: modal.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#modals
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
30
30
  }
31
31
  }
32
32
 
33
- Modal.VERSION = '3.3.0'
33
+ Modal.VERSION = '3.3.1'
34
34
 
35
35
  Modal.TRANSITION_DURATION = 300
36
36
  Modal.BACKDROP_TRANSITION_DURATION = 150
@@ -56,10 +56,11 @@
56
56
  this.isShown = true
57
57
 
58
58
  this.checkScrollbar()
59
+ this.setScrollbar()
59
60
  this.$body.addClass('modal-open')
60
61
 
61
- this.setScrollbar()
62
62
  this.escape()
63
+ this.resize()
63
64
 
64
65
  this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
65
66
 
@@ -74,6 +75,9 @@
74
75
  .show()
75
76
  .scrollTop(0)
76
77
 
78
+ if (that.options.backdrop) that.adjustBackdrop()
79
+ that.adjustDialog()
80
+
77
81
  if (transition) {
78
82
  that.$element[0].offsetWidth // force reflow
79
83
  }
@@ -108,6 +112,7 @@
108
112
  this.isShown = false
109
113
 
110
114
  this.escape()
115
+ this.resize()
111
116
 
112
117
  $(document).off('focusin.bs.modal')
113
118
 
@@ -143,11 +148,20 @@
143
148
  }
144
149
  }
145
150
 
151
+ Modal.prototype.resize = function () {
152
+ if (this.isShown) {
153
+ $(window).on('resize.bs.modal', $.proxy(this.handleUpdate, this))
154
+ } else {
155
+ $(window).off('resize.bs.modal')
156
+ }
157
+ }
158
+
146
159
  Modal.prototype.hideModal = function () {
147
160
  var that = this
148
161
  this.$element.hide()
149
162
  this.backdrop(function () {
150
163
  that.$body.removeClass('modal-open')
164
+ that.resetAdjustments()
151
165
  that.resetScrollbar()
152
166
  that.$element.trigger('hidden.bs.modal')
153
167
  })
@@ -204,13 +218,43 @@
204
218
  }
205
219
  }
206
220
 
221
+ // these following methods are used to handle overflowing modals
222
+
223
+ Modal.prototype.handleUpdate = function () {
224
+ if (this.options.backdrop) this.adjustBackdrop()
225
+ this.adjustDialog()
226
+ }
227
+
228
+ Modal.prototype.adjustBackdrop = function () {
229
+ this.$backdrop
230
+ .css('height', 0)
231
+ .css('height', this.$element[0].scrollHeight)
232
+ }
233
+
234
+ Modal.prototype.adjustDialog = function () {
235
+ var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight
236
+
237
+ this.$element.css({
238
+ paddingLeft: !this.bodyIsOverflowing && modalIsOverflowing ? this.scrollbarWidth : '',
239
+ paddingRight: this.bodyIsOverflowing && !modalIsOverflowing ? this.scrollbarWidth : ''
240
+ })
241
+ }
242
+
243
+ Modal.prototype.resetAdjustments = function () {
244
+ this.$element.css({
245
+ paddingLeft: '',
246
+ paddingRight: ''
247
+ })
248
+ }
249
+
207
250
  Modal.prototype.checkScrollbar = function () {
251
+ this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight
208
252
  this.scrollbarWidth = this.measureScrollbar()
209
253
  }
210
254
 
211
255
  Modal.prototype.setScrollbar = function () {
212
256
  var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
213
- if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
257
+ if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
214
258
  }
215
259
 
216
260
  Modal.prototype.resetScrollbar = function () {
@@ -218,7 +262,6 @@
218
262
  }
219
263
 
220
264
  Modal.prototype.measureScrollbar = function () { // thx walsh
221
- if (document.body.clientWidth >= window.innerWidth) return 0
222
265
  var scrollDiv = document.createElement('div')
223
266
  scrollDiv.className = 'modal-scrollbar-measure'
224
267
  this.$body.append(scrollDiv)
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: popover.js v3.3.0
2
+ * Bootstrap: popover.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#popovers
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -19,7 +19,7 @@
19
19
 
20
20
  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
21
21
 
22
- Popover.VERSION = '3.3.0'
22
+ Popover.VERSION = '3.3.1'
23
23
 
24
24
  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
25
25
  placement: 'right',
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: scrollspy.js v3.3.0
2
+ * Bootstrap: scrollspy.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#scrollspy
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -30,7 +30,7 @@
30
30
  this.process()
31
31
  }
32
32
 
33
- ScrollSpy.VERSION = '3.3.0'
33
+ ScrollSpy.VERSION = '3.3.1'
34
34
 
35
35
  ScrollSpy.DEFAULTS = {
36
36
  offset: 10
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: tab.js v3.3.0
2
+ * Bootstrap: tab.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#tabs
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -17,7 +17,7 @@
17
17
  this.element = $(element)
18
18
  }
19
19
 
20
- Tab.VERSION = '3.3.0'
20
+ Tab.VERSION = '3.3.1'
21
21
 
22
22
  Tab.TRANSITION_DURATION = 150
23
23
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: tooltip.js v3.3.0
2
+ * Bootstrap: tooltip.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#tooltip
4
4
  * Inspired by the original jQuery.tipsy by Jason Frame
5
5
  * ========================================================================
@@ -25,7 +25,7 @@
25
25
  this.init('tooltip', element, options)
26
26
  }
27
27
 
28
- Tooltip.VERSION = '3.3.0'
28
+ Tooltip.VERSION = '3.3.1'
29
29
 
30
30
  Tooltip.TRANSITION_DURATION = 150
31
31
 
@@ -1,5 +1,5 @@
1
1
  /* ========================================================================
2
- * Bootstrap: transition.js v3.3.0
2
+ * Bootstrap: transition.js v3.3.1
3
3
  * http://getbootstrap.com/javascript/#transitions
4
4
  * ========================================================================
5
5
  * Copyright 2011-2014 Twitter, Inc.
@@ -36,11 +36,17 @@
36
36
  // [converter] extracted a& to a.badge
37
37
 
38
38
  // Account for badges in navs
39
- a.list-group-item.active > &,
39
+ .list-group-item.active > &,
40
40
  .nav-pills > .active > a > & {
41
41
  color: $badge-active-color;
42
42
  background-color: $badge-active-bg;
43
43
  }
44
+ .list-group-item > & {
45
+ float: right;
46
+ }
47
+ .list-group-item > & + & {
48
+ margin-right: 5px;
49
+ }
44
50
  .nav-pills > li > a > & {
45
51
  margin-left: 3px;
46
52
  }
@@ -18,10 +18,6 @@
18
18
  &.active {
19
19
  z-index: 2;
20
20
  }
21
- &:focus {
22
- // Remove focus outline when dropdown JS adds it after closing the menu
23
- outline: 0;
24
- }
25
21
  }
26
22
  }
27
23
 
@@ -170,41 +170,28 @@ input[type="search"] {
170
170
  // Special styles for iOS temporal inputs
171
171
  //
172
172
  // In Mobile Safari, setting `display: block` on temporal inputs causes the
173
- // text within the input to become vertically misaligned.
174
- // As a workaround, we set a pixel line-height that matches the
175
- // given height of the input. Since this fucks up everything else, we have to
176
- // appropriately reset it for Internet Explorer and the size variations.
177
-
178
- input[type="date"],
179
- input[type="time"],
180
- input[type="datetime-local"],
181
- input[type="month"] {
182
- line-height: $input-height-base;
183
- // IE8+ misaligns the text within date inputs, so we reset
184
- line-height: $line-height-base #{\0};
185
-
186
- &.input-sm {
173
+ // text within the input to become vertically misaligned. As a workaround, we
174
+ // set a pixel line-height that matches the given height of the input, but only
175
+ // for Safari.
176
+
177
+ @media screen and (-webkit-min-device-pixel-ratio: 0) {
178
+ input[type="date"],
179
+ input[type="time"],
180
+ input[type="datetime-local"],
181
+ input[type="month"] {
182
+ line-height: $input-height-base;
183
+ }
184
+ input[type="date"].input-sm,
185
+ input[type="time"].input-sm,
186
+ input[type="datetime-local"].input-sm,
187
+ input[type="month"].input-sm {
187
188
  line-height: $input-height-small;
188
- line-height: $line-height-small #{\0};
189
189
  }
190
- &.input-lg {
190
+ input[type="date"].input-lg,
191
+ input[type="time"].input-lg,
192
+ input[type="datetime-local"].input-lg,
193
+ input[type="month"].input-lg {
191
194
  line-height: $input-height-large;
192
- line-height: $line-height-large #{\0};
193
- }
194
- }
195
-
196
- // IE 11 hack to reverse the iOS temporal input hack.
197
- _:-ms-fullscreen, :root input[type="date"],
198
- _:-ms-fullscreen, :root input[type="time"],
199
- _:-ms-fullscreen, :root input[type="datetime-local"],
200
- _:-ms-fullscreen, :root input[type="month"] {
201
- line-height: $line-height-base;
202
-
203
- &.input-sm {
204
- line-height: $line-height-small;
205
- }
206
- &.input-lg {
207
- line-height: $line-height-large;
208
195
  }
209
196
  }
210
197
 
@@ -35,7 +35,8 @@
35
35
  @media screen and (min-width: $screen-sm-min) {
36
36
  padding: ($jumbotron-padding * 1.6) 0;
37
37
 
38
- .container & {
38
+ .container &,
39
+ .container-fluid & {
39
40
  padding-left: ($jumbotron-padding * 2);
40
41
  padding-right: ($jumbotron-padding * 2);
41
42
  }
@@ -35,14 +35,6 @@
35
35
  margin-bottom: 0;
36
36
  @include border-bottom-radius($list-group-border-radius);
37
37
  }
38
-
39
- // Align badges within list items
40
- > .badge {
41
- float: right;
42
- }
43
- > .badge + .badge {
44
- margin-right: 5px;
45
- }
46
38
  }
47
39
 
48
40
 
@@ -62,10 +62,9 @@
62
62
 
63
63
  // Modal background
64
64
  .modal-backdrop {
65
- position: fixed;
65
+ position: absolute;
66
66
  top: 0;
67
67
  right: 0;
68
- bottom: 0;
69
68
  left: 0;
70
69
  background-color: $modal-backdrop-bg;
71
70
  // Fade for backdrop
@@ -331,6 +331,7 @@
331
331
  }
332
332
  // Menu position and menu caret support for dropups via extra dropup class
333
333
  .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
334
+ @include border-top-radius($navbar-border-radius);
334
335
  @include border-bottom-radius(0);
335
336
  }
336
337
 
@@ -12,6 +12,7 @@
12
12
  max-width: $popover-max-width;
13
13
  padding: 1px;
14
14
  // Reset font and text propertes given new insertion method
15
+ font-family: $font-family-base;
15
16
  font-size: $font-size-base;
16
17
  font-weight: normal;
17
18
  line-height: $line-height-base;
@@ -151,6 +151,18 @@
151
151
  border-radius: 0;
152
152
  }
153
153
 
154
+ // Fix active state of dropdown items in collapsed mode
155
+ @media (max-width: $grid-float-breakpoint-max) {
156
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
157
+ &,
158
+ &:hover,
159
+ &:focus {
160
+ color: #fff;
161
+ @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
162
+ }
163
+ }
164
+ }
165
+
154
166
 
155
167
  //
156
168
  // Alerts
@@ -9,7 +9,10 @@
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
11
  visibility: visible;
12
+ // Reset font and text propertes given new insertion method
13
+ font-family: $font-family-base;
12
14
  font-size: $font-size-small;
15
+ font-weight: normal;
13
16
  line-height: 1.4;
14
17
  @include opacity(0);
15
18
 
@@ -39,6 +42,7 @@
39
42
  border-color: transparent;
40
43
  border-style: solid;
41
44
  }
45
+ // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
42
46
  .tooltip {
43
47
  &.top .tooltip-arrow {
44
48
  bottom: 0;
@@ -49,13 +53,15 @@
49
53
  }
50
54
  &.top-left .tooltip-arrow {
51
55
  bottom: 0;
52
- left: $tooltip-arrow-width;
56
+ right: $tooltip-arrow-width;
57
+ margin-bottom: -$tooltip-arrow-width;
53
58
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
54
59
  border-top-color: $tooltip-arrow-color;
55
60
  }
56
61
  &.top-right .tooltip-arrow {
57
62
  bottom: 0;
58
- right: $tooltip-arrow-width;
63
+ left: $tooltip-arrow-width;
64
+ margin-bottom: -$tooltip-arrow-width;
59
65
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
60
66
  border-top-color: $tooltip-arrow-color;
61
67
  }
@@ -82,13 +88,15 @@
82
88
  }
83
89
  &.bottom-left .tooltip-arrow {
84
90
  top: 0;
85
- left: $tooltip-arrow-width;
91
+ right: $tooltip-arrow-width;
92
+ margin-top: -$tooltip-arrow-width;
86
93
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
87
94
  border-bottom-color: $tooltip-arrow-color;
88
95
  }
89
96
  &.bottom-right .tooltip-arrow {
90
97
  top: 0;
91
- right: $tooltip-arrow-width;
98
+ left: $tooltip-arrow-width;
99
+ margin-top: -$tooltip-arrow-width;
92
100
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
93
101
  border-bottom-color: $tooltip-arrow-color;
94
102
  }
@@ -19,7 +19,7 @@ $gray: lighten($gray-base, 33.5%) !default; // #555
19
19
  $gray-light: lighten($gray-base, 46.7%) !default; // #777
20
20
  $gray-lighter: lighten($gray-base, 93.5%) !default; // #eee
21
21
 
22
- $brand-primary: #428bca !default;
22
+ $brand-primary: darken(#428bca, 6.5%) !default;
23
23
  $brand-success: #5cb85c !default;
24
24
  $brand-info: #5bc0de !default;
25
25
  $brand-warning: #f0ad4e !default;
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: twbs_sass_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - diowa
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-31 00:00:00.000000000 Z
11
+ date: 2014-11-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 3.2.20
19
+ version: 4.0.0
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: 5.0.0
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: 3.2.20
29
+ version: 4.0.0
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: 5.0.0
@@ -150,7 +150,6 @@ files:
150
150
  - app/assets/fonts/glyphicons-halflings-regular.svg
151
151
  - app/assets/fonts/glyphicons-halflings-regular.ttf
152
152
  - app/assets/fonts/glyphicons-halflings-regular.woff
153
- - gemfiles/rails_3.2.gemfile
154
153
  - gemfiles/rails_4.0.gemfile
155
154
  - gemfiles/rails_4.1.gemfile
156
155
  - lib/generators/twbs_sass_rails/install/install_generator.rb
@@ -330,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
330
329
  version: '0'
331
330
  requirements: []
332
331
  rubyforge_project:
333
- rubygems_version: 2.2.2
332
+ rubygems_version: 2.4.2
334
333
  signing_key:
335
334
  specification_version: 4
336
335
  summary: Bootstrap and FontAwesome assets in Rails applications
@@ -1,12 +0,0 @@
1
- # This file was generated by Appraisal
2
-
3
- source "https://rubygems.org"
4
-
5
- gem "rails", "3.2.20"
6
- gem "uglifier"
7
- gem "minitest", "~> 4"
8
- gem "sprockets-rails", "=2.0.0.backport1"
9
- gem "sprockets", "=2.2.2.backport2"
10
- gem "sass-rails", :github => "guilleiguaran/sass-rails", :branch => "backport"
11
-
12
- gemspec :path => "../"