twitter-bootswatch-rails 3.0.3.0 → 3.1.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/twitter/bootstrap/affix.js +34 -23
  3. data/app/assets/javascripts/twitter/bootstrap/alert.js +5 -15
  4. data/app/assets/javascripts/twitter/bootstrap/button.js +21 -29
  5. data/app/assets/javascripts/twitter/bootstrap/carousel.js +16 -28
  6. data/app/assets/javascripts/twitter/bootstrap/collapse.js +7 -16
  7. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +19 -26
  8. data/app/assets/javascripts/twitter/bootstrap/modal.js +25 -28
  9. data/app/assets/javascripts/twitter/bootstrap/popover.js +14 -21
  10. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +16 -21
  11. data/app/assets/javascripts/twitter/bootstrap/tab.js +7 -17
  12. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +52 -39
  13. data/app/assets/javascripts/twitter/bootstrap/transition.js +11 -19
  14. data/lib/generators/bootswatch/install/templates/loader.js.tt +1 -1
  15. data/lib/generators/bootswatch/install/templates/mixins.less.tt +130 -49
  16. data/lib/generators/bootswatch/install/templates/variables.less.tt +346 -161
  17. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  18. data/vendor/toolkit/twitter/bootstrap/badges.less +4 -0
  19. data/vendor/toolkit/twitter/bootstrap/breadcrumbs.less +4 -1
  20. data/vendor/toolkit/twitter/bootstrap/button-groups.less +10 -11
  21. data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -8
  22. data/vendor/toolkit/twitter/bootstrap/code.less +10 -0
  23. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +28 -2
  24. data/vendor/toolkit/twitter/bootstrap/forms.less +82 -38
  25. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +1 -5
  26. data/vendor/toolkit/twitter/bootstrap/grid.less +26 -5
  27. data/vendor/toolkit/twitter/bootstrap/input-groups.less +39 -18
  28. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +3 -5
  29. data/vendor/toolkit/twitter/bootstrap/list-group.less +25 -3
  30. data/vendor/toolkit/twitter/bootstrap/mixins.less +130 -49
  31. data/vendor/toolkit/twitter/bootstrap/modals.less +16 -7
  32. data/vendor/toolkit/twitter/bootstrap/navbar.less +24 -20
  33. data/vendor/toolkit/twitter/bootstrap/navs.less +2 -2
  34. data/vendor/toolkit/twitter/bootstrap/normalize.less +139 -122
  35. data/vendor/toolkit/twitter/bootstrap/pager.less +5 -5
  36. data/vendor/toolkit/twitter/bootstrap/pagination.less +6 -3
  37. data/vendor/toolkit/twitter/bootstrap/panels.less +64 -16
  38. data/vendor/toolkit/twitter/bootstrap/print.less +0 -4
  39. data/vendor/toolkit/twitter/bootstrap/responsive-utilities.less +13 -129
  40. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +17 -2
  41. data/vendor/toolkit/twitter/bootstrap/tables.less +3 -1
  42. data/vendor/toolkit/twitter/bootstrap/theme.less +1 -1
  43. data/vendor/toolkit/twitter/bootstrap/tooltip.less +1 -1
  44. data/vendor/toolkit/twitter/bootstrap/type.less +78 -63
  45. data/vendor/toolkit/twitter/bootstrap/variables.less +346 -161
  46. data/vendor/toolkit/twitter/bootstrap/wells.less +1 -1
  47. metadata +2 -3
  48. data/lib/generators/bootswatch/import/import_generator.rb +0 -49
@@ -14,7 +14,7 @@
14
14
  src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
15
15
  ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
16
16
  ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
17
- ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
17
+ ~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')";
18
18
  }
19
19
 
20
20
  // Catchall baseclass
@@ -28,10 +28,6 @@
28
28
  line-height: 1;
29
29
  -webkit-font-smoothing: antialiased;
30
30
  -moz-osx-font-smoothing: grayscale;
31
-
32
- &:empty {
33
- width: 1em;
34
- }
35
31
  }
36
32
 
37
33
  // Individual icons
@@ -2,14 +2,18 @@
2
2
  // Grid system
3
3
  // --------------------------------------------------
4
4
 
