bootstrap-on-rails 0.0.2 → 3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/README.md +16 -7
  4. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  5. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +47 -47
  6. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  7. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  8. data/app/assets/javascripts/bootstrap/affix.js +48 -32
  9. data/app/assets/javascripts/bootstrap/alert.js +14 -20
  10. data/app/assets/javascripts/bootstrap/button.js +34 -33
  11. data/app/assets/javascripts/bootstrap/carousel.js +60 -54
  12. data/app/assets/javascripts/bootstrap/collapse.js +27 -36
  13. data/app/assets/javascripts/bootstrap/dropdown.js +36 -39
  14. data/app/assets/javascripts/bootstrap/modal.js +90 -56
  15. data/app/assets/javascripts/bootstrap/popover.js +21 -25
  16. data/app/assets/javascripts/bootstrap/scrollspy.js +56 -44
  17. data/app/assets/javascripts/bootstrap/tab.js +17 -24
  18. data/app/assets/javascripts/bootstrap/tooltip.js +158 -87
  19. data/app/assets/javascripts/bootstrap/transition.js +24 -21
  20. data/app/assets/stylesheets/bootstrap/alerts.less +4 -3
  21. data/app/assets/stylesheets/bootstrap/badges.less +27 -23
  22. data/app/assets/stylesheets/bootstrap/bootstrap.less +3 -2
  23. data/app/assets/stylesheets/bootstrap/breadcrumbs.less +4 -1
  24. data/app/assets/stylesheets/bootstrap/button-groups.less +36 -49
  25. data/app/assets/stylesheets/bootstrap/buttons.less +16 -17
  26. data/app/assets/stylesheets/bootstrap/carousel.less +18 -6
  27. data/app/assets/stylesheets/bootstrap/close.less +0 -0
  28. data/app/assets/stylesheets/bootstrap/code.less +16 -1
  29. data/app/assets/stylesheets/bootstrap/component-animations.less +6 -4
  30. data/app/assets/stylesheets/bootstrap/dropdowns.less +33 -10
  31. data/app/assets/stylesheets/bootstrap/forms.less +236 -60
  32. data/app/assets/stylesheets/bootstrap/glyphicons.less +5 -9
  33. data/app/assets/stylesheets/bootstrap/grid.less +40 -49
  34. data/app/assets/stylesheets/bootstrap/input-groups.less +51 -21
  35. data/app/assets/stylesheets/bootstrap/jumbotron.less +15 -7
  36. data/app/assets/stylesheets/bootstrap/labels.less +7 -1
  37. data/app/assets/stylesheets/bootstrap/list-group.less +47 -4
  38. data/app/assets/stylesheets/bootstrap/media.less +0 -0
  39. data/app/assets/stylesheets/bootstrap/mixins.less +35 -854
  40. data/app/assets/stylesheets/bootstrap/mixins/alerts.less +14 -0
  41. data/app/assets/stylesheets/bootstrap/mixins/background-variant.less +8 -0
  42. data/app/assets/stylesheets/bootstrap/mixins/border-radius.less +18 -0
  43. data/app/assets/stylesheets/bootstrap/mixins/buttons.less +50 -0
  44. data/app/assets/stylesheets/bootstrap/mixins/center-block.less +7 -0
  45. data/app/assets/stylesheets/bootstrap/mixins/clearfix.less +22 -0
  46. data/app/assets/stylesheets/bootstrap/mixins/forms.less +81 -0
  47. data/app/assets/stylesheets/bootstrap/mixins/gradients.less +59 -0
  48. data/app/assets/stylesheets/bootstrap/mixins/grid-framework.less +91 -0
  49. data/app/assets/stylesheets/bootstrap/mixins/grid.less +122 -0
  50. data/app/assets/stylesheets/bootstrap/mixins/hide-text.less +21 -0
  51. data/app/assets/stylesheets/bootstrap/mixins/image.less +34 -0
  52. data/app/assets/stylesheets/bootstrap/mixins/labels.less +12 -0
  53. data/app/assets/stylesheets/bootstrap/mixins/list-group.less +29 -0
  54. data/app/assets/stylesheets/bootstrap/mixins/nav-divider.less +10 -0
  55. data/app/assets/stylesheets/bootstrap/mixins/nav-vertical-align.less +9 -0
  56. data/app/assets/stylesheets/bootstrap/mixins/opacity.less +8 -0
  57. data/app/assets/stylesheets/bootstrap/mixins/pagination.less +23 -0
  58. data/app/assets/stylesheets/bootstrap/mixins/panels.less +24 -0
  59. data/app/assets/stylesheets/bootstrap/mixins/progress-bar.less +10 -0
  60. data/app/assets/stylesheets/bootstrap/mixins/reset-filter.less +8 -0
  61. data/app/assets/stylesheets/bootstrap/mixins/resize.less +6 -0
  62. data/app/assets/stylesheets/bootstrap/mixins/responsive-visibility.less +15 -0
  63. data/app/assets/stylesheets/bootstrap/mixins/size.less +10 -0
  64. data/app/assets/stylesheets/bootstrap/mixins/tab-focus.less +9 -0
  65. data/app/assets/stylesheets/bootstrap/mixins/table-row.less +28 -0
  66. data/app/assets/stylesheets/bootstrap/mixins/text-emphasis.less +8 -0
  67. data/app/assets/stylesheets/bootstrap/mixins/text-overflow.less +8 -0
  68. data/app/assets/stylesheets/bootstrap/mixins/vendor-prefixes.less +224 -0
  69. data/app/assets/stylesheets/bootstrap/modals.less +38 -20
  70. data/app/assets/stylesheets/bootstrap/navbar.less +103 -72
  71. data/app/assets/stylesheets/bootstrap/navs.less +3 -23
  72. data/app/assets/stylesheets/bootstrap/normalize.less +153 -134
  73. data/app/assets/stylesheets/bootstrap/pager.less +5 -5
  74. data/app/assets/stylesheets/bootstrap/pagination.less +6 -3
  75. data/app/assets/stylesheets/bootstrap/panels.less +117 -46
  76. data/app/assets/stylesheets/bootstrap/popovers.less +12 -12
  77. data/app/assets/stylesheets/bootstrap/print.less +0 -4
  78. data/app/assets/stylesheets/bootstrap/progress-bars.less +27 -14
  79. data/app/assets/stylesheets/bootstrap/responsive-embed.less +34 -0
  80. data/app/assets/stylesheets/bootstrap/responsive-utilities.less +109 -124
  81. data/app/assets/stylesheets/bootstrap/scaffolding.less +34 -3
  82. data/app/assets/stylesheets/bootstrap/tables.less +23 -26
  83. data/app/assets/stylesheets/bootstrap/theme.less +12 -1
  84. data/app/assets/stylesheets/bootstrap/thumbnails.less +10 -4
  85. data/app/assets/stylesheets/bootstrap/tooltip.less +1 -1
  86. data/app/assets/stylesheets/bootstrap/type.less +151 -117
  87. data/app/assets/stylesheets/bootstrap/utilities.less +1 -0
  88. data/app/assets/stylesheets/bootstrap/variables.less +399 -190
  89. data/app/assets/stylesheets/bootstrap/wells.less +1 -1
  90. data/bootstrap-on-rails.gemspec +1 -1
  91. data/lib/bootstrap-on-rails/version.rb +1 -1
  92. metadata +33 -3
