railsstrap 3.3.0 → 3.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (169) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +11 -6
  3. data/app/helpers/railsstrap/date_picker_helper.rb +84 -0
  4. data/lib/generators/railsstrap/install/install_generator.rb +2 -2
  5. data/lib/generators/railsstrap/install/templates/application.css +3 -0
  6. data/lib/generators/railsstrap/install/templates/application.js +2 -0
  7. data/lib/generators/railsstrap/install/templates/bootstrap_and_overrides.css +1 -1
  8. data/lib/generators/railsstrap/install/templates/bootstrap_and_overrides.less +6 -3
  9. data/lib/generators/railsstrap/themed/templates/_form.html.erb +1 -1
  10. data/lib/generators/railsstrap/themed/templates/_form.html.haml +1 -1
  11. data/lib/generators/railsstrap/themed/templates/_form.html.slim +1 -1
  12. data/lib/generators/railsstrap/themed/templates/edit.html.slim +1 -1
  13. data/lib/generators/railsstrap/themed/templates/index.html.slim +3 -4
  14. data/lib/generators/railsstrap/themed/templates/new.html.slim +1 -1
  15. data/lib/generators/railsstrap/themed/templates/show.html.slim +1 -1
  16. data/lib/railsstrap/constants.rb +1 -1
  17. data/lib/railsstrap/engine.rb +4 -1
  18. data/vendor/assets/bower_components/bootstrap/Gruntfile.js +12 -42
  19. data/vendor/assets/bower_components/bootstrap/README.md +2 -2
  20. data/vendor/assets/bower_components/bootstrap/bower.json +1 -1
  21. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap-theme.css +47 -34
  22. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap-theme.css.map +1 -1
  23. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap-theme.min.css +2 -2
  24. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap.css +79 -105
  25. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap.css.map +1 -1
  26. data/vendor/assets/bower_components/bootstrap/dist/css/bootstrap.min.css +2 -2
  27. data/vendor/assets/bower_components/bootstrap/dist/js/bootstrap.js +73 -29
  28. data/vendor/assets/bower_components/bootstrap/dist/js/bootstrap.min.js +3 -3
  29. data/vendor/assets/bower_components/bootstrap/grunt/configBridge.json +44 -0
  30. data/vendor/assets/bower_components/bootstrap/js/affix.js +2 -2
  31. data/vendor/assets/bower_components/bootstrap/js/alert.js +2 -2
  32. data/vendor/assets/bower_components/bootstrap/js/button.js +3 -3
  33. data/vendor/assets/bower_components/bootstrap/js/carousel.js +3 -2
  34. data/vendor/assets/bower_components/bootstrap/js/collapse.js +2 -2
  35. data/vendor/assets/bower_components/bootstrap/js/dropdown.js +3 -3
  36. data/vendor/assets/bower_components/bootstrap/js/modal.js +48 -5
  37. data/vendor/assets/bower_components/bootstrap/js/popover.js +2 -2
  38. data/vendor/assets/bower_components/bootstrap/js/scrollspy.js +2 -2
  39. data/vendor/assets/bower_components/bootstrap/js/tab.js +2 -2
  40. data/vendor/assets/bower_components/bootstrap/js/tooltip.js +2 -2
  41. data/vendor/assets/bower_components/bootstrap/js/transition.js +1 -1
  42. data/vendor/assets/bower_components/bootstrap/less/badges.less +7 -1
  43. data/vendor/assets/bower_components/bootstrap/less/button-groups.less +0 -4
  44. data/vendor/assets/bower_components/bootstrap/less/forms.less +19 -32
  45. data/vendor/assets/bower_components/bootstrap/less/jumbotron.less +2 -1
  46. data/vendor/assets/bower_components/bootstrap/less/list-group.less +0 -8
  47. data/vendor/assets/bower_components/bootstrap/less/mixins/grid-framework.less +2 -2
  48. data/vendor/assets/bower_components/bootstrap/less/modals.less +1 -2
  49. data/vendor/assets/bower_components/bootstrap/less/navbar.less +1 -0
  50. data/vendor/assets/bower_components/bootstrap/less/popovers.less +1 -0
  51. data/vendor/assets/bower_components/bootstrap/less/theme.less +12 -0
  52. data/vendor/assets/bower_components/bootstrap/less/tooltip.less +12 -4
  53. data/vendor/assets/bower_components/bootstrap/less/variables.less +1 -1
  54. data/vendor/assets/bower_components/bootstrap/package.json +4 -4
  55. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/CONTRIBUTING.md +32 -0
  56. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/Gruntfile.js +155 -0
  57. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/LICENSE +21 -0
  58. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/README.md +17 -0
  59. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/bower.json +35 -0
  60. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css +238 -0
  61. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.min.css +5 -0
  62. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js +1 -0
  63. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/component.json +10 -0
  64. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/composer.json +30 -0
  65. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/package.json +35 -0
  66. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js +1384 -0
  67. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less +5 -0
  68. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less +294 -0
  69. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/nuget/Bootstrap.v3.Datetimepicker.CSS.nuspec +30 -0
  70. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/nuget/Bootstrap.v3.Datetimepicker.nuspec +30 -0
  71. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/nuget/NuGet.exe +0 -0
  72. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/src/nuget/install.ps1 +2 -0
  73. data/vendor/assets/bower_components/eonasdan-bootstrap-datetimepicker/tasks/bump_version.js +88 -0
  74. data/vendor/assets/bower_components/moment/CHANGELOG.md +402 -0
  75. data/vendor/assets/bower_components/moment/LICENSE +22 -0
  76. data/vendor/assets/bower_components/moment/README.md +39 -0
  77. data/vendor/assets/bower_components/moment/benchmarks/clone.js +10 -0
  78. data/vendor/assets/bower_components/moment/bower.json +20 -0
  79. data/vendor/assets/bower_components/moment/locale/af.js +67 -0
  80. data/vendor/assets/bower_components/moment/locale/ar-ma.js +57 -0
  81. data/vendor/assets/bower_components/moment/locale/ar-sa.js +97 -0
  82. data/vendor/assets/bower_components/moment/locale/ar.js +130 -0
  83. data/vendor/assets/bower_components/moment/locale/az.js +103 -0
  84. data/vendor/assets/bower_components/moment/locale/be.js +152 -0
  85. data/vendor/assets/bower_components/moment/locale/bg.js +88 -0
  86. data/vendor/assets/bower_components/moment/locale/bn.js +107 -0
  87. data/vendor/assets/bower_components/moment/locale/bo.js +104 -0
  88. data/vendor/assets/bower_components/moment/locale/br.js +109 -0
  89. data/vendor/assets/bower_components/moment/locale/bs.js +140 -0
  90. data/vendor/assets/bower_components/moment/locale/ca.js +77 -0
  91. data/vendor/assets/bower_components/moment/locale/cs.js +157 -0
  92. data/vendor/assets/bower_components/moment/locale/cv.js +61 -0
  93. data/vendor/assets/bower_components/moment/locale/cy.js +79 -0
  94. data/vendor/assets/bower_components/moment/locale/da.js +58 -0
  95. data/vendor/assets/bower_components/moment/locale/de-at.js +74 -0
  96. data/vendor/assets/bower_components/moment/locale/de.js +73 -0
  97. data/vendor/assets/bower_components/moment/locale/el.js +94 -0
  98. data/vendor/assets/bower_components/moment/locale/en-au.js +64 -0
  99. data/vendor/assets/bower_components/moment/locale/en-ca.js +61 -0
  100. data/vendor/assets/bower_components/moment/locale/en-gb.js +65 -0
  101. data/vendor/assets/bower_components/moment/locale/eo.js +67 -0
  102. data/vendor/assets/bower_components/moment/locale/es.js +77 -0
  103. data/vendor/assets/bower_components/moment/locale/et.js +78 -0
  104. data/vendor/assets/bower_components/moment/locale/eu.js +62 -0
  105. data/vendor/assets/bower_components/moment/locale/fa.js +99 -0
  106. data/vendor/assets/bower_components/moment/locale/fi.js +107 -0
  107. data/vendor/assets/bower_components/moment/locale/fo.js +58 -0
  108. data/vendor/assets/bower_components/moment/locale/fr-ca.js +56 -0
  109. data/vendor/assets/bower_components/moment/locale/fr.js +60 -0
  110. data/vendor/assets/bower_components/moment/locale/gl.js +73 -0
  111. data/vendor/assets/bower_components/moment/locale/he.js +78 -0
  112. data/vendor/assets/bower_components/moment/locale/hi.js +106 -0
  113. data/vendor/assets/bower_components/moment/locale/hr.js +141 -0
  114. data/vendor/assets/bower_components/moment/locale/hu.js +107 -0
  115. data/vendor/assets/bower_components/moment/locale/hy-am.js +114 -0
  116. data/vendor/assets/bower_components/moment/locale/id.js +68 -0
  117. data/vendor/assets/bower_components/moment/locale/is.js +126 -0
  118. data/vendor/assets/bower_components/moment/locale/it.js +68 -0
  119. data/vendor/assets/bower_components/moment/locale/ja.js +59 -0
  120. data/vendor/assets/bower_components/moment/locale/ka.js +109 -0
  121. data/vendor/assets/bower_components/moment/locale/km.js +56 -0
  122. data/vendor/assets/bower_components/moment/locale/ko.js +65 -0
  123. data/vendor/assets/bower_components/moment/locale/lb.js +139 -0
  124. data/vendor/assets/bower_components/moment/locale/lt.js +120 -0
  125. data/vendor/assets/bower_components/moment/locale/lv.js +79 -0
  126. data/vendor/assets/bower_components/moment/locale/mk.js +88 -0
  127. data/vendor/assets/bower_components/moment/locale/ml.js +65 -0
  128. data/vendor/assets/bower_components/moment/locale/mr.js +105 -0
  129. data/vendor/assets/bower_components/moment/locale/ms-my.js +67 -0
  130. data/vendor/assets/bower_components/moment/locale/my.js +89 -0
  131. data/vendor/assets/bower_components/moment/locale/nb.js +59 -0
  132. data/vendor/assets/bower_components/moment/locale/ne.js +106 -0
  133. data/vendor/assets/bower_components/moment/locale/nl.js +69 -0
  134. data/vendor/assets/bower_components/moment/locale/nn.js +58 -0
  135. data/vendor/assets/bower_components/moment/locale/pl.js +100 -0
  136. data/vendor/assets/bower_components/moment/locale/pt-br.js +58 -0
  137. data/vendor/assets/bower_components/moment/locale/pt.js +62 -0
  138. data/vendor/assets/bower_components/moment/locale/ro.js +73 -0
  139. data/vendor/assets/bower_components/moment/locale/ru.js +176 -0
  140. data/vendor/assets/bower_components/moment/locale/sk.js +158 -0
  141. data/vendor/assets/bower_components/moment/locale/sl.js +146 -0
  142. data/vendor/assets/bower_components/moment/locale/sq.js +63 -0
  143. data/vendor/assets/bower_components/moment/locale/sr-cyrl.js +107 -0
  144. data/vendor/assets/bower_components/moment/locale/sr.js +107 -0
  145. data/vendor/assets/bower_components/moment/locale/sv.js +65 -0
  146. data/vendor/assets/bower_components/moment/locale/ta.js +114 -0
  147. data/vendor/assets/bower_components/moment/locale/th.js +59 -0
  148. data/vendor/assets/bower_components/moment/locale/tl-ph.js +60 -0
  149. data/vendor/assets/bower_components/moment/locale/tr.js +94 -0
  150. data/vendor/assets/bower_components/moment/locale/tzm-latn.js +56 -0
  151. data/vendor/assets/bower_components/moment/locale/tzm.js +56 -0
  152. data/vendor/assets/bower_components/moment/locale/uk.js +159 -0
  153. data/vendor/assets/bower_components/moment/locale/uz.js +56 -0
  154. data/vendor/assets/bower_components/moment/locale/vi.js +64 -0
  155. data/vendor/assets/bower_components/moment/locale/zh-cn.js +110 -0
  156. data/vendor/assets/bower_components/moment/locale/zh-tw.js +86 -0
  157. data/vendor/assets/bower_components/moment/min/locales.js +7001 -0
  158. data/vendor/assets/bower_components/moment/min/locales.min.js +4 -0
  159. data/vendor/assets/bower_components/moment/min/moment-with-locales.js +9394 -0
  160. data/vendor/assets/bower_components/moment/min/moment-with-locales.min.js +10 -0
  161. data/vendor/assets/bower_components/moment/min/moment.min.js +7 -0
  162. data/vendor/assets/bower_components/moment/moment.js +2936 -0
  163. data/vendor/assets/bower_components/moment/scripts/npm_prepublish.sh +43 -0
  164. data/vendor/assets/javascripts/datepicker/datepicker.js +3 -0
  165. data/vendor/assets/stylesheets/datepicker/datepicker.js +0 -0
  166. data/vendor/assets/stylesheets/datepicker/datepicker.less +1 -0
  167. data/vendor/assets/stylesheets/dist/railsstrap.css +240 -18
  168. data/vendor/assets/stylesheets/fontawesome.less +2 -0
  169. metadata +116 -16