5
- // Set the container width, and override it for fixed navbars in media queries
5
+
6
+ // Container widths
7
+ //
8
+ // Set the container width, and override it for fixed navbars in media queries.
9
+
6
10
  .container {
7
11
  .container-fixed();
8
12
 
9
- @media (min-width: @screen-sm) {
13
+ @media (min-width: @screen-sm-min) {
10
14
  width: @container-sm;
11
15
  }
12
- @media (min-width: @screen-md) {
16
+ @media (min-width: @screen-md-min) {
13
17
  width: @container-md;
14
18
  }
15
19
  @media (min-width: @screen-lg-min) {
@@ -17,12 +21,30 @@
17
21
  }
18
22
  }
19
23
 
20
- // mobile first defaults
24
+
25
+ // Fluid container
26
+ //
27
+ // Utilizes the mixin meant for fixed width containers, but without any defined
28
+ // width for fluid, full width layouts.
29
+
30
+ .container-fluid {
31
+ .container-fixed();
32
+ }
33
+
34
+
35
+ // Row
36
+ //
37
+ // Rows contain and clear the floats of your columns.
38
+
21
39
  .row {
22
40
  .make-row();
23
41
  }
24
42
 
43
+
44
+ // Columns
45
+ //
25
46
  // Common styles for small and large grid columns
47
+
26
48
  .make-grid-columns();
27
49
 
28
50
 
@@ -76,4 +98,3 @@
76
98
  .make-grid(@grid-columns, lg, push);
77
99
  .make-grid(@grid-columns, lg, offset);
78
100
  }
79
-
@@ -17,6 +17,11 @@
17
17
  }
18
18
 
19
19
  .form-control {
20
+ // IE9 fubars the placeholder attribute in text inputs and the arrows on
21
+ // select elements in input groups. To fix it, we float the input. Details:
22
+ // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
23
+ float: left;
24
+
20
25
  width: 100%;
21
26
  margin-bottom: 0;
22
27
  }
@@ -90,8 +95,10 @@
90
95
  .input-group .form-control:first-child,
91
96
  .input-group-addon:first-child,
92
97
  .input-group-btn:first-child > .btn,
98
+ .input-group-btn:first-child > .btn-group > .btn,
93
99
  .input-group-btn:first-child > .dropdown-toggle,
94
- .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
100
+ .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
101
+ .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
95
102
  .border-right-radius(0);
96
103
  }
