bootstrap-generators 3.0.2.2 → 3.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (98) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +2 -2
  3. data/Rakefile +7 -6
  4. data/bootstrap-generators.gemspec +1 -1
  5. data/lib/bootstrap/generators/version.rb +1 -1
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +354 -164
  7. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +359 -165
  8. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +3 -3
  9. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +3 -3
  10. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.slim +3 -3
  11. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +1 -0
  12. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +1 -0
  13. data/lib/generators/bootstrap/install/templates/layouts/starter.html.slim +2 -0
  14. data/readme-template.md.erb +14 -0
  15. data/vendor/assets/fonts/{glyphicons-halflings-regular.eot → bootstrap/glyphicons-halflings-regular.eot} +0 -0
  16. data/vendor/assets/fonts/{glyphicons-halflings-regular.svg → bootstrap/glyphicons-halflings-regular.svg} +0 -0
  17. data/vendor/assets/fonts/{glyphicons-halflings-regular.ttf → bootstrap/glyphicons-halflings-regular.ttf} +0 -0
  18. data/vendor/assets/fonts/{glyphicons-halflings-regular.woff → bootstrap/glyphicons-halflings-regular.woff} +0 -0
  19. data/vendor/assets/javascripts/bootstrap/affix.js +34 -23
  20. data/vendor/assets/javascripts/bootstrap/alert.js +5 -15
  21. data/vendor/assets/javascripts/bootstrap/button.js +24 -26
  22. data/vendor/assets/javascripts/bootstrap/carousel.js +20 -32
  23. data/vendor/assets/javascripts/bootstrap/collapse.js +7 -16
  24. data/vendor/assets/javascripts/bootstrap/dropdown.js +23 -30
  25. data/vendor/assets/javascripts/bootstrap/modal.js +25 -28
  26. data/vendor/assets/javascripts/bootstrap/popover.js +14 -21
  27. data/vendor/assets/javascripts/bootstrap/scrollspy.js +17 -22
  28. data/vendor/assets/javascripts/bootstrap/tab.js +7 -17
  29. data/vendor/assets/javascripts/bootstrap/tooltip.js +52 -39
  30. data/vendor/assets/javascripts/bootstrap/transition.js +11 -19
  31. data/vendor/assets/stylesheets/bootstrap.css +1209 -2476
  32. data/vendor/twitter/bootstrap/less/badges.less +10 -6
  33. data/vendor/twitter/bootstrap/less/breadcrumbs.less +4 -1
  34. data/vendor/twitter/bootstrap/less/button-groups.less +17 -44
  35. data/vendor/twitter/bootstrap/less/buttons.less +10 -13
  36. data/vendor/twitter/bootstrap/less/carousel.less +1 -0
  37. data/vendor/twitter/bootstrap/less/code.less +10 -0
  38. data/vendor/twitter/bootstrap/less/dropdowns.less +31 -10
  39. data/vendor/twitter/bootstrap/less/forms.less +89 -34
  40. data/vendor/twitter/bootstrap/less/glyphicons.less +5 -9
  41. data/vendor/twitter/bootstrap/less/grid.less +36 -29
  42. data/vendor/twitter/bootstrap/less/input-groups.less +40 -19
  43. data/vendor/twitter/bootstrap/less/jumbotron.less +11 -7
  44. data/vendor/twitter/bootstrap/less/labels.less +6 -0
  45. data/vendor/twitter/bootstrap/less/list-group.less +25 -3
  46. data/vendor/twitter/bootstrap/less/mixins.less +140 -72
  47. data/vendor/twitter/bootstrap/less/modals.less +18 -12
  48. data/vendor/twitter/bootstrap/less/navbar.less +65 -73
  49. data/vendor/twitter/bootstrap/less/navs.less +2 -22
  50. data/vendor/twitter/bootstrap/less/normalize.less +139 -122
  51. data/vendor/twitter/bootstrap/less/pager.less +5 -5
  52. data/vendor/twitter/bootstrap/less/pagination.less +6 -3
  53. data/vendor/twitter/bootstrap/less/panels.less +73 -15
  54. data/vendor/twitter/bootstrap/less/print.less +0 -4
  55. data/vendor/twitter/bootstrap/less/progress-bars.less +0 -12
  56. data/vendor/twitter/bootstrap/less/responsive-utilities.less +13 -129
  57. data/vendor/twitter/bootstrap/less/scaffolding.less +17 -2
  58. data/vendor/twitter/bootstrap/less/tables.less +19 -22
  59. data/vendor/twitter/bootstrap/less/theme.less +1 -1
  60. data/vendor/twitter/bootstrap/less/thumbnails.less +9 -3
  61. data/vendor/twitter/bootstrap/less/tooltip.less +1 -1
  62. data/vendor/twitter/bootstrap/less/type.less +123 -106
  63. data/vendor/twitter/bootstrap/less/variables.less +354 -164
  64. data/vendor/twitter/bootstrap/less/wells.less +1 -1
  65. data/vendor/twitter/bootstrap/sass/_badges.scss +10 -6
  66. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +4 -1
  67. data/vendor/twitter/bootstrap/sass/_button-groups.scss +15 -42
  68. data/vendor/twitter/bootstrap/sass/_buttons.scss +10 -13
  69. data/vendor/twitter/bootstrap/sass/_carousel.scss +1 -0
  70. data/vendor/twitter/bootstrap/sass/_code.scss +10 -0
  71. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +31 -11
  72. data/vendor/twitter/bootstrap/sass/_forms.scss +88 -34
  73. data/vendor/twitter/bootstrap/sass/_glyphicons.scss +5 -9
  74. data/vendor/twitter/bootstrap/sass/_grid.scss +36 -29
  75. data/vendor/twitter/bootstrap/sass/_input-groups.scss +40 -19
  76. data/vendor/twitter/bootstrap/sass/_jumbotron.scss +11 -7
  77. data/vendor/twitter/bootstrap/sass/_labels.scss +6 -0
  78. data/vendor/twitter/bootstrap/sass/_list-group.scss +25 -3
  79. data/vendor/twitter/bootstrap/sass/_mixins.scss +135 -65
  80. data/vendor/twitter/bootstrap/sass/_modals.scss +17 -11
  81. data/vendor/twitter/bootstrap/sass/_navbar.scss +62 -70
  82. data/vendor/twitter/bootstrap/sass/_navs.scss +1 -21
  83. data/vendor/twitter/bootstrap/sass/_normalize.scss +139 -122
  84. data/vendor/twitter/bootstrap/sass/_pager.scss +4 -4
  85. data/vendor/twitter/bootstrap/sass/_pagination.scss +6 -3
  86. data/vendor/twitter/bootstrap/sass/_panels.scss +72 -14
  87. data/vendor/twitter/bootstrap/sass/_print.scss +0 -4
  88. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +0 -12
  89. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +6 -124
  90. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +17 -2
  91. data/vendor/twitter/bootstrap/sass/_tables.scss +7 -18
  92. data/vendor/twitter/bootstrap/sass/_theme.scss +1 -1
  93. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +13 -7
  94. data/vendor/twitter/bootstrap/sass/_tooltip.scss +1 -1
  95. data/vendor/twitter/bootstrap/sass/_type.scss +122 -105
  96. data/vendor/twitter/bootstrap/sass/_variables.scss +359 -165
  97. data/vendor/twitter/bootstrap/sass/_wells.scss +1 -1
  98. metadata +7 -7