@@ -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.
@@ -44,11 +44,17 @@
44
44
  }
45
45
 
46
46
  // Account for badges in navs
47
- a.list-group-item.active > &,
47
+ .list-group-item.active > &,
48
48
  .nav-pills > .active > a > & {
49
49
  color: @badge-active-color;
50
50
  background-color: @badge-active-bg;
51
51
  }
52
+ .list-group-item > & {
53
+ float: right;
54
+ }
55
+ .list-group-item > & + & {
56
+ margin-right: 5px;
57
+ }
52
58
  .nav-pills > li > a > & {
53
59
  margin-left: 3px;
54
60
  }
@@ -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
 
@@ -168,41 +168,28 @@ input[type="search"] {
168
168
  // Special styles for iOS temporal inputs
169
169
  //
170
170
  // In Mobile Safari, setting `display: block` on temporal inputs causes the
171
- // text within the input to become vertically misaligned.
172
- // As a workaround, we set a pixel line-height that matches the
173
- // given height of the input. Since this fucks up everything else, we have to
174
- // appropriately reset it for Internet Explorer and the size variations.
175
-
176
- input[type="date"],
177
- input[type="time"],
178
- input[type="datetime-local"],
179
- input[type="month"] {
180
- line-height: @input-height-base;
181
- // IE8+ misaligns the text within date inputs, so we reset
182
- line-height: @line-height-base ~"\0";
183
-
184
- &.input-sm {
171
+ // text within the input to become vertically misaligned. As a workaround, we
172
+ // set a pixel line-height that matches the given height of the input, but only
173
+ // for Safari.
174
+
175
+ @media screen and (-webkit-min-device-pixel-ratio: 0) {
176
+ input[type="date"],
177
+ input[type="time"],
178
+ input[type="datetime-local"],
179
+ input[type="month"] {
180
+ line-height: @input-height-base;
181
+ }
182
+ input[type="date"].input-sm,
183
+ input[type="time"].input-sm,
184
+ input[type="datetime-local"].input-sm,
185
+ input[type="month"].input-sm {
185
186
  line-height: @input-height-small;
186
- line-height: @line-height-small ~"\0";
187
187
  }
188
- &.input-lg {
188
+ input[type="date"].input-lg,
189
+ input[type="time"].input-lg,
190
+ input[type="datetime-local"].input-lg,
191
+ input[type="month"].input-lg {
189
192
  line-height: @input-height-large;
190
- line-height: @line-height-large ~"\0";
191
- }
192
- }
193
-
194
- // IE 11 hack to reverse the iOS temporal input hack.
195
- _:-ms-fullscreen, :root input[type="date"],
196
- _:-ms-fullscreen, :root input[type="time"],
197
- _:-ms-fullscreen, :root input[type="datetime-local"],
198
- _:-ms-fullscreen, :root input[type="month"] {
199
- line-height: @line-height-base;
200
-
201
- &.input-sm {
202
- line-height: @line-height-small;
203
- }
204
- &.input-lg {
205
- line-height: @line-height-large;
206
193
  }
207
194
  }
208
195
 
@@ -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
  .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
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  .make-grid-columns() {
7
7
  // Common styles for all sizes of grid columns, widths 1-12
8
- .col(@index) when (@index = 1) { // initial
8
+ .col(@index) { // initial
9
9
  @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
10
10
  .col((@index + 1), @item);
11
11
  }
@@ -27,7 +27,7 @@
27
27
  }
28
28
 
29
29
  .float-grid-columns(@class) {
30
- .col(@index) when (@index = 1) { // initial
30
+ .col(@index) { // initial
31
31
  @item: ~".col-@{class}-@{index}";
32
32
  .col((@index + 1), @item);
33
33
  }
@@ -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
+ .border-top-radius(@navbar-border-radius);
334
335
  .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
+ #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
  .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
  }