97
104
  .input-group-addon:first-child {
@@ -100,8 +107,10 @@
100
107
  .input-group .form-control:last-child,
101
108
  .input-group-addon:last-child,
102
109
  .input-group-btn:last-child > .btn,
110
+ .input-group-btn:last-child > .btn-group > .btn,
103
111
  .input-group-btn:last-child > .dropdown-toggle,
104
- .input-group-btn:first-child > .btn:not(:first-child) {
112
+ .input-group-btn:first-child > .btn:not(:first-child),
113
+ .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
105
114
  .border-left-radius(0);
106
115
  }
107
116
  .input-group-addon:last-child {
@@ -112,25 +121,37 @@
112
121
  // -------------------------
113
122
  .input-group-btn {
114
123
  position: relative;
124
+ // Jankily prevent input button groups from wrapping with `white-space` and
125
+ // `font-size` in combination with `inline-block` on buttons.
126
+ font-size: 0;
115
127
  white-space: nowrap;
116
128
 
117
- // Negative margin to only have a 1px border between the two
118
- &:first-child > .btn {
119
- margin-right: -1px;
129
+ // Negative margin for spacing, position for bringing hovered/focused/actived
130
+ // element above the siblings.
131
+ > .btn {
132
+ position: relative;
133
+ + .btn {
134
+ margin-left: -1px;
135
+ }
136
+ // Bring the "active" button to the front
137
+ &:hover,
138
+ &:focus,
139
+ &:active {
140
+ z-index: 2;
141
+ }
120
142
  }
121
- &:last-child > .btn {
122
- margin-left: -1px;
123
- }
124
- }
125
- .input-group-btn > .btn {
126
- position: relative;
127
- // Jankily prevent input button groups from wrapping
128
- + .btn {
129
- margin-left: -4px;
143
+
144
+ // Negative margin to only have a 1px border between the two
145
+ &:first-child {
146
+ > .btn,
147
+ > .btn-group {
148
+ margin-right: -1px;
149
+ }
130
150
  }
131
- // Bring the "active" button to the front
132
- &:hover,
133
- &:active {
134
- z-index: 2;
151
+ &:last-child {
152
+ > .btn,
153
+ > .btn-group {
154
+ margin-left: -1px;
155
+ }
135
156
  }
136
157
  }
@@ -6,19 +6,17 @@
6
6
  .jumbotron {
7
7
  padding: @jumbotron-padding;
8
8
  margin-bottom: @jumbotron-padding;
9
- font-size: @jumbotron-font-size;
10
- font-weight: 200;
11
- line-height: (@line-height-base * 1.5);
12
9
  color: @jumbotron-color;
13
10
  background-color: @jumbotron-bg;
14
11
 
15
12
  h1,
16
13
  .h1 {
17
- line-height: 1;
18
14
  color: @jumbotron-heading-color;
19
15
  }
20
16
  p {
21
- line-height: 1.4;
17
+ margin-bottom: (@jumbotron-padding / 2);
18
+ font-size: @jumbotron-font-size;
19
+ font-weight: 200;
22
20
  }
23
21
 
24
22
  .container & {
@@ -2,17 +2,21 @@
2
2
  // List groups
3
3
  // --------------------------------------------------
4
4
 
5
+
5
6
  // Base class
6
7
  //
7
8
  // Easily usable on <ul>, <ol>, or <div>.
9
+
8
10
  .list-group {
9
11
  // No need to set list-style: none; since .list-group-item is block level
10
12
  margin-bottom: 20px;
11
13
  padding-left: 0; // reset padding because ul and ol
12
14
  }
13
15
 
16
+
14
17
  // Individual list items
15
- // -------------------------
18
+ //
19
+ // Use on `li`s or `div`s within the `.list-group` parent.
16
20
 
17
21
  .list-group-item {
18
22
  position: relative;
@@ -41,7 +45,12 @@
41
45
  }
42
46
  }
43
47
 
48
+
44
49
  // Linked list items
50
+ //
51
+ // Use anchor elements instead of `li`s or `div`s to create linked list items.
52
+ // Includes an extra `.active` modifier class for showing selected items.
53
+
45
54
  a.list-group-item {
46
55
  color: @list-group-link-color;
47
56
 
@@ -70,13 +79,26 @@ a.list-group-item {
70
79
  color: inherit;
71
80
  }
72
81
  .list-group-item-text {
73
- color: lighten(@list-group-active-bg, 40%);
82
+ color: @list-group-active-text-color;
74
83
  }
75
84
  }
76
85
  }
77
86
 
87
+
88
+ // Contextual variants
89
+ //
90
+ // Add modifier classes to change text and background color on individual items.
91
+ // Organizationally, this must come after the `:hover` states.
92
+
93
+ .list-group-item-variant(success; @state-success-bg; @state-success-text);
94
+ .list-group-item-variant(info; @state-info-bg; @state-info-text);
95
+ .list-group-item-variant(warning; @state-warning-bg; @state-warning-text);
96
+ .list-group-item-variant(danger; @state-danger-bg; @state-danger-text);
97
+
98
+
78
99
  // Custom content options
79
- // -------------------------
100
+ //
101
+ // Extra classes for creating well-formatted content within `.list-group-item`s.
80
102
 
81
103
  .list-group-item-heading {
82
104
  margin-top: 0;
@@ -115,6 +115,10 @@
115
115
  }
116
116
 
117
117
  // Drop shadows
118
+ //
119
+ // Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
120
+ // supported browsers that have box shadow capabilities now support the
121
+ // standard `box-shadow` property.
118
122
  .box-shadow(@shadow) {
119
123
  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
120
124
  box-shadow: @shadow;
@@ -147,17 +151,17 @@
147
151
  // Transformations
148
152
  .rotate(@degrees) {
149
153
  -webkit-transform: rotate(@degrees);
150
- -ms-transform: rotate(@degrees); // IE9+
154
+ -ms-transform: rotate(@degrees); // IE9 only
151
155
  transform: rotate(@degrees);
152
156
  }
153
- .scale(@ratio) {
154
- -webkit-transform: scale(@ratio);
155
- -ms-transform: scale(@ratio); // IE9+
156
- transform: scale(@ratio);
157
+ .scale(@ratio; @ratio-y...) {
158
+ -webkit-transform: scale(@ratio, @ratio-y);
159
+ -ms-transform: scale(@ratio, @ratio-y); // IE9 only
160
+ transform: scale(@ratio, @ratio-y);
157
161
  }
158
162
  .translate(@x; @y) {
159
163
  -webkit-transform: translate(@x, @y);
160
- -ms-transform: translate(@x, @y); // IE9+
164
+ -ms-transform: translate(@x, @y); // IE9 only
161
165
  transform: translate(@x, @y);
162
166
  }
163
167
  .skew(@x; @y) {
@@ -172,12 +176,12 @@
172
176
 
173
177
  .rotateX(@degrees) {
174
178
  -webkit-transform: rotateX(@degrees);
175
- -ms-transform: rotateX(@degrees); // IE9+
179
+ -ms-transform: rotateX(@degrees); // IE9 only
176
180
  transform: rotateX(@degrees);
177
181
  }
178
182
  .rotateY(@degrees) {
179
183
  -webkit-transform: rotateY(@degrees);
180
- -ms-transform: rotateY(@degrees); // IE9+
184
+ -ms-transform: rotateY(@degrees); // IE9 only
181
185
  transform: rotateY(@degrees);
182
186
  }
183
187
  .perspective(@perspective) {
@@ -193,6 +197,7 @@
193
197
  .transform-origin(@origin) {
194
198
  -webkit-transform-origin: @origin;
195
199
  -moz-transform-origin: @origin;
200
+ -ms-transform-origin: @origin; // IE9 only
196
201
  transform-origin: @origin;
197
202
  }
198
203
 
@@ -201,6 +206,30 @@
201
206
  -webkit-animation: @animation;
202
207
  animation: @animation;
203
208
  }
209
+ .animation-name(@name) {
210
+ -webkit-animation-name: @name;
211
+ animation-name: @name;
212
+ }
213
+ .animation-duration(@duration) {
214
+ -webkit-animation-duration: @duration;
215
+ animation-duration: @duration;
216
+ }
217
+ .animation-timing-function(@timing-function) {
218
+ -webkit-animation-timing-function: @timing-function;
219
+ animation-timing-function: @timing-function;
220
+ }
221
+ .animation-delay(@delay) {
222
+ -webkit-animation-delay: @delay;
223
+ animation-delay: @delay;
224
+ }
225
+ .animation-iteration-count(@iteration-count) {
226
+ -webkit-animation-iteration-count: @iteration-count;
227
+ animation-iteration-count: @iteration-count;
228
+ }
229
+ .animation-direction(@direction) {
230
+ -webkit-animation-direction: @direction;
231
+ animation-direction: @direction;
232
+ }
204
233
 
205
234
  // Backface visibility
206
235
  // Prevent browsers from flickering when using CSS 3D transforms.
@@ -353,7 +382,7 @@
353
382
  //
354
383
  // Keep images from scaling beyond the width of their parents.
355
384
 
356
- .img-responsive(@display: block;) {
385
+ .img-responsive(@display: block) {
357
386
  display: @display;
358
387
  max-width: 100%; // Part 1: Set a maximum relative to the parent
359
388
  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
@@ -414,29 +443,57 @@
414
443
  .table-row-variant(@state; @background) {
415
444
  // Exact selectors below required to override `.table-striped` and prevent
416
445
  // inheritance to nested tables.
417
- .table {
418
- > thead,
419
- > tbody,
420
- > tfoot {
421
- > tr > .@{state},
422
- > .@{state} > td,
423
- > .@{state} > th {
424
- background-color: @background;
425
- }
446
+ .table > thead > tr,
447
+ .table > tbody > tr,
448
+ .table > tfoot > tr {
449
+ > td.@{state},
450
+ > th.@{state},
451
+ &.@{state} > td,
452
+ &.@{state} > th {
453
+ background-color: @background;
426
454
  }
427
455
  }
428
456
 
429
457
  // Hover states for `.table-hover`
430
458
  // Note: this is not available for cells or rows within `thead` or `tfoot`.
431
- .table-hover > tbody {
432
- > tr > .@{state}:hover,
433
- > .@{state}:hover > td,
434
- > .@{state}:hover > th {
459
+ .table-hover > tbody > tr {
460
+ > td.@{state}:hover,
461
+ > th.@{state}:hover,
462
+ &.@{state}:hover > td,
463
+ &.@{state}:hover > th {
435
464
  background-color: darken(@background, 5%);
436
465
  }
437
466
  }
438
467
  }
439
468
 
469
+ // List Groups
470
+ // -------------------------
471
+ .list-group-item-variant(@state; @background; @color) {
472
+ .list-group-item-@{state} {
473
+ color: @color;
474
+ background-color: @background;
475
+
476
+ a& {
477
+ color: @color;
478
+
479
+ .list-group-item-heading { color: inherit; }
480
+
481
+ &:hover,
482
+ &:focus {
483
+ color: @color;
484
+ background-color: darken(@background, 5%);
485
+ }
486
+ &.active,
487
+ &.active:hover,
488
+ &.active:focus {
489
+ color: #fff;
490
+ background-color: @color;
491
+ border-color: @color;
492
+ }
493
+ }
494
+ }
495
+ }
496
+
440
497
  // Button variants
441
498
  // -------------------------
442
499
  // Easily pump out default styles, as well as :hover, :focus, :active,
@@ -475,7 +532,7 @@
475
532
 
476
533
  .badge {
477
534
  color: @background;
478
- background-color: #fff;
535
+ background-color: @color;
479
536
  }
480
537
  }
481
538
 
@@ -524,6 +581,24 @@
524
581
  }
525
582
  }
526
583
 
584
+ // Contextual backgrounds
585
+ // -------------------------
586
+ .bg-variant(@color) {
587
+ background-color: @color;
588
+ a&:hover {
589
+ background-color: darken(@color, 10%);
590
+ }
591
+ }
592
+
593
+ // Typography
594
+ // -------------------------
595
+ .text-emphasis-variant(@color) {
596
+ color: @color;
597
+ a&:hover {
598
+ color: darken(@color, 10%);
599
+ }
600
+ }
601
+
527
602
  // Navbar vertical align
528
603
  // -------------------------
529
604
  // Vertically center elements in the navbar.
@@ -570,14 +645,14 @@
570
645
  margin-left: auto;
571
646
  padding-left: (@grid-gutter-width / 2);
572
647
  padding-right: (@grid-gutter-width / 2);
573
- .clearfix();
648
+ &:extend(.clearfix all);
574
649
  }
575
650
 
576
651
  // Creates a wrapper for a series of columns
577
652
  .make-row(@gutter: @grid-gutter-width) {
578
653
  margin-left: (@gutter / -2);
579
654
  margin-right: (@gutter / -2);
580
- .clearfix();
655
+ &:extend(.clearfix all);
581
656
  }
582
657
 
583
658
  // Generate the extra small columns
@@ -585,30 +660,39 @@
585
660
  position: relative;
586
661
  float: left;
587
662
  width: percentage((@columns / @grid-columns));
588
- // Prevent columns from collapsing when empty
589
663
  min-height: 1px;
590
- // Inner gutter via padding
591
664
  padding-left: (@gutter / 2);
592
665
  padding-right: (@gutter / 2);
593
666
  }
667
+ .make-xs-column-offset(@columns) {
668
+ @media (min-width: @screen-xs-min) {
669
+ margin-left: percentage((@columns / @grid-columns));
670
+ }
671
+ }
672
+ .make-xs-column-push(@columns) {
673
+ @media (min-width: @screen-xs-min) {
674
+ left: percentage((@columns / @grid-columns));
675
+ }
676
+ }
677
+ .make-xs-column-pull(@columns) {
678
+ @media (min-width: @screen-xs-min) {
679
+ right: percentage((@columns / @grid-columns));
680
+ }
681
+ }
682
+
594
683
 
595
684
  // Generate the small columns
596
685
  .make-sm-column(@columns; @gutter: @grid-gutter-width) {
597
686
  position: relative;
598
- // Prevent columns from collapsing when empty
599
687
  min-height: 1px;
600
- // Inner gutter via padding
601
688
  padding-left: (@gutter / 2);
602
689
  padding-right: (@gutter / 2);
603
690
 
604
- // Calculate width based on number of columns available
605
691
  @media (min-width: @screen-sm-min) {
606
692
  float: left;
607
693
  width: percentage((@columns / @grid-columns));
608
694
  }
609
695
  }
610
-
611
- // Generate the small column offsets
612
696
  .make-sm-column-offset(@columns) {
613
697
  @media (min-width: @screen-sm-min) {
614
698
  margin-left: percentage((@columns / @grid-columns));
@@ -625,30 +709,26 @@
625
709
  }
626
710
  }
627
711
 
712
+
628
713
  // Generate the medium columns
629
714
  .make-md-column(@columns; @gutter: @grid-gutter-width) {
630
715
  position: relative;
631
- // Prevent columns from collapsing when empty
632
716
  min-height: 1px;
633
- // Inner gutter via padding
634
717
  padding-left: (@gutter / 2);
635
718
  padding-right: (@gutter / 2);
636
719
 
637
- // Calculate width based on number of columns available
638
720
  @media (min-width: @screen-md-min) {
639
721
  float: left;
640
722
  width: percentage((@columns / @grid-columns));
641
723
  }
642
724
  }
643
-
644
- // Generate the medium column offsets
645
725
  .make-md-column-offset(@columns) {
646
726
  @media (min-width: @screen-md-min) {
647
727
  margin-left: percentage((@columns / @grid-columns));
648
728
  }
649
729
  }
650
730
  .make-md-column-push(@columns) {
651
- @media (min-width: @screen-md) {
731
+ @media (min-width: @screen-md-min) {
652
732
  left: percentage((@columns / @grid-columns));
653
733
  }
654
734
  }
@@ -658,23 +738,19 @@
658
738
  }
659
739
  }
660
740
 
741
+
661
742
  // Generate the large columns
662
743
  .make-lg-column(@columns; @gutter: @grid-gutter-width) {
663
744
  position: relative;
664
- // Prevent columns from collapsing when empty
665
745
  min-height: 1px;
666
- // Inner gutter via padding
667
746
  padding-left: (@gutter / 2);
668
747
  padding-right: (@gutter / 2);
669
748
 
670
- // Calculate width based on number of columns available
671
749
  @media (min-width: @screen-lg-min) {
672
750
  float: left;
673
751
  width: percentage((@columns / @grid-columns));
674
752
  }
675
753
  }
676
-
677
- // Generate the large column offsets
678
754
  .make-lg-column-offset(@columns) {
679
755
  @media (min-width: @screen-lg-min) {
680
756
  margin-left: percentage((@columns / @grid-columns));
@@ -701,11 +777,11 @@
701
777
  // Common styles for all sizes of grid columns, widths 1-12
702
778
  .col(@index) when (@index = 1) { // initial
703
779
  @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
704
- .col(@index + 1, @item);
780
+ .col((@index + 1), @item);
705
781
  }
706
782
  .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
707
783
  @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
708
- .col(@index + 1, ~"@{list}, @{item}");
784
+ .col((@index + 1), ~"@{list}, @{item}");
709
785
  }
710
786
  .col(@index, @list) when (@index > @grid-columns) { // terminal
711
787
  @{list} {
@@ -723,11 +799,11 @@
723
799
  .make-grid-columns-float(@class) {
724
800
  .col(@index) when (@index = 1) { // initial
725
801
  @item: ~".col-@{class}-@{index}";
726
- .col(@index + 1, @item);
802
+ .col((@index + 1), @item);
727
803
  }
728
804
  .col(@index, @list) when (@index =< @grid-columns) { // general
729
805
  @item: ~".col-@{class}-@{index}";
730
- .col(@index + 1, ~"@{list}, @{item}");
806
+ .col((@index + 1), ~"@{list}, @{item}");
731
807
  }
732
808
  .col(@index, @list) when (@index > @grid-columns) { // terminal
733
809
  @{list} {
@@ -762,7 +838,7 @@
762
838
  .make-grid(@index, @class, @type) when (@index >= 0) {
763
839
  .calc-grid(@index, @class, @type);
764
840
  // next iteration
765
- .make-grid(@index - 1, @class, @type);
841
+ .make-grid((@index - 1), @class, @type);
766
842
  }
767
843
 
768
844
 
@@ -797,6 +873,10 @@
797
873
  border-color: @border-color;
798
874
  background-color: @background-color;
799
875
  }
876
+ // Optional feedback icon
877
+ .form-control-feedback {
878
+ color: @text-color;
879
+ }
800
880
  }
801
881
 
802
882
  // Form control focus state
@@ -839,7 +919,8 @@
839
919
  line-height: @input-height;
840
920
  }
841
921
 
842
- textarea& {
922
+ textarea&,
923
+ select[multiple]& {
843
924
  height: auto;
844
925
  }
845
926
  }