bootstrap-on-rails 3.2.0 → 3.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +5 -1
- data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
- data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/javascripts/bootstrap/affix.js +43 -23
- data/app/assets/javascripts/bootstrap/alert.js +6 -4
- data/app/assets/javascripts/bootstrap/button.js +16 -10
- data/app/assets/javascripts/bootstrap/carousel.js +27 -10
- data/app/assets/javascripts/bootstrap/collapse.js +69 -28
- data/app/assets/javascripts/bootstrap/dropdown.js +20 -10
- data/app/assets/javascripts/bootstrap/modal.js +67 -23
- data/app/assets/javascripts/bootstrap/popover.js +13 -7
- data/app/assets/javascripts/bootstrap/scrollspy.js +12 -7
- data/app/assets/javascripts/bootstrap/tab.js +41 -16
- data/app/assets/javascripts/bootstrap/tooltip.js +60 -39
- data/app/assets/javascripts/bootstrap/transition.js +1 -1
- data/app/assets/stylesheets/bootstrap/alerts.less +0 -0
- data/app/assets/stylesheets/bootstrap/badges.less +7 -1
- data/app/assets/stylesheets/bootstrap/bootstrap.less +0 -0
- data/app/assets/stylesheets/bootstrap/breadcrumbs.less +0 -0
- data/app/assets/stylesheets/bootstrap/button-groups.less +16 -13
- data/app/assets/stylesheets/bootstrap/buttons.less +7 -4
- data/app/assets/stylesheets/bootstrap/carousel.less +24 -0
- data/app/assets/stylesheets/bootstrap/close.less +0 -0
- data/app/assets/stylesheets/bootstrap/code.less +1 -0
- data/app/assets/stylesheets/bootstrap/component-animations.less +5 -2
- data/app/assets/stylesheets/bootstrap/dropdowns.less +3 -5
- data/app/assets/stylesheets/bootstrap/forms.less +46 -40
- data/app/assets/stylesheets/bootstrap/glyphicons.less +7 -6
- data/app/assets/stylesheets/bootstrap/grid.less +0 -0
- data/app/assets/stylesheets/bootstrap/input-groups.less +0 -0
- data/app/assets/stylesheets/bootstrap/jumbotron.less +6 -5
- data/app/assets/stylesheets/bootstrap/labels.less +0 -0
- data/app/assets/stylesheets/bootstrap/list-group.less +1 -8
- data/app/assets/stylesheets/bootstrap/media.less +27 -36
- data/app/assets/stylesheets/bootstrap/mixins.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/alerts.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/background-variant.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/border-radius.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/buttons.less +2 -0
- data/app/assets/stylesheets/bootstrap/mixins/center-block.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/clearfix.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/forms.less +5 -1
- data/app/assets/stylesheets/bootstrap/mixins/gradients.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/grid-framework.less +2 -2
- data/app/assets/stylesheets/bootstrap/mixins/grid.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/hide-text.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/image.less +0 -1
- data/app/assets/stylesheets/bootstrap/mixins/labels.less +1 -1
- data/app/assets/stylesheets/bootstrap/mixins/list-group.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/nav-divider.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/nav-vertical-align.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/opacity.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/pagination.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/panels.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/progress-bar.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/reset-filter.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/resize.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/responsive-visibility.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/size.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/tab-focus.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/table-row.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/text-emphasis.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/text-overflow.less +0 -0
- data/app/assets/stylesheets/bootstrap/mixins/vendor-prefixes.less +6 -3
- data/app/assets/stylesheets/bootstrap/modals.less +3 -5
- data/app/assets/stylesheets/bootstrap/navbar.less +30 -25
- data/app/assets/stylesheets/bootstrap/navs.less +3 -1
- data/app/assets/stylesheets/bootstrap/normalize.less +5 -3
- data/app/assets/stylesheets/bootstrap/pager.less +1 -2
- data/app/assets/stylesheets/bootstrap/pagination.less +1 -1
- data/app/assets/stylesheets/bootstrap/panels.less +21 -3
- data/app/assets/stylesheets/bootstrap/popovers.less +6 -4
- data/app/assets/stylesheets/bootstrap/print.less +102 -96
- data/app/assets/stylesheets/bootstrap/progress-bars.less +1 -19
- data/app/assets/stylesheets/bootstrap/responsive-embed.less +2 -1
- data/app/assets/stylesheets/bootstrap/responsive-utilities.less +0 -0
- data/app/assets/stylesheets/bootstrap/scaffolding.less +1 -1
- data/app/assets/stylesheets/bootstrap/tables.less +11 -10
- data/app/assets/stylesheets/bootstrap/theme.less +23 -9
- data/app/assets/stylesheets/bootstrap/thumbnails.less +1 -1
- data/app/assets/stylesheets/bootstrap/tooltip.less +12 -4
- data/app/assets/stylesheets/bootstrap/type.less +0 -11
- data/app/assets/stylesheets/bootstrap/utilities.less +0 -1
- data/app/assets/stylesheets/bootstrap/variables.less +31 -20
- data/app/assets/stylesheets/bootstrap/wells.less +0 -0
- data/lib/bootstrap-on-rails/version.rb +1 -1
- metadata +2 -2
@@ -10,11 +10,11 @@
|
|
10
10
|
// Import the fonts
|
11
11
|
@font-face {
|
12
12
|
font-family: 'Glyphicons Halflings';
|
13
|
-
src:
|
14
|
-
src:
|
15
|
-
|
16
|
-
|
17
|
-
|
13
|
+
src: url('@{icon-font-path}@{icon-font-name}.eot');
|
14
|
+
src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
|
15
|
+
url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
|
16
|
+
url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
|
17
|
+
url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg');
|
18
18
|
}
|
19
19
|
|
20
20
|
// Catchall baseclass
|
@@ -33,7 +33,8 @@
|
|
33
33
|
// Individual icons
|
34
34
|
.glyphicon-asterisk { &:before { content: "\2a"; } }
|
35
35
|
.glyphicon-plus { &:before { content: "\2b"; } }
|
36
|
-
.glyphicon-euro
|
36
|
+
.glyphicon-euro,
|
37
|
+
.glyphicon-eur { &:before { content: "\20ac"; } }
|
37
38
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
38
39
|
.glyphicon-cloud { &:before { content: "\2601"; } }
|
39
40
|
.glyphicon-envelope { &:before { content: "\2709"; } }
|
File without changes
|
File without changes
|
@@ -4,7 +4,7 @@
|
|
4
4
|
|
5
5
|
|
6
6
|
.jumbotron {
|
7
|
-
padding: @jumbotron-padding;
|
7
|
+
padding: @jumbotron-padding (@jumbotron-padding / 2);
|
8
8
|
margin-bottom: @jumbotron-padding;
|
9
9
|
color: @jumbotron-color;
|
10
10
|
background-color: @jumbotron-bg;
|
@@ -23,7 +23,8 @@
|
|
23
23
|
border-top-color: darken(@jumbotron-bg, 10%);
|
24
24
|
}
|
25
25
|
|
26
|
-
.container
|
26
|
+
.container &,
|
27
|
+
.container-fluid & {
|
27
28
|
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
|
28
29
|
}
|
29
30
|
|
@@ -32,10 +33,10 @@
|
|
32
33
|
}
|
33
34
|
|
34
35
|
@media screen and (min-width: @screen-sm-min) {
|
35
|
-
padding
|
36
|
-
padding-bottom: (@jumbotron-padding * 1.6);
|
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
|
}
|
File without changes
|
@@ -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
|
|
@@ -74,6 +66,7 @@ a.list-group-item {
|
|
74
66
|
&.disabled:focus {
|
75
67
|
background-color: @list-group-disabled-bg;
|
76
68
|
color: @list-group-disabled-color;
|
69
|
+
cursor: @cursor-disabled;
|
77
70
|
|
78
71
|
// Force color to inherit for custom content
|
79
72
|
.list-group-item-heading {
|
@@ -1,54 +1,45 @@
|
|
1
|
-
|
2
|
-
//
|
3
|
-
|
1
|
+
.media {
|
2
|
+
// Proper spacing between instances of .media
|
3
|
+
margin-top: 15px;
|
4
|
+
|
5
|
+
&:first-child {
|
6
|
+
margin-top: 0;
|
7
|
+
}
|
8
|
+
}
|
4
9
|
|
10
|
+
.media-right,
|
11
|
+
.media > .pull-right {
|
12
|
+
padding-left: 10px;
|
13
|
+
}
|
5
14
|
|
6
|
-
|
7
|
-
|
15
|
+
.media-left,
|
16
|
+
.media > .pull-left {
|
17
|
+
padding-right: 10px;
|
18
|
+
}
|
8
19
|
|
9
|
-
|
10
|
-
.media,
|
20
|
+
.media-left,
|
21
|
+
.media-right,
|
11
22
|
.media-body {
|
12
|
-
|
13
|
-
|
23
|
+
display: table-cell;
|
24
|
+
vertical-align: top;
|
14
25
|
}
|
15
26
|
|
16
|
-
|
17
|
-
|
18
|
-
.media .media {
|
19
|
-
margin-top: 15px;
|
20
|
-
}
|
21
|
-
.media:first-child {
|
22
|
-
margin-top: 0;
|
27
|
+
.media-middle {
|
28
|
+
vertical-align: middle;
|
23
29
|
}
|
24
30
|
|
25
|
-
|
26
|
-
|
27
|
-
display: block;
|
31
|
+
.media-bottom {
|
32
|
+
vertical-align: bottom;
|
28
33
|
}
|
29
34
|
|
30
35
|
// Reset margins on headings for tighter default spacing
|
31
36
|
.media-heading {
|
32
|
-
margin: 0
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
// Media image alignment
|
37
|
-
// -------------------------
|
38
|
-
|
39
|
-
.media {
|
40
|
-
> .pull-left {
|
41
|
-
margin-right: 10px;
|
42
|
-
}
|
43
|
-
> .pull-right {
|
44
|
-
margin-left: 10px;
|
45
|
-
}
|
37
|
+
margin-top: 0;
|
38
|
+
margin-bottom: 5px;
|
46
39
|
}
|
47
40
|
|
48
|
-
|
49
41
|
// Media list variation
|
50
|
-
//
|
51
|
-
|
42
|
+
//
|
52
43
|
// Undo default ul/ol styles
|
53
44
|
.media-list {
|
54
45
|
padding-left: 0;
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -10,7 +10,11 @@
|
|
10
10
|
.radio,
|
11
11
|
.checkbox,
|
12
12
|
.radio-inline,
|
13
|
-
.checkbox-inline
|
13
|
+
.checkbox-inline,
|
14
|
+
&.radio label,
|
15
|
+
&.checkbox label,
|
16
|
+
&.radio-inline label,
|
17
|
+
&.checkbox-inline label {
|
14
18
|
color: @text-color;
|
15
19
|
}
|
16
20
|
// Set the border and box shadow on specific inputs to match
|
File without changes
|
@@ -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)
|
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)
|
30
|
+
.col(@index) { // initial
|
31
31
|
@item: ~".col-@{class}-@{index}";
|
32
32
|
.col((@index + 1), @item);
|
33
33
|
}
|
File without changes
|
File without changes
|
@@ -8,7 +8,6 @@
|
|
8
8
|
// Keep images from scaling beyond the width of their parents.
|
9
9
|
.img-responsive(@display: block) {
|
10
10
|
display: @display;
|
11
|
-
width: 100% \9; // Force IE10 and below to size SVG images correctly
|
12
11
|
max-width: 100%; // Part 1: Set a maximum relative to the parent
|
13
12
|
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
|
14
13
|
}
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
@@ -99,9 +99,12 @@
|
|
99
99
|
|
100
100
|
// Placeholder text
|
101
101
|
.placeholder(@color: @input-color-placeholder) {
|
102
|
-
|
103
|
-
|
104
|
-
|
102
|
+
// Firefox
|
103
|
+
&::-moz-placeholder {
|
104
|
+
color: @color;
|
105
|
+
opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
|
106
|
+
}
|
107
|
+
&:-ms-input-placeholder { color: @color; } // Internet Explorer 10+
|
105
108
|
&::-webkit-input-placeholder { color: @color; } // Safari and Chrome
|
106
109
|
}
|
107
110
|
|
@@ -30,10 +30,10 @@
|
|
30
30
|
|
31
31
|
// When fading in the modal, animate it to slide down
|
32
32
|
&.fade .modal-dialog {
|
33
|
-
.
|
33
|
+
.translate(0, -25%);
|
34
34
|
.transition-transform(~"0.3s ease-out");
|
35
35
|
}
|
36
|
-
&.in .modal-dialog { .
|
36
|
+
&.in .modal-dialog { .translate(0, 0) }
|
37
37
|
}
|
38
38
|
.modal-open .modal {
|
39
39
|
overflow-x: hidden;
|
@@ -62,12 +62,10 @@
|
|
62
62
|
|
63
63
|
// Modal background
|
64
64
|
.modal-backdrop {
|
65
|
-
position:
|
65
|
+
position: absolute;
|
66
66
|
top: 0;
|
67
67
|
right: 0;
|
68
|
-
bottom: 0;
|
69
68
|
left: 0;
|
70
|
-
z-index: @zindex-modal-background;
|
71
69
|
background-color: @modal-backdrop-bg;
|
72
70
|
// Fade for backdrop
|
73
71
|
&.fade { .opacity(0); }
|
@@ -67,6 +67,7 @@
|
|
67
67
|
|
68
68
|
&.collapse {
|
69
69
|
display: block !important;
|
70
|
+
visibility: visible !important;
|
70
71
|
height: auto !important;
|
71
72
|
padding-bottom: 0; // Override default setting
|
72
73
|
overflow: visible !important;
|
@@ -92,7 +93,7 @@
|
|
92
93
|
.navbar-collapse {
|
93
94
|
max-height: @navbar-collapse-max-height;
|
94
95
|
|
95
|
-
@media (max-width: @screen-xs-min) and (orientation: landscape) {
|
96
|
+
@media (max-device-width: @screen-xs-min) and (orientation: landscape) {
|
96
97
|
max-height: 200px;
|
97
98
|
}
|
98
99
|
}
|
@@ -141,7 +142,6 @@
|
|
141
142
|
right: 0;
|
142
143
|
left: 0;
|
143
144
|
z-index: @zindex-navbar-fixed;
|
144
|
-
.translate3d(0, 0, 0);
|
145
145
|
|
146
146
|
// Undo the rounded corners
|
147
147
|
@media (min-width: @grid-float-breakpoint) {
|
@@ -173,6 +173,10 @@
|
|
173
173
|
text-decoration: none;
|
174
174
|
}
|
175
175
|
|
176
|
+
> img {
|
177
|
+
display: block;
|
178
|
+
}
|
179
|
+
|
176
180
|
@media (min-width: @grid-float-breakpoint) {
|
177
181
|
.navbar > .container &,
|
178
182
|
.navbar > .container-fluid & {
|
@@ -271,26 +275,10 @@
|
|
271
275
|
padding-bottom: @navbar-padding-vertical;
|
272
276
|
}
|
273
277
|
}
|
274
|
-
|
275
|
-
&.navbar-right:last-child {
|
276
|
-
margin-right: -@navbar-padding-horizontal;
|
277
|
-
}
|
278
278
|
}
|
279
279
|
}
|
280
280
|
|
281
281
|
|
282
|
-
// Component alignment
|
283
|
-
//
|
284
|
-
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
285
|
-
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
286
|
-
// though so that navbar contents properly stack and align in mobile.
|
287
|
-
|
288
|
-
@media (min-width: @grid-float-breakpoint) {
|
289
|
-
.navbar-left { .pull-left(); }
|
290
|
-
.navbar-right { .pull-right(); }
|
291
|
-
}
|
292
|
-
|
293
|
-
|
294
282
|
// Navbar form
|
295
283
|
//
|
296
284
|
// Extension of the `.form-inline` with some extra flavor for optimum display in
|
@@ -311,6 +299,10 @@
|
|
311
299
|
.form-group {
|
312
300
|
@media (max-width: @grid-float-breakpoint-max) {
|
313
301
|
margin-bottom: 5px;
|
302
|
+
|
303
|
+
&:last-child {
|
304
|
+
margin-bottom: 0;
|
305
|
+
}
|
314
306
|
}
|
315
307
|
}
|
316
308
|
|
@@ -326,11 +318,6 @@
|
|
326
318
|
padding-top: 0;
|
327
319
|
padding-bottom: 0;
|
328
320
|
.box-shadow(none);
|
329
|
-
|
330
|
-
// Outdent the form if last child to line up with content down the page
|
331
|
-
&.navbar-right:last-child {
|
332
|
-
margin-right: -@navbar-padding-horizontal;
|
333
|
-
}
|
334
321
|
}
|
335
322
|
}
|
336
323
|
|
@@ -344,6 +331,7 @@
|
|
344
331
|
}
|
345
332
|
// Menu position and menu caret support for dropups via extra dropup class
|
346
333
|
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
|
334
|
+
.border-top-radius(@navbar-border-radius);
|
347
335
|
.border-bottom-radius(0);
|
348
336
|
}
|
349
337
|
|
@@ -375,14 +363,31 @@
|
|
375
363
|
float: left;
|
376
364
|
margin-left: @navbar-padding-horizontal;
|
377
365
|
margin-right: @navbar-padding-horizontal;
|
366
|
+
}
|
367
|
+
}
|
368
|
+
|
378
369
|
|
379
|
-
|
380
|
-
|
370
|
+
// Component alignment
|
371
|
+
//
|
372
|
+
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
|
373
|
+
// issues with parents and chaining. Only do this when the navbar is uncollapsed
|
374
|
+
// though so that navbar contents properly stack and align in mobile.
|
375
|
+
//
|
376
|
+
// Declared after the navbar components to ensure more specificity on the margins.
|
377
|
+
|
378
|
+
@media (min-width: @grid-float-breakpoint) {
|
379
|
+
.navbar-left { .pull-left(); }
|
380
|
+
.navbar-right {
|
381
|
+
.pull-right();
|
382
|
+
margin-right: -@navbar-padding-horizontal;
|
383
|
+
|
384
|
+
~ .navbar-right {
|
381
385
|
margin-right: 0;
|
382
386
|
}
|
383
387
|
}
|
384
388
|
}
|
385
389
|
|
390
|
+
|
386
391
|
// Alternate navbars
|
387
392
|
// --------------------------------------------------
|
388
393
|
|