@@ -1,24 +1,14 @@
1
1
  /* ========================================================================
2
- * Bootstrap: transition.js v3.0.2
2
+ * Bootstrap: transition.js v3.2.0
3
3
  * http://getbootstrap.com/javascript/#transitions
4
4
  * ========================================================================
5
- * Copyright 2013 Twitter, Inc.
6
- *
7
- * Licensed under the Apache License, Version 2.0 (the "License");
8
- * you may not use this file except in compliance with the License.
9
- * You may obtain a copy of the License at
10
- *
11
- * http://www.apache.org/licenses/LICENSE-2.0
12
- *
13
- * Unless required by applicable law or agreed to in writing, software
14
- * distributed under the License is distributed on an "AS IS" BASIS,
15
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16
- * See the License for the specific language governing permissions and
17
- * limitations under the License.
5
+ * Copyright 2011-2014 Twitter, Inc.
6
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
18
7
  * ======================================================================== */
19
8
 
20
9
 
21
- +function ($) { "use strict";
10
+ +function ($) {
11
+ 'use strict';
22
12
 
23
13
  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
24
14
  // ============================================================
@@ -27,10 +17,10 @@
27
17
  var el = document.createElement('bootstrap')
28
18
 
29
19
  var transEndEventNames = {
30
- 'WebkitTransition' : 'webkitTransitionEnd'
31
- , 'MozTransition' : 'transitionend'
32
- , 'OTransition' : 'oTransitionEnd otransitionend'
33
- , 'transition' : 'transitionend'
20
+ WebkitTransition : 'webkitTransitionEnd',
21
+ MozTransition : 'transitionend',
22
+ OTransition : 'oTransitionEnd otransitionend',
23
+ transition : 'transitionend'
34
24
  }
35
25
 
36
26
  for (var name in transEndEventNames) {
@@ -38,12 +28,15 @@
38
28
  return { end: transEndEventNames[name] }
39
29
  }
40
30
  }
31
+
32
+ return false // explicit for ie8 ( ._.)
41
33
  }