@@ -4,8 +4,13 @@
4
4
 
5
5
 
6
6
  // Reset the box-sizing
7
-
8
- *,
7
+ //
8
+ // Heads up! This reset may cause conflicts with some third-party widgets.
9
+ // For recommendations on resolving such conflicts, see
10
+ // http://getbootstrap.com/getting-started/#third-box-sizing
11
+ * {
12
+ .box-sizing(border-box);
13
+ }
9
14
  *:before,
10
15
  *:after {
11
16
  .box-sizing(border-box);
@@ -56,6 +61,16 @@ a {
56
61
  }
57
62
 
58
63
 
64
+ // Figures
65
+ //
66
+ // We reset this here because previously Normalize had no `figure` margins. This
67
+ // ensures we don't break anyone's use of the element.
68
+
69
+ figure {
70
+ margin: 0;
71
+ }
72
+
73
+
59
74
  // Images
60
75
 
61
76
  img {
@@ -104,10 +104,12 @@ th {
104
104
  //
105
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
106
106
 
107
- .table-striped > tbody > tr:nth-child(odd) {
108
- > td,
109
- > th {
110
- background-color: @table-bg-accent;
107
+ .table-striped {
108
+ > tbody > tr:nth-child(odd) {
109
+ > td,
110
+ > th {
111
+ background-color: @table-bg-accent;
112
+ }
111
113
  }
112
114
  }
113
115
 
@@ -116,10 +118,12 @@ th {
116
118
  //
117
119
  // Placed here since it has to come after the potential zebra striping
118
120
 
119
- .table-hover > tbody > tr:hover {
120
- > td,
121
- > th {
122
- background-color: @table-bg-hover;
121
+ .table-hover {
122
+ > tbody > tr:hover {
123
+ > td,
124
+ > th {
125
+ background-color: @table-bg-hover;
126
+ }
123
127
  }
124
128
  }
125
129
 
@@ -129,6 +133,7 @@ th {
129
133
  // Reset default table behavior
130
134
 
131
135
  table col[class*="col-"] {
136
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
132
137
  float: none;
133
138
  display: table-column;
134
139
  }
@@ -136,6 +141,7 @@ table {
136
141
  td,
137
142
  th {
138
143
  &[class*="col-"] {
144
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
139
145
  float: none;
140
146
  display: table-cell;
141
147
  }
@@ -148,21 +154,12 @@ table {
148
154
  // Exact selectors below required to override `.table-striped` and prevent
149
155
  // inheritance to nested tables.
150
156
 
151
- .table > thead > tr,
152
- .table > tbody > tr,
153
- .table > tfoot > tr {
154
- > td.active,
155
- > th.active,
156
- &.active > td,
157
- &.active > th {
158
- background-color: @table-bg-active;
159
- }
160
- }
161
-
162
157
  // Generate the contextual variants
163
- .table-row-variant(success; @state-success-bg; @state-success-border);
164
- .table-row-variant(danger; @state-danger-bg; @state-danger-border);
165
- .table-row-variant(warning; @state-warning-bg; @state-warning-border);
158
+ .table-row-variant(active; @table-bg-active);
159
+ .table-row-variant(success; @state-success-bg);
160
+ .table-row-variant(info; @state-info-bg);
161
+ .table-row-variant(warning; @state-warning-bg);
162
+ .table-row-variant(danger; @state-danger-bg);
166
163
 
167
164
 
168
165
  // Responsive tables
@@ -63,9 +63,9 @@
63
63
  .btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
64
64
  .btn-primary { .btn-styles(@btn-primary-bg); }
65
65
  .btn-success { .btn-styles(@btn-success-bg); }
66
+ .btn-info { .btn-styles(@btn-info-bg); }
66
67
  .btn-warning { .btn-styles(@btn-warning-bg); }
67
68
  .btn-danger { .btn-styles(@btn-danger-bg); }
68
- .btn-info { .btn-styles(@btn-info-bg); }
69
69
 
70
70
 
71
71
 
@@ -5,11 +5,17 @@
5
5
 
6
6
  // Mixin and adjust the regular image class
7
7
  .thumbnail {
8
- .img-thumbnail();
9
- display: block; // Override the inline-block from `.img-thumbnail`
8
+ display: block;
9
+ padding: @thumbnail-padding;
10
10
  margin-bottom: @line-height-computed;
11
+ line-height: @line-height-base;
12
+ background-color: @thumbnail-bg;
13
+ border: 1px solid @thumbnail-border;
14
+ border-radius: @thumbnail-border-radius;
15
+ .transition(all .2s ease-in-out);
11
16
 
12
- > img {
17
+ > img,
18
+ a > img {
13
19
  .img-responsive();
14
20
  margin-left: auto;
15
21
  margin-right: auto;
@@ -13,7 +13,7 @@
13
13
  line-height: 1.4;
14
14
  .opacity(0);
15
15
 
16
- &.in { .opacity(.9); }
16
+ &.in { .opacity(@tooltip-opacity); }
17
17
  &.top { margin-top: -3px; padding: @tooltip-arrow-width 0; }
18
18
  &.right { margin-left: 3px; padding: 0 @tooltip-arrow-width; }
19
19
  &.bottom { margin-top: 3px; padding: @tooltip-arrow-width 0; }
@@ -3,75 +3,6 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Body text
7
- // -------------------------
8
-
9
- p {
10
- margin: 0 0 (@line-height-computed / 2);
11
- }
12
- .lead {
13
- margin-bottom: @line-height-computed;
14
- font-size: floor(@font-size-base * 1.15);
15
- font-weight: 200;
16
- line-height: 1.4;
17
-
18
- @media (min-width: @screen-sm-min) {
19
- font-size: (@font-size-base * 1.5);
20
- }
21
- }
22
-
23
-
24
- // Emphasis & misc
25
- // -------------------------
26
-
27
- // Ex: 14px base font * 85% = about 12px
28
- small,
29
- .small { font-size: 85%; }
30
-
31
- // Undo browser default styling
32
- cite { font-style: normal; }
33
-
34
- // Contextual emphasis
35
- .text-muted {
36
- color: @text-muted;
37
- }
38
- .text-primary {
39
- color: @brand-primary;
40
- &:hover {
41
- color: darken(@brand-primary, 10%);
42
- }
43
- }
44
- .text-warning {
45
- color: @state-warning-text;
46
- &:hover {
47
- color: darken(@state-warning-text, 10%);
48
- }
49
- }
50
- .text-danger {
51
- color: @state-danger-text;
52
- &:hover {
53
- color: darken(@state-danger-text, 10%);
54
- }
55
- }
56
- .text-success {
57
- color: @state-success-text;
58
- &:hover {
59
- color: darken(@state-success-text, 10%);
60
- }
61
- }
62
- .text-info {
63
- color: @state-info-text;
64
- &:hover {
65
- color: darken(@state-info-text, 10%);
66
- }
67
- }
68
-
69
- // Alignment
70
- .text-left { text-align: left; }
71
- .text-right { text-align: right; }
72
- .text-center { text-align: center; }
73
-
74
-
75
6
  // Headings
76
7
  // -------------------------
77
8
 
@@ -90,9 +21,9 @@ h1, h2, h3, h4, h5, h6,
90
21
  }
91
22
  }
92
23
 
93
- h1,
94
- h2,
95
- h3 {
24
+ h1, .h1,
25
+ h2, .h2,
26
+ h3, .h3 {
96
27
  margin-top: @line-height-computed;
97
28
  margin-bottom: (@line-height-computed / 2);
98
29
 
@@ -101,9 +32,9 @@ h3 {
101
32
  font-size: 65%;
102
33
  }
103
34
  }
104
- h4,
105
- h5,
106
- h6 {
35
+ h4, .h4,
36
+ h5, .h5,
37
+ h6, .h6 {
107
38
  margin-top: (@line-height-computed / 2);
108
39
  margin-bottom: (@line-height-computed / 2);
109
40
 
@@ -121,6 +52,84 @@ h5, .h5 { font-size: @font-size-h5; }
121
52
  h6, .h6 { font-size: @font-size-h6; }
122
53
 
123
54
 
55
+ // Body text
56
+ // -------------------------
57
+
58
+ p {
59
+ margin: 0 0 (@line-height-computed / 2);
60
+ }
61
+
62
+ .lead {
63
+ margin-bottom: @line-height-computed;
64
+ font-size: floor((@font-size-base * 1.15));
65
+ font-weight: 200;
66
+ line-height: 1.4;
67
+
68
+ @media (min-width: @screen-sm-min) {
69
+ font-size: (@font-size-base * 1.5);
70
+ }
71
+ }
72
+
73
+
74
+ // Emphasis & misc
75
+ // -------------------------
76
+
77
+ // Ex: 14px base font * 85% = about 12px
78
+ small,
79
+ .small { font-size: 85%; }
80
+
81
+ // Undo browser default styling
82
+ cite { font-style: normal; }
83
+
84
+ // Alignment
85
+ .text-left { text-align: left; }
86
+ .text-right { text-align: right; }
87
+ .text-center { text-align: center; }
88
+ .text-justify { text-align: justify; }
89
+
90
+ // Contextual colors
91
+ .text-muted {
92
+ color: @text-muted;
93
+ }
94
+ .text-primary {
95
+ .text-emphasis-variant(@brand-primary);
96
+ }
97
+ .text-success {
98
+ .text-emphasis-variant(@state-success-text);
99
+ }
100
+ .text-info {
101
+ .text-emphasis-variant(@state-info-text);
102
+ }
103
+ .text-warning {
104
+ .text-emphasis-variant(@state-warning-text);
105
+ }
106
+ .text-danger {
107
+ .text-emphasis-variant(@state-danger-text);
108
+ }
109
+
110
+ // Contextual backgrounds
111
+ // For now we'll leave these alongside the text classes until v4 when we can
112
+ // safely shift things around (per SemVer rules).
113
+ .bg-primary {
114
+ // Given the contrast here, this is the only class to have its color inverted
115
+ // automatically.
116
+ color: #fff;
117
+ .bg-variant(@brand-primary);
118
+ }
119
+ .bg-success {
120
+ .bg-variant(@state-success-bg);
121
+ }
122
+ .bg-info {
123
+ .bg-variant(@state-info-bg);
124
+ }
125
+ .bg-warning {
126
+ .bg-variant(@state-warning-bg);
127
+ }
128
+ .bg-danger {
129
+ .bg-variant(@state-danger-bg);
130
+ }
131
+
132
+
124
133
  // Page header
125
134
  // -------------------------
126
135
 
@@ -131,7 +140,6 @@ h6, .h6 { font-size: @font-size-h6; }
131
140
  }
132
141
 
133
142
 
134
-
135
143
  // Lists
136
144
  // --------------------------------------------------
137
145
 
@@ -171,6 +179,7 @@ ol {
171
179
 
172
180
  // Description Lists
173
181
  dl {
182
+ margin-top: 0; // Remove browser default
174
183
  margin-bottom: @line-height-computed;
175
184
  }
176
185
  dt,
@@ -200,7 +209,7 @@ dd {
200
209
  }
201
210
  dd {
202
211
  margin-left: @component-offset-horizontal;
203
- .clearfix(); // Clear the floated `dt` if an empty `dd` is present
212
+ &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
204
213
  }
205
214
  }
206
215
  }
@@ -215,7 +224,7 @@ abbr[data-original-title] {
215
224
  cursor: help;
216
225
  border-bottom: 1px dotted @abbr-border-color;
217
226
  }
218
- abbr.initialism {
227
+ .initialism {
219
228
  font-size: 90%;
220
229
  text-transform: uppercase;
221
230
  }
@@ -224,43 +233,51 @@ abbr.initialism {
224
233
  blockquote {
225
234
  padding: (@line-height-computed / 2) @line-height-computed;
226
235
  margin: 0 0 @line-height-computed;
236
+ font-size: (@font-size-base * 1.25);
227
237
  border-left: 5px solid @blockquote-border-color;
228
- p {
229
- font-size: (@font-size-base * 1.25);
230
- font-weight: 300;
231
- line-height: 1.25;
232
- }
233
- p:last-child {
234
- margin-bottom: 0;
238
+
239
+ p,
240
+ ul,
241
+ ol {
242
+ &:last-child {
243
+ margin-bottom: 0;
244
+ }
235
245
  }
236
- small {
246
+
247
+ // Note: Deprecated small and .small as of v3.1.0
248
+ // Context: https://github.com/twbs/bootstrap/issues/11660
249
+ footer,
250
+ small,
251
+ .small {
237
252
  display: block;
253
+ font-size: 80%; // back to default font-size
238
254
  line-height: @line-height-base;
239
255
  color: @blockquote-small-color;
256
+
240
257
  &:before {
241
- content: '\2014 \00A0'; // EM DASH, NBSP
258
+ content: '\2014 \00A0'; // em dash, nbsp
242
259
  }
243
260
  }
261
+ }
244
262
 
245
- // Float right with text-align: right
246
- &.pull-right {
247
- padding-right: 15px;
248
- padding-left: 0;
249
- border-right: 5px solid @blockquote-border-color;
250
- border-left: 0;
251
- p,
252
- small,
253
- .small {
254
- text-align: right;
255
- }
256
- small,
257
- .small {
258
- &:before {
259
- content: '';
260
- }
261
- &:after {
262
- content: '\00A0 \2014'; // NBSP, EM DASH
263
- }
263
+ // Opposite alignment of blockquote
264
+ //
265
+ // Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.
266
+ .blockquote-reverse,
267
+ blockquote.pull-right {
268
+ padding-right: 15px;
269
+ padding-left: 0;
270
+ border-right: 5px solid @blockquote-border-color;
271
+ border-left: 0;
272
+ text-align: right;
273
+
274
+ // Account for citation
275
+ footer,
276
+ small,
277
+ .small {
278
+ &:before { content: ''; }
279
+ &:after {
280
+ content: '\00A0 \2014'; // nbsp, em dash
264
281
  }
265
282
  }
266
283
  }