twitter-bootstrap-rails 3.2.0 → 5.0.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of twitter-bootstrap-rails might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/README.md +263 -247
- data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.svg +273 -214
- data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff2 +0 -0
- data/app/assets/javascripts/twitter/bootstrap/affix.js +60 -35
- data/app/assets/javascripts/twitter/bootstrap/alert.js +15 -9
- data/app/assets/javascripts/twitter/bootstrap/button.js +33 -20
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +79 -47
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +84 -43
- data/app/assets/javascripts/twitter/bootstrap/dropdown.js +65 -47
- data/app/assets/javascripts/twitter/bootstrap/modal.js +138 -44
- data/app/assets/javascripts/twitter/bootstrap/popover.js +12 -14
- data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +57 -38
- data/app/assets/javascripts/twitter/bootstrap/tab.js +54 -24
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +202 -87
- data/app/assets/javascripts/twitter/bootstrap/transition.js +19 -8
- data/app/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +1 -1
- data/app/assets/stylesheets/twitter-bootstrap-static/sprites.css.erb +1 -1
- data/app/helpers/bootstrap_flash_helper.rb +8 -3
- data/app/helpers/form_errors_helper.rb +11 -11
- data/app/helpers/glyph_helper.rb +7 -3
- data/app/helpers/modal_helper.rb +9 -13
- data/app/helpers/navbar_helper.rb +5 -2
- data/app/helpers/twitter_breadcrumbs_helper.rb +4 -1
- data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +5 -5
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.css +3 -4
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +7 -15
- data/lib/generators/bootstrap/layout/templates/layout.html.erb +5 -5
- data/lib/generators/bootstrap/layout/templates/layout.html.haml +3 -3
- data/lib/generators/bootstrap/layout/templates/layout.html.slim +3 -5
- data/lib/generators/bootstrap/themed/templates/_form.html.erb +12 -9
- data/lib/generators/bootstrap/themed/templates/_form.html.haml +7 -5
- data/lib/generators/bootstrap/themed/templates/_form.html.slim +8 -6
- data/lib/generators/bootstrap/themed/templates/edit.html.slim +1 -1
- data/lib/generators/bootstrap/themed/templates/index.html.erb +2 -0
- data/lib/generators/bootstrap/themed/templates/index.html.haml +1 -0
- data/lib/generators/bootstrap/themed/templates/index.html.slim +4 -3
- data/lib/generators/bootstrap/themed/templates/new.html.slim +1 -1
- data/lib/generators/bootstrap/themed/templates/show.html.slim +1 -1
- data/lib/generators/bootstrap/themed/templates/simple_form/_form.html.haml +1 -1
- data/lib/twitter/bootstrap/rails/breadcrumbs.rb +24 -13
- data/lib/twitter/bootstrap/rails/engine.rb +17 -12
- data/lib/twitter/bootstrap/rails/version.rb +1 -1
- data/spec/lib/breadcrumbs_spec.rb +42 -17
- data/spec/lib/twitter_bootstrap_rails/badge_label_helper_spec.rb +10 -4
- data/spec/lib/twitter_bootstrap_rails/bootstrap_flash_helper_spec.rb +128 -0
- data/spec/lib/twitter_bootstrap_rails/form_errors_helper_spec.rb +148 -0
- data/spec/lib/twitter_bootstrap_rails/glyph_helper_spec.rb +24 -0
- data/spec/lib/twitter_bootstrap_rails/modal_helper_spec.rb +2 -2
- data/spec/lib/twitter_bootstrap_rails/navbar_helper_spec.rb +62 -12
- data/spec/spec_helper.rb +5 -1
- data/vendor/assets/stylesheets/twitter-bootstrap-static/bootstrap.css.erb +1 -3
- data/vendor/toolkit/twitter/bootstrap/alerts.less +5 -0
- data/vendor/toolkit/twitter/bootstrap/badges.less +14 -3
- data/vendor/toolkit/twitter/bootstrap/bootstrap.less +6 -1
- data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/button-groups.less +13 -14
- data/vendor/toolkit/twitter/bootstrap/buttons.less +14 -7
- data/vendor/toolkit/twitter/bootstrap/carousel.less +34 -7
- data/vendor/toolkit/twitter/bootstrap/close.less +1 -0
- data/vendor/toolkit/twitter/bootstrap/code.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/component-animations.less +3 -1
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +9 -8
- data/vendor/toolkit/twitter/bootstrap/forms.less +110 -41
- data/vendor/toolkit/twitter/bootstrap/glyphicons.less +75 -3
- data/vendor/toolkit/twitter/bootstrap/grid.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/input-groups.less +8 -3
- data/vendor/toolkit/twitter/bootstrap/jumbotron.less +10 -4
- data/vendor/toolkit/twitter/bootstrap/labels.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/list-group.less +11 -13
- data/vendor/toolkit/twitter/bootstrap/media.less +40 -30
- data/vendor/toolkit/twitter/bootstrap/mixins/alerts.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/background-variant.less +2 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/border-radius.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/buttons.less +19 -6
- data/vendor/toolkit/twitter/bootstrap/mixins/center-block.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/clearfix.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/forms.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/gradients.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/grid-framework.less +4 -4
- data/vendor/toolkit/twitter/bootstrap/mixins/grid.less +4 -4
- data/vendor/toolkit/twitter/bootstrap/mixins/hide-text.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/mixins/image.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/labels.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/list-group.less +2 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/nav-divider.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/nav-vertical-align.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/opacity.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/pagination.less +2 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/panels.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/progress-bar.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/reset-filter.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/reset-text.less +18 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/resize.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/responsive-visibility.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/size.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/tab-focus.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/table-row.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/text-emphasis.less +2 -1
- data/vendor/toolkit/twitter/bootstrap/mixins/text-overflow.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/mixins/vendor-prefixes.less +8 -5
- data/vendor/toolkit/twitter/bootstrap/mixins.less +1 -0
- data/vendor/toolkit/twitter/bootstrap/modals.less +3 -3
- data/vendor/toolkit/twitter/bootstrap/navbar.less +6 -1
- data/vendor/toolkit/twitter/bootstrap/navs.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/normalize.less +12 -13
- data/vendor/toolkit/twitter/bootstrap/pager.less +1 -2
- data/vendor/toolkit/twitter/bootstrap/pagination.less +5 -4
- data/vendor/toolkit/twitter/bootstrap/panels.less +27 -4
- data/vendor/toolkit/twitter/bootstrap/popovers.less +5 -7
- data/vendor/toolkit/twitter/bootstrap/print.less +96 -96
- data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -14
- data/vendor/toolkit/twitter/bootstrap/responsive-embed.less +10 -9
- data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +0 -0
- data/vendor/toolkit/twitter/bootstrap/scaffolding.less +12 -1
- data/vendor/toolkit/twitter/bootstrap/tables.less +6 -5
- data/vendor/toolkit/twitter/bootstrap/theme.less +47 -16
- data/vendor/toolkit/twitter/bootstrap/thumbnails.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/tooltip.less +13 -7
- data/vendor/toolkit/twitter/bootstrap/type.less +2 -8
- data/vendor/toolkit/twitter/bootstrap/utilities.less +0 -1
- data/vendor/toolkit/twitter/bootstrap/variables.less +36 -14
- data/vendor/toolkit/twitter/bootstrap/wells.less +0 -0
- metadata +76 -52
- data/app/assets/fonts/fontawesome-webfont.eot +0 -0
- data/app/assets/fonts/fontawesome-webfont.svg +0 -504
- data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/app/assets/fonts/fontawesome-webfont.woff +0 -0
- data/app/assets/images/twitter/bootstrap/glyphicons-halflings-white.png +0 -0
- data/app/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
- data/app/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb +0 -4
- data/vendor/static-source/fontawesome.less +0 -8
- data/vendor/toolkit/fontawesome/bordered-pulled.less +0 -16
- data/vendor/toolkit/fontawesome/core.less +0 -12
- data/vendor/toolkit/fontawesome/fixed-width.less +0 -6
- data/vendor/toolkit/fontawesome/font-awesome.less +0 -17
- data/vendor/toolkit/fontawesome/icons.less +0 -506
- data/vendor/toolkit/fontawesome/larger.less +0 -13
- data/vendor/toolkit/fontawesome/list.less +0 -19
- data/vendor/toolkit/fontawesome/mixins.less +0 -20
- data/vendor/toolkit/fontawesome/path.less +0 -14
- data/vendor/toolkit/fontawesome/rotated-flipped.less +0 -9
- data/vendor/toolkit/fontawesome/spinning.less +0 -32
- data/vendor/toolkit/fontawesome/stacked.less +0 -20
- data/vendor/toolkit/fontawesome/variables.less +0 -515
@@ -56,7 +56,6 @@ input[type="checkbox"] {
|
|
56
56
|
line-height: normal;
|
57
57
|
}
|
58
58
|
|
59
|
-
// Set the height of file controls to match text inputs
|
60
59
|
input[type="file"] {
|
61
60
|
display: block;
|
62
61
|
}
|
@@ -123,7 +122,7 @@ output {
|
|
123
122
|
background-color: @input-bg;
|
124
123
|
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
125
124
|
border: 1px solid @input-border;
|
126
|
-
border-radius: @input-border-radius;
|
125
|
+
border-radius: @input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
|
127
126
|
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
128
127
|
.transition(~"border-color ease-in-out .15s, box-shadow ease-in-out .15s");
|
129
128
|
|
@@ -133,6 +132,12 @@ output {
|
|
133
132
|
// Placeholder
|
134
133
|
.placeholder();
|
135
134
|
|
135
|
+
// Unstyle the caret on `<select>`s in IE10+.
|
136
|
+
&::-ms-expand {
|
137
|
+
border: 0;
|
138
|
+
background-color: transparent;
|
139
|
+
}
|
140
|
+
|
136
141
|
// Disabled and read-only inputs
|
137
142
|
//
|
138
143
|
// HTML5 says that controls under a fieldset > legend:first-child won't be
|
@@ -141,9 +146,13 @@ output {
|
|
141
146
|
&[disabled],
|
142
147
|
&[readonly],
|
143
148
|
fieldset[disabled] & {
|
144
|
-
cursor: not-allowed;
|
145
149
|
background-color: @input-bg-disabled;
|
146
|
-
opacity: 1; // iOS fix for unreadable disabled content
|
150
|
+
opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655
|
151
|
+
}
|
152
|
+
|
153
|
+
&[disabled],
|
154
|
+
fieldset[disabled] & {
|
155
|
+
cursor: @cursor-disabled;
|
147
156
|
}
|
148
157
|
|
149
158
|
// Reset height for `textarea`s
|
@@ -168,26 +177,30 @@ input[type="search"] {
|
|
168
177
|
// Special styles for iOS temporal inputs
|
169
178
|
//
|
170
179
|
// In Mobile Safari, setting `display: block` on temporal inputs causes the
|
171
|
-
// text within the input to become vertically misaligned.
|
172
|
-
//
|
173
|
-
//
|
174
|
-
//
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
input[type="
|
179
|
-
input[type="
|
180
|
-
|
181
|
-
|
182
|
-
|
180
|
+
// text within the input to become vertically misaligned. As a workaround, we
|
181
|
+
// set a pixel line-height that matches the given height of the input, but only
|
182
|
+
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
|
183
|
+
//
|
184
|
+
// Note that as of 8.3, iOS doesn't support `datetime` or `week`.
|
185
|
+
|
186
|
+
@media screen and (-webkit-min-device-pixel-ratio: 0) {
|
187
|
+
input[type="date"],
|
188
|
+
input[type="time"],
|
189
|
+
input[type="datetime-local"],
|
190
|
+
input[type="month"] {
|
191
|
+
&.form-control {
|
192
|
+
line-height: @input-height-base;
|
193
|
+
}
|
183
194
|
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
195
|
+
&.input-sm,
|
196
|
+
.input-group-sm & {
|
197
|
+
line-height: @input-height-small;
|
198
|
+
}
|
199
|
+
|
200
|
+
&.input-lg,
|
201
|
+
.input-group-lg & {
|
202
|
+
line-height: @input-height-large;
|
203
|
+
}
|
191
204
|
}
|
192
205
|
}
|
193
206
|
|
@@ -198,7 +211,7 @@ input[type="month"] {
|
|
198
211
|
// horizontal forms, use the predefined grid classes.
|
199
212
|
|
200
213
|
.form-group {
|
201
|
-
margin-bottom:
|
214
|
+
margin-bottom: @form-group-margin-bottom;
|
202
215
|
}
|
203
216
|
|
204
217
|
|
@@ -238,6 +251,7 @@ input[type="month"] {
|
|
238
251
|
// Radios and checkboxes on same line
|
239
252
|
.radio-inline,
|
240
253
|
.checkbox-inline {
|
254
|
+
position: relative;
|
241
255
|
display: inline-block;
|
242
256
|
padding-left: 20px;
|
243
257
|
margin-bottom: 0;
|
@@ -260,7 +274,7 @@ input[type="checkbox"] {
|
|
260
274
|
&[disabled],
|
261
275
|
&.disabled,
|
262
276
|
fieldset[disabled] & {
|
263
|
-
cursor:
|
277
|
+
cursor: @cursor-disabled;
|
264
278
|
}
|
265
279
|
}
|
266
280
|
// These classes are used directly on <label>s
|
@@ -268,7 +282,7 @@ input[type="checkbox"] {
|
|
268
282
|
.checkbox-inline {
|
269
283
|
&.disabled,
|
270
284
|
fieldset[disabled] & {
|
271
|
-
cursor:
|
285
|
+
cursor: @cursor-disabled;
|
272
286
|
}
|
273
287
|
}
|
274
288
|
// These classes are used on elements with <label> descendants
|
@@ -277,7 +291,7 @@ input[type="checkbox"] {
|
|
277
291
|
&.disabled,
|
278
292
|
fieldset[disabled] & {
|
279
293
|
label {
|
280
|
-
cursor:
|
294
|
+
cursor: @cursor-disabled;
|
281
295
|
}
|
282
296
|
}
|
283
297
|
}
|
@@ -294,6 +308,7 @@ input[type="checkbox"] {
|
|
294
308
|
padding-bottom: (@padding-base-vertical + 1);
|
295
309
|
// Remove default margin from `p`
|
296
310
|
margin-bottom: 0;
|
311
|
+
min-height: (@line-height-computed + @font-size-base);
|
297
312
|
|
298
313
|
&.input-lg,
|
299
314
|
&.input-sm {
|
@@ -307,15 +322,64 @@ input[type="checkbox"] {
|
|
307
322
|
//
|
308
323
|
// Build on `.form-control` with modifier classes to decrease or increase the
|
309
324
|
// height and font-size of form controls.
|
325
|
+
//
|
326
|
+
// The `.form-group-* form-control` variations are sadly duplicated to avoid the
|
327
|
+
// issue documented in https://github.com/twbs/bootstrap/issues/15074.
|
310
328
|
|
311
|
-
.input-sm
|
312
|
-
.
|
313
|
-
|
329
|
+
.input-sm {
|
330
|
+
.input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @input-border-radius-small);
|
331
|
+
}
|
332
|
+
.form-group-sm {
|
333
|
+
.form-control {
|
334
|
+
height: @input-height-small;
|
335
|
+
padding: @padding-small-vertical @padding-small-horizontal;
|
336
|
+
font-size: @font-size-small;
|
337
|
+
line-height: @line-height-small;
|
338
|
+
border-radius: @input-border-radius-small;
|
339
|
+
}
|
340
|
+
select.form-control {
|
341
|
+
height: @input-height-small;
|
342
|
+
line-height: @input-height-small;
|
343
|
+
}
|
344
|
+
textarea.form-control,
|
345
|
+
select[multiple].form-control {
|
346
|
+
height: auto;
|
347
|
+
}
|
348
|
+
.form-control-static {
|
349
|
+
height: @input-height-small;
|
350
|
+
min-height: (@line-height-computed + @font-size-small);
|
351
|
+
padding: (@padding-small-vertical + 1) @padding-small-horizontal;
|
352
|
+
font-size: @font-size-small;
|
353
|
+
line-height: @line-height-small;
|
354
|
+
}
|
314
355
|
}
|
315
356
|
|
316
|
-
.input-lg
|
317
|
-
.
|
318
|
-
|
357
|
+
.input-lg {
|
358
|
+
.input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @input-border-radius-large);
|
359
|
+
}
|
360
|
+
.form-group-lg {
|
361
|
+
.form-control {
|
362
|
+
height: @input-height-large;
|
363
|
+
padding: @padding-large-vertical @padding-large-horizontal;
|
364
|
+
font-size: @font-size-large;
|
365
|
+
line-height: @line-height-large;
|
366
|
+
border-radius: @input-border-radius-large;
|
367
|
+
}
|
368
|
+
select.form-control {
|
369
|
+
height: @input-height-large;
|
370
|
+
line-height: @input-height-large;
|
371
|
+
}
|
372
|
+
textarea.form-control,
|
373
|
+
select[multiple].form-control {
|
374
|
+
height: auto;
|
375
|
+
}
|
376
|
+
.form-control-static {
|
377
|
+
height: @input-height-large;
|
378
|
+
min-height: (@line-height-computed + @font-size-large);
|
379
|
+
padding: (@padding-large-vertical + 1) @padding-large-horizontal;
|
380
|
+
font-size: @font-size-large;
|
381
|
+
line-height: @line-height-large;
|
382
|
+
}
|
319
383
|
}
|
320
384
|
|
321
385
|
|
@@ -345,12 +409,16 @@ input[type="checkbox"] {
|
|
345
409
|
text-align: center;
|
346
410
|
pointer-events: none;
|
347
411
|
}
|
348
|
-
.input-lg + .form-control-feedback
|
412
|
+
.input-lg + .form-control-feedback,
|
413
|
+
.input-group-lg + .form-control-feedback,
|
414
|
+
.form-group-lg .form-control + .form-control-feedback {
|
349
415
|
width: @input-height-large;
|
350
416
|
height: @input-height-large;
|
351
417
|
line-height: @input-height-large;
|
352
418
|
}
|
353
|
-
.input-sm + .form-control-feedback
|
419
|
+
.input-sm + .form-control-feedback,
|
420
|
+
.input-group-sm + .form-control-feedback,
|
421
|
+
.form-group-sm .form-control + .form-control-feedback {
|
354
422
|
width: @input-height-small;
|
355
423
|
height: @input-height-small;
|
356
424
|
line-height: @input-height-small;
|
@@ -371,10 +439,10 @@ input[type="checkbox"] {
|
|
371
439
|
.has-feedback label {
|
372
440
|
|
373
441
|
& ~ .form-control-feedback {
|
374
|
-
|
442
|
+
top: (@line-height-computed + 5); // Height of the `label` and its margin
|
375
443
|
}
|
376
444
|
&.sr-only ~ .form-control-feedback {
|
377
|
-
|
445
|
+
top: 0;
|
378
446
|
}
|
379
447
|
}
|
380
448
|
|
@@ -448,8 +516,7 @@ input[type="checkbox"] {
|
|
448
516
|
}
|
449
517
|
|
450
518
|
// Remove default margin on radios/checkboxes that were used for stacking, and
|
451
|
-
// then undo the floating of radios and checkboxes to match
|
452
|
-
// a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
|
519
|
+
// then undo the floating of radios and checkboxes to match.
|
453
520
|
.radio,
|
454
521
|
.checkbox {
|
455
522
|
display: inline-block;
|
@@ -520,7 +587,7 @@ input[type="checkbox"] {
|
|
520
587
|
// Reposition the icon because it's now within a grid column and columns have
|
521
588
|
// `position: relative;` on them. Also accounts for the grid gutter padding.
|
522
589
|
.has-feedback .form-control-feedback {
|
523
|
-
right: (@grid-gutter-width / 2);
|
590
|
+
right: floor((@grid-gutter-width / 2));
|
524
591
|
}
|
525
592
|
|
526
593
|
// Form group sizes
|
@@ -530,7 +597,8 @@ input[type="checkbox"] {
|
|
530
597
|
.form-group-lg {
|
531
598
|
@media (min-width: @screen-sm-min) {
|
532
599
|
.control-label {
|
533
|
-
padding-top: (
|
600
|
+
padding-top: (@padding-large-vertical + 1);
|
601
|
+
font-size: @font-size-large;
|
534
602
|
}
|
535
603
|
}
|
536
604
|
}
|
@@ -538,6 +606,7 @@ input[type="checkbox"] {
|
|
538
606
|
@media (min-width: @screen-sm-min) {
|
539
607
|
.control-label {
|
540
608
|
padding-top: (@padding-small-vertical + 1);
|
609
|
+
font-size: @font-size-small;
|
541
610
|
}
|
542
611
|
}
|
543
612
|
}
|
@@ -12,6 +12,7 @@
|
|
12
12
|
font-family: 'Glyphicons Halflings';
|
13
13
|
src: url('@{icon-font-path}@{icon-font-name}.eot');
|
14
14
|
src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
|
15
|
+
url('@{icon-font-path}@{icon-font-name}.woff2') format('woff2'),
|
15
16
|
url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
|
16
17
|
url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
|
17
18
|
url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
|
@@ -31,9 +32,10 @@
|
|
31
32
|
}
|
32
33
|
|
33
34
|
// Individual icons
|
34
|
-
.glyphicon-asterisk { &:before { content: "\
|
35
|
-
.glyphicon-plus { &:before { content: "\
|
36
|
-
.glyphicon-euro
|
35
|
+
.glyphicon-asterisk { &:before { content: "\002a"; } }
|
36
|
+
.glyphicon-plus { &:before { content: "\002b"; } }
|
37
|
+
.glyphicon-euro,
|
38
|
+
.glyphicon-eur { &:before { content: "\20ac"; } }
|
37
39
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
38
40
|
.glyphicon-cloud { &:before { content: "\2601"; } }
|
39
41
|
.glyphicon-envelope { &:before { content: "\2709"; } }
|
@@ -231,3 +233,73 @@
|
|
231
233
|
.glyphicon-cloud-upload { &:before { content: "\e198"; } }
|
232
234
|
.glyphicon-tree-conifer { &:before { content: "\e199"; } }
|
233
235
|
.glyphicon-tree-deciduous { &:before { content: "\e200"; } }
|
236
|
+
.glyphicon-cd { &:before { content: "\e201"; } }
|
237
|
+
.glyphicon-save-file { &:before { content: "\e202"; } }
|
238
|
+
.glyphicon-open-file { &:before { content: "\e203"; } }
|
239
|
+
.glyphicon-level-up { &:before { content: "\e204"; } }
|
240
|
+
.glyphicon-copy { &:before { content: "\e205"; } }
|
241
|
+
.glyphicon-paste { &:before { content: "\e206"; } }
|
242
|
+
// The following 2 Glyphicons are omitted for the time being because
|
243
|
+
// they currently use Unicode codepoints that are outside the
|
244
|
+
// Basic Multilingual Plane (BMP). Older buggy versions of WebKit can't handle
|
245
|
+
// non-BMP codepoints in CSS string escapes, and thus can't display these two icons.
|
246
|
+
// Notably, the bug affects some older versions of the Android Browser.
|
247
|
+
// More info: https://github.com/twbs/bootstrap/issues/10106
|
248
|
+
// .glyphicon-door { &:before { content: "\1f6aa"; } }
|
249
|
+
// .glyphicon-key { &:before { content: "\1f511"; } }
|
250
|
+
.glyphicon-alert { &:before { content: "\e209"; } }
|
251
|
+
.glyphicon-equalizer { &:before { content: "\e210"; } }
|
252
|
+
.glyphicon-king { &:before { content: "\e211"; } }
|
253
|
+
.glyphicon-queen { &:before { content: "\e212"; } }
|
254
|
+
.glyphicon-pawn { &:before { content: "\e213"; } }
|
255
|
+
.glyphicon-bishop { &:before { content: "\e214"; } }
|
256
|
+
.glyphicon-knight { &:before { content: "\e215"; } }
|
257
|
+
.glyphicon-baby-formula { &:before { content: "\e216"; } }
|
258
|
+
.glyphicon-tent { &:before { content: "\26fa"; } }
|
259
|
+
.glyphicon-blackboard { &:before { content: "\e218"; } }
|
260
|
+
.glyphicon-bed { &:before { content: "\e219"; } }
|
261
|
+
.glyphicon-apple { &:before { content: "\f8ff"; } }
|
262
|
+
.glyphicon-erase { &:before { content: "\e221"; } }
|
263
|
+
.glyphicon-hourglass { &:before { content: "\231b"; } }
|
264
|
+
.glyphicon-lamp { &:before { content: "\e223"; } }
|
265
|
+
.glyphicon-duplicate { &:before { content: "\e224"; } }
|
266
|
+
.glyphicon-piggy-bank { &:before { content: "\e225"; } }
|
267
|
+
.glyphicon-scissors { &:before { content: "\e226"; } }
|
268
|
+
.glyphicon-bitcoin { &:before { content: "\e227"; } }
|
269
|
+
.glyphicon-btc { &:before { content: "\e227"; } }
|
270
|
+
.glyphicon-xbt { &:before { content: "\e227"; } }
|
271
|
+
.glyphicon-yen { &:before { content: "\00a5"; } }
|
272
|
+
.glyphicon-jpy { &:before { content: "\00a5"; } }
|
273
|
+
.glyphicon-ruble { &:before { content: "\20bd"; } }
|
274
|
+
.glyphicon-rub { &:before { content: "\20bd"; } }
|
275
|
+
.glyphicon-scale { &:before { content: "\e230"; } }
|
276
|
+
.glyphicon-ice-lolly { &:before { content: "\e231"; } }
|
277
|
+
.glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } }
|
278
|
+
.glyphicon-education { &:before { content: "\e233"; } }
|
279
|
+
.glyphicon-option-horizontal { &:before { content: "\e234"; } }
|
280
|
+
.glyphicon-option-vertical { &:before { content: "\e235"; } }
|
281
|
+
.glyphicon-menu-hamburger { &:before { content: "\e236"; } }
|
282
|
+
.glyphicon-modal-window { &:before { content: "\e237"; } }
|
283
|
+
.glyphicon-oil { &:before { content: "\e238"; } }
|
284
|
+
.glyphicon-grain { &:before { content: "\e239"; } }
|
285
|
+
.glyphicon-sunglasses { &:before { content: "\e240"; } }
|
286
|
+
.glyphicon-text-size { &:before { content: "\e241"; } }
|
287
|
+
.glyphicon-text-color { &:before { content: "\e242"; } }
|
288
|
+
.glyphicon-text-background { &:before { content: "\e243"; } }
|
289
|
+
.glyphicon-object-align-top { &:before { content: "\e244"; } }
|
290
|
+
.glyphicon-object-align-bottom { &:before { content: "\e245"; } }
|
291
|
+
.glyphicon-object-align-horizontal{ &:before { content: "\e246"; } }
|
292
|
+
.glyphicon-object-align-left { &:before { content: "\e247"; } }
|
293
|
+
.glyphicon-object-align-vertical { &:before { content: "\e248"; } }
|
294
|
+
.glyphicon-object-align-right { &:before { content: "\e249"; } }
|
295
|
+
.glyphicon-triangle-right { &:before { content: "\e250"; } }
|
296
|
+
.glyphicon-triangle-left { &:before { content: "\e251"; } }
|
297
|
+
.glyphicon-triangle-bottom { &:before { content: "\e252"; } }
|
298
|
+
.glyphicon-triangle-top { &:before { content: "\e253"; } }
|
299
|
+
.glyphicon-console { &:before { content: "\e254"; } }
|
300
|
+
.glyphicon-superscript { &:before { content: "\e255"; } }
|
301
|
+
.glyphicon-subscript { &:before { content: "\e256"; } }
|
302
|
+
.glyphicon-menu-left { &:before { content: "\e257"; } }
|
303
|
+
.glyphicon-menu-right { &:before { content: "\e258"; } }
|
304
|
+
.glyphicon-menu-down { &:before { content: "\e259"; } }
|
305
|
+
.glyphicon-menu-up { &:before { content: "\e260"; } }
|
File without changes
|
@@ -29,6 +29,10 @@
|
|
29
29
|
|
30
30
|
width: 100%;
|
31
31
|
margin-bottom: 0;
|
32
|
+
|
33
|
+
&:focus {
|
34
|
+
z-index: 3;
|
35
|
+
}
|
32
36
|
}
|
33
37
|
}
|
34
38
|
|
@@ -79,18 +83,18 @@
|
|
79
83
|
text-align: center;
|
80
84
|
background-color: @input-group-addon-bg;
|
81
85
|
border: 1px solid @input-group-addon-border-color;
|
82
|
-
border-radius: @border-radius
|
86
|
+
border-radius: @input-border-radius;
|
83
87
|
|
84
88
|
// Sizing
|
85
89
|
&.input-sm {
|
86
90
|
padding: @padding-small-vertical @padding-small-horizontal;
|
87
91
|
font-size: @font-size-small;
|
88
|
-
border-radius: @border-radius-small;
|
92
|
+
border-radius: @input-border-radius-small;
|
89
93
|
}
|
90
94
|
&.input-lg {
|
91
95
|
padding: @padding-large-vertical @padding-large-horizontal;
|
92
96
|
font-size: @font-size-large;
|
93
|
-
border-radius: @border-radius-large;
|
97
|
+
border-radius: @input-border-radius-large;
|
94
98
|
}
|
95
99
|
|
96
100
|
// Nuke default margins from checkboxes and radios to vertically center within.
|
@@ -160,6 +164,7 @@
|
|
160
164
|
&:last-child {
|
161
165
|
> .btn,
|
162
166
|
> .btn-group {
|
167
|
+
z-index: 2;
|
163
168
|
margin-left: -1px;
|
164
169
|
}
|
165
170
|
}
|
@@ -4,7 +4,8 @@
|
|
4
4
|
|
5
5
|
|
6
6
|
.jumbotron {
|
7
|
-
padding:
|
7
|
+
padding-top: @jumbotron-padding;
|
8
|
+
padding-bottom: @jumbotron-padding;
|
8
9
|
margin-bottom: @jumbotron-padding;
|
9
10
|
color: @jumbotron-color;
|
10
11
|
background-color: @jumbotron-bg;
|
@@ -13,6 +14,7 @@
|
|
13
14
|
.h1 {
|
14
15
|
color: @jumbotron-heading-color;
|
15
16
|
}
|
17
|
+
|
16
18
|
p {
|
17
19
|
margin-bottom: (@jumbotron-padding / 2);
|
18
20
|
font-size: @jumbotron-font-size;
|
@@ -23,8 +25,11 @@
|
|
23
25
|
border-top-color: darken(@jumbotron-bg, 10%);
|
24
26
|
}
|
25
27
|
|
26
|
-
.container
|
28
|
+
.container &,
|
29
|
+
.container-fluid & {
|
27
30
|
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
|
31
|
+
padding-left: (@grid-gutter-width / 2);
|
32
|
+
padding-right: (@grid-gutter-width / 2);
|
28
33
|
}
|
29
34
|
|
30
35
|
.container {
|
@@ -35,14 +40,15 @@
|
|
35
40
|
padding-top: (@jumbotron-padding * 1.6);
|
36
41
|
padding-bottom: (@jumbotron-padding * 1.6);
|
37
42
|
|
38
|
-
.container
|
43
|
+
.container &,
|
44
|
+
.container-fluid & {
|
39
45
|
padding-left: (@jumbotron-padding * 2);
|
40
46
|
padding-right: (@jumbotron-padding * 2);
|
41
47
|
}
|
42
48
|
|
43
49
|
h1,
|
44
50
|
.h1 {
|
45
|
-
font-size:
|
51
|
+
font-size: @jumbotron-heading-font-size;
|
46
52
|
}
|
47
53
|
}
|
48
54
|
}
|
File without changes
|
@@ -35,23 +35,16 @@
|
|
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
|
|
49
|
-
//
|
41
|
+
// Interactive list items
|
50
42
|
//
|
51
|
-
// Use anchor elements instead of `li`s or `div`s to create
|
43
|
+
// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
|
52
44
|
// Includes an extra `.active` modifier class for showing selected items.
|
53
45
|
|
54
|
-
a.list-group-item
|
46
|
+
a.list-group-item,
|
47
|
+
button.list-group-item {
|
55
48
|
color: @list-group-link-color;
|
56
49
|
|
57
50
|
.list-group-item-heading {
|
@@ -67,6 +60,11 @@ a.list-group-item {
|
|
67
60
|
}
|
68
61
|
}
|
69
62
|
|
63
|
+
button.list-group-item {
|
64
|
+
width: 100%;
|
65
|
+
text-align: left;
|
66
|
+
}
|
67
|
+
|
70
68
|
.list-group-item {
|
71
69
|
// Disabled state
|
72
70
|
&.disabled,
|
@@ -74,8 +72,8 @@ a.list-group-item {
|
|
74
72
|
&.disabled:focus {
|
75
73
|
background-color: @list-group-disabled-bg;
|
76
74
|
color: @list-group-disabled-color;
|
77
|
-
cursor:
|
78
|
-
|
75
|
+
cursor: @cursor-disabled;
|
76
|
+
|
79
77
|
// Force color to inherit for custom content
|
80
78
|
.list-group-item-heading {
|
81
79
|
color: inherit;
|
@@ -1,54 +1,64 @@
|
|
1
|
-
|
2
|
-
//
|
3
|
-
|
4
|
-
|
1
|
+
.media {
|
2
|
+
// Proper spacing between instances of .media
|
3
|
+
margin-top: 15px;
|
5
4
|
|
6
|
-
|
7
|
-
|
5
|
+
&:first-child {
|
6
|
+
margin-top: 0;
|
7
|
+
}
|
8
|
+
}
|
8
9
|
|
9
|
-
// Clear the floats
|
10
10
|
.media,
|
11
11
|
.media-body {
|
12
|
-
overflow: hidden;
|
13
12
|
zoom: 1;
|
13
|
+
overflow: hidden;
|
14
14
|
}
|
15
15
|
|
16
|
-
|
17
|
-
|
18
|
-
.media .media {
|
19
|
-
margin-top: 15px;
|
20
|
-
}
|
21
|
-
.media:first-child {
|
22
|
-
margin-top: 0;
|
16
|
+
.media-body {
|
17
|
+
width: 10000px;
|
23
18
|
}
|
24
19
|
|
25
|
-
// For images and videos, set to block
|
26
20
|
.media-object {
|
27
21
|
display: block;
|
22
|
+
|
23
|
+
// Fix collapse in webkit from max-width: 100% and display: table-cell.
|
24
|
+
&.img-thumbnail {
|
25
|
+
max-width: none;
|
26
|
+
}
|
28
27
|
}
|
29
28
|
|
30
|
-
|
31
|
-
.media-
|
32
|
-
|
29
|
+
.media-right,
|
30
|
+
.media > .pull-right {
|
31
|
+
padding-left: 10px;
|
33
32
|
}
|
34
33
|
|
34
|
+
.media-left,
|
35
|
+
.media > .pull-left {
|
36
|
+
padding-right: 10px;
|
37
|
+
}
|
35
38
|
|
36
|
-
|
37
|
-
|
39
|
+
.media-left,
|
40
|
+
.media-right,
|
41
|
+
.media-body {
|
42
|
+
display: table-cell;
|
43
|
+
vertical-align: top;
|
44
|
+
}
|
38
45
|
|
39
|
-
.media {
|
40
|
-
|
41
|
-
margin-right: 10px;
|
42
|
-
}
|
43
|
-
> .pull-right {
|
44
|
-
margin-left: 10px;
|
45
|
-
}
|
46
|
+
.media-middle {
|
47
|
+
vertical-align: middle;
|
46
48
|
}
|
47
49
|
|
50
|
+
.media-bottom {
|
51
|
+
vertical-align: bottom;
|
52
|
+
}
|
48
53
|
|
49
|
-
//
|
50
|
-
|
54
|
+
// Reset margins on headings for tighter default spacing
|
55
|
+
.media-heading {
|
56
|
+
margin-top: 0;
|
57
|
+
margin-bottom: 5px;
|
58
|
+
}
|
51
59
|
|
60
|
+
// Media list variation
|
61
|
+
//
|
52
62
|
// Undo default ul/ol styles
|
53
63
|
.media-list {
|
54
64
|
padding-left: 0;
|
File without changes
|
File without changes
|
@@ -8,15 +8,31 @@
|
|
8
8
|
background-color: @background;
|
9
9
|
border-color: @border;
|
10
10
|
|
11
|
-
&:hover,
|
12
11
|
&:focus,
|
13
|
-
&.focus
|
12
|
+
&.focus {
|
13
|
+
color: @color;
|
14
|
+
background-color: darken(@background, 10%);
|
15
|
+
border-color: darken(@border, 25%);
|
16
|
+
}
|
17
|
+
&:hover {
|
18
|
+
color: @color;
|
19
|
+
background-color: darken(@background, 10%);
|
20
|
+
border-color: darken(@border, 12%);
|
21
|
+
}
|
14
22
|
&:active,
|
15
23
|
&.active,
|
16
24
|
.open > .dropdown-toggle& {
|
17
25
|
color: @color;
|
18
26
|
background-color: darken(@background, 10%);
|
19
27
|
border-color: darken(@border, 12%);
|
28
|
+
|
29
|
+
&:hover,
|
30
|
+
&:focus,
|
31
|
+
&.focus {
|
32
|
+
color: @color;
|
33
|
+
background-color: darken(@background, 17%);
|
34
|
+
border-color: darken(@border, 25%);
|
35
|
+
}
|
20
36
|
}
|
21
37
|
&:active,
|
22
38
|
&.active,
|
@@ -26,12 +42,9 @@
|
|
26
42
|
&.disabled,
|
27
43
|
&[disabled],
|
28
44
|
fieldset[disabled] & {
|
29
|
-
&,
|
30
45
|
&:hover,
|
31
46
|
&:focus,
|
32
|
-
&.focus
|
33
|
-
&:active,
|
34
|
-
&.active {
|
47
|
+
&.focus {
|
35
48
|
background-color: @background;
|
36
49
|
border-color: @border;
|
37
50
|
}
|
File without changes
|