42
34
 
43
35
  // http://blog.alexmaccaw.com/css-transitions
44
36
  $.fn.emulateTransitionEnd = function (duration) {
45
- var called = false, $el = this
46
- $(this).one($.support.transition.end, function () { called = true })
37
+ var called = false
38
+ var $el = this
39
+ $(this).one('bsTransitionEnd', function () { called = true })
47
40
  var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
48
41
  setTimeout(callback, duration)
49
42
  return this
@@ -51,6 +44,16 @@
51
44
 
52
45
  $(function () {
53
46
  $.support.transition = transitionEnd()
47
+
48
+ if (!$.support.transition) return
49
+
50
+ $.event.special.bsTransitionEnd = {
51
+ bindType: $.support.transition.end,
52
+ delegateType: $.support.transition.end,
53
+ handle: function (e) {
54
+ if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
55
+ }
56
+ }
54
57
  })
55
58
 
56
59
  }(jQuery);
@@ -33,12 +33,13 @@
33
33
  }
34
34
  }
35
35
 
36
- // Dismissable alerts
36
+ // Dismissible alerts
37
37
  //
38
38
  // Expand the right padding and account for the close button's positioning.
39
39
 
40
- .alert-dismissable {
41
- padding-right: (@alert-padding + 20);
40
+ .alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.
41
+ .alert-dismissible {
42
+ padding-right: (@alert-padding + 20);
42
43
 
43
44
  // Adjust close link position
44
45
  .close {
@@ -3,7 +3,7 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Base classes
6
+ // Base class
7
7
  .badge {
8
8
  display: inline-block;
9
9
  min-width: 10px;
@@ -22,30 +22,34 @@
22
22
  &:empty {
23
23
  display: none;
24
24
  }
25
- }
26
25
 
27
- // Hover state, but only for links
28
- a.badge {
29
- &:hover,
30
- &:focus {
31
- color: @badge-link-hover-color;
32
- text-decoration: none;
33
- cursor: pointer;
26
+ // Quick fix for badges in buttons
27
+ .btn & {
28
+ position: relative;
29
+ top: -1px;
30
+ }
31
+ .btn-xs & {
32
+ top: 0;
33
+ padding: 1px 5px;
34
34
  }
35
- }
36
35
 
37
- // Quick fix for labels/badges in buttons
38
- .btn .badge {
39
- position: relative;
40
- top: -1px;
41
- }
36
+ // Hover state, but only for links
37
+ a& {
38
+ &:hover,
39
+ &:focus {
40
+ color: @badge-link-hover-color;
41
+ text-decoration: none;
42
+ cursor: pointer;
43
+ }
44
+ }
42
45
 
43
- // Account for counters in navs
44
- a.list-group-item.active > .badge,
45
- .nav-pills > .active > a > .badge {
46
- color: @badge-active-color;
47
- background-color: @badge-active-bg;
48
- }
49
- .nav-pills > li > a > .badge {
50
- margin-left: 3px;
46
+ // Account for badges in navs
47
+ a.list-group-item.active > &,
48
+ .nav-pills > .active > a > & {
49
+ color: @badge-active-color;
50
+ background-color: @badge-active-bg;
51
+ }
52
+ .nav-pills > li > a > & {
53
+ margin-left: 3px;
54
+ }
51
55
  }
@@ -1,9 +1,10 @@
1
1
  // Core variables and mixins
2
2
  @import "mixins.less";
3
3
 
4
- // Reset
4
+ // Reset and dependencies
5
5
  @import "normalize.less";
6
6
  @import "print.less";
7
+ @import "glyphicons.less";
7
8
 
8
9
  // Core CSS
9
10
  @import "scaffolding.less";
@@ -16,7 +17,6 @@
16
17
 
17
18
  // Components
18
19
  @import "component-animations.less";
19
- @import "glyphicons.less";
20
20
  @import "dropdowns.less";
21
21
  @import "button-groups.less";
22
22
  @import "input-groups.less";
@@ -34,6 +34,7 @@
34
34
  @import "media.less";
35
35
  @import "list-group.less";
36
36
  @import "panels.less";
37
+ @import "responsive-embed.less";
37
38
  @import "wells.less";
38
39
  @import "close.less";
39
40
 
@@ -4,19 +4,22 @@
4
4
 
5
5
 
6
6
  .breadcrumb {
7
- padding: 8px 15px;
7
+ padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;
8
8
  margin-bottom: @line-height-computed;
9
9
  list-style: none;
10
10
  background-color: @breadcrumb-bg;
11
11
  border-radius: @border-radius-base;
12
+
12
13
  > li {
13
14
  display: inline-block;
15
+
14
16
  + li:before {
15
17
  content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
16
18
  padding: 0 5px;
17
19
  color: @breadcrumb-color;
18
20
  }
19
21
  }
22
+
20
23
  > .active {
21
24
  color: @breadcrumb-active-color;
22
25
  }
@@ -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 {
@@ -51,7 +20,7 @@
51
20
  }
52
21
  &:focus {
53
22
  // Remove focus outline when dropdown JS adds it after closing the menu
54
- outline: none;
23
+ outline: 0;
55
24
  }
56
25
  }
57
26
  }
@@ -68,18 +37,17 @@
68
37
 
69
38
  // Optional: Group multiple button groups together for a toolbar
70
39
  .btn-toolbar {
71
- .clearfix();
40
+ margin-left: -5px; // Offset the first child's margin
41
+ &:extend(.clearfix all);
72
42
 
73
- .btn-group {
43
+ .btn-group,
44
+ .input-group {
74
45
  float: left;
75
46
  }
76
- // Space out series of button groups
77
47
  > .btn,
78
- > .btn-group {
79
- + .btn,
80
- + .btn-group {
81
- margin-left: 5px;
82
- }
48
+ > .btn-group,
49
+ > .input-group {
50
+ margin-left: 5px;
83
51
  }
84
52
  }
85
53
 
@@ -128,9 +96,9 @@
128
96
  //
129
97
  // Remix the default button sizing classes into new ones for easier manipulation.
130
98
 
131
- .btn-group-xs > .btn { .btn-xs(); }
132
- .btn-group-sm > .btn { .btn-sm(); }
133
- .btn-group-lg > .btn { .btn-lg(); }
99
+ .btn-group-xs > .btn { &:extend(.btn-xs); }
100
+ .btn-group-sm > .btn { &:extend(.btn-sm); }
101
+ .btn-group-lg > .btn { &:extend(.btn-lg); }
134
102
 
135
103
 
136
104
  // Split button dropdowns
@@ -178,7 +146,8 @@
178
146
 
179
147
  .btn-group-vertical {
180
148
  > .btn,
181
- > .btn-group {
149
+ > .btn-group,
150
+ > .btn-group > .btn {
182
151
  display: block;
183
152
  float: none;
184
153
  width: 100%;
@@ -187,7 +156,7 @@
187
156
 
188
157
  // Clear floats so dropdown menus can be properly placed
189
158
  > .btn-group {
190
- .clearfix();
159
+ &:extend(.clearfix all);
191
160
  > .btn {
192
161
  float: none;
193
162
  }
@@ -218,13 +187,13 @@
218
187
  .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
219
188
  border-radius: 0;
220
189
  }
221
- .btn-group-vertical > .btn-group:first-child {
190
+ .btn-group-vertical > .btn-group:first-child:not(:last-child) {
222
191
  > .btn:last-child,
223
192
  > .dropdown-toggle {
224
193
  .border-bottom-radius(0);
225
194
  }
226
195
  }
227
- .btn-group-vertical > .btn-group:last-child > .btn:first-child {
196
+ .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
228
197
  .border-top-radius(0);
229
198
  }
230
199
 
@@ -238,16 +207,34 @@
238
207
  width: 100%;
239
208
  table-layout: fixed;
240
209
  border-collapse: separate;
241
- .btn {
210
+ > .btn,
211
+ > .btn-group {
242
212
  float: none;
243
213
  display: table-cell;
244
214
  width: 1%;
245
215
  }
216
+ > .btn-group .btn {
217
+ width: 100%;
218
+ }
219
+
220
+ > .btn-group .dropdown-menu {
221
+ left: auto;
222
+ }
246
223
  }
247
224
 
248
225
 
249
226
  // Checkbox and radio options
227
+ //
228
+ // In order to support the browser's form validation feedback, powered by the
229
+ // `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
230
+ // use `display: none;` or `visibility: hidden;` as that also hides the popover.
231
+ // This way, we ensure a DOM element is visible to position the popover from.
232
+ //
233
+ // See https://github.com/twbs/bootstrap/pull/12794 for more.
234
+
250
235
  [data-toggle="buttons"] > .btn > input[type="radio"],
251
236
  [data-toggle="buttons"] > .btn > input[type="checkbox"] {
252
- display: none;
237
+ position: absolute;
238
+ z-index: -1;
239
+ .opacity(0);
253
240
  }
@@ -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
@@ -20,8 +19,12 @@
20
19
  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
21
20
  .user-select(none);
22
21
 
23
- &:focus {
24
- .tab-focus();
22
+ &,
23
+ &:active,
24
+ &.active {
25
+ &:focus {
26
+ .tab-focus();
27
+ }
25
28
  }
26
29
 
27
30
  &:hover,
@@ -45,7 +48,6 @@
45
48
  .opacity(.65);
46
49
  .box-shadow(none);
47
50
  }
48
-
49
51
  }
50
52
 
51
53
 
@@ -58,14 +60,6 @@
58
60
  .btn-primary {
59
61
  .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
60
62
  }
61
- // Warning appears as orange
62
- .btn-warning {
63
- .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
64
- }
65
- // Danger and error appear as red
66
- .btn-danger {
67
- .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
68
- }
69
63
  // Success appears as green
70
64
  .btn-success {
71
65
  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
@@ -74,6 +68,14 @@
74
68
  .btn-info {
75
69
  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
76
70
  }
71
+ // Warning appears as orange
72
+ .btn-warning {
73
+ .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
74
+ }
75
+ // Danger and error appear as red
76
+ .btn-danger {
77
+ .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
78
+ }
77
79
 
78
80
 
79
81
  // Link buttons
@@ -123,13 +125,12 @@
123
125
  // line-height: ensure even-numbered height of button next to large input
124
126
  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
125
127
  }
126
- .btn-sm,
127
- .btn-xs {
128
+ .btn-sm {
128
129
  // line-height: ensure proper height of button next to small input
129
130
  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
130
131
  }
131
132
  .btn-xs {
132
- padding: 1px 5px;
133
+ .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
133
134
  }
134
135
 
135
136
 
@@ -139,8 +140,6 @@
139
140
  .btn-block {
140
141
  display: block;
141
142
  width: 100%;
142
- padding-left: 0;
143
- padding-right: 0;
144
143
  }
145
144
 
146
145
  // Vertically space out multiple block buttons