bootstrap-generators 3.0.0.1 → 3.0.2

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.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +8 -8
  3. data/Rakefile +3 -7
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +57 -40
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +57 -40
  7. data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +1 -1
  8. data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +1 -1
  9. data/readme-template.md.erb +1 -1
  10. data/vendor/assets/fonts/glyphicons-halflings-regular.eot +0 -0
  11. data/vendor/assets/fonts/glyphicons-halflings-regular.svg +200 -199
  12. data/vendor/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
  13. data/vendor/assets/fonts/glyphicons-halflings-regular.woff +0 -0
  14. data/vendor/assets/javascripts/bootstrap.js +5 -5
  15. data/vendor/assets/javascripts/bootstrap/affix.js +4 -4
  16. data/vendor/assets/javascripts/bootstrap/alert.js +3 -3
  17. data/vendor/assets/javascripts/bootstrap/button.js +3 -3
  18. data/vendor/assets/javascripts/bootstrap/carousel.js +4 -4
  19. data/vendor/assets/javascripts/bootstrap/collapse.js +4 -4
  20. data/vendor/assets/javascripts/bootstrap/dropdown.js +4 -4
  21. data/vendor/assets/javascripts/bootstrap/modal.js +4 -4
  22. data/vendor/assets/javascripts/bootstrap/popover.js +4 -4
  23. data/vendor/assets/javascripts/bootstrap/scrollspy.js +4 -4
  24. data/vendor/assets/javascripts/bootstrap/tab.js +5 -5
  25. data/vendor/assets/javascripts/bootstrap/tooltip.js +4 -4
  26. data/vendor/assets/javascripts/bootstrap/transition.js +3 -3
  27. data/vendor/assets/stylesheets/bootstrap.css +1039 -746
  28. data/vendor/twitter/bootstrap/less/alerts.less +1 -1
  29. data/vendor/twitter/bootstrap/less/bootstrap.less +0 -10
  30. data/vendor/twitter/bootstrap/less/breadcrumbs.less +2 -2
  31. data/vendor/twitter/bootstrap/less/button-groups.less +6 -1
  32. data/vendor/twitter/bootstrap/less/buttons.less +2 -4
  33. data/vendor/twitter/bootstrap/less/carousel.less +32 -10
  34. data/vendor/twitter/bootstrap/less/code.less +5 -8
  35. data/vendor/twitter/bootstrap/less/dropdowns.less +1 -2
  36. data/vendor/twitter/bootstrap/less/forms.less +21 -10
  37. data/vendor/twitter/bootstrap/less/glyphicons.less +20 -15
  38. data/vendor/twitter/bootstrap/less/grid.less +32 -285
  39. data/vendor/twitter/bootstrap/less/input-groups.less +9 -0
  40. data/vendor/twitter/bootstrap/less/jumbotron.less +2 -2
  41. data/vendor/twitter/bootstrap/less/list-group.less +12 -12
  42. data/vendor/twitter/bootstrap/less/mixins.less +164 -29
  43. data/vendor/twitter/bootstrap/less/modals.less +2 -11
  44. data/vendor/twitter/bootstrap/less/navbar.less +10 -7
  45. data/vendor/twitter/bootstrap/less/navs.less +53 -20
  46. data/vendor/twitter/bootstrap/less/normalize.less +16 -6
  47. data/vendor/twitter/bootstrap/less/pagination.less +2 -0
  48. data/vendor/twitter/bootstrap/less/panels.less +31 -7
  49. data/vendor/twitter/bootstrap/less/print.less +6 -1
  50. data/vendor/twitter/bootstrap/less/progress-bars.less +4 -7
  51. data/vendor/twitter/bootstrap/less/responsive-utilities.less +57 -68
  52. data/vendor/twitter/bootstrap/less/scaffolding.less +1 -12
  53. data/vendor/twitter/bootstrap/less/tables.less +40 -40
  54. data/vendor/twitter/bootstrap/less/theme.less +32 -17
  55. data/vendor/twitter/bootstrap/less/thumbnails.less +14 -15
  56. data/vendor/twitter/bootstrap/less/tooltip.less +8 -8
  57. data/vendor/twitter/bootstrap/less/type.less +71 -30
  58. data/vendor/twitter/bootstrap/less/utilities.less +15 -1
  59. data/vendor/twitter/bootstrap/less/variables.less +56 -39
  60. data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
  61. data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +2 -2
  62. data/vendor/twitter/bootstrap/sass/_button-groups.scss +6 -1
  63. data/vendor/twitter/bootstrap/sass/_buttons.scss +2 -4
  64. data/vendor/twitter/bootstrap/sass/_carousel.scss +32 -10
  65. data/vendor/twitter/bootstrap/sass/_close.scss +2 -0
  66. data/vendor/twitter/bootstrap/sass/_code.scss +5 -8
  67. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +1 -2
  68. data/vendor/twitter/bootstrap/sass/_forms.scss +23 -10
  69. data/vendor/twitter/bootstrap/sass/_glyphicons.scss +20 -15
  70. data/vendor/twitter/bootstrap/sass/_grid.scss +32 -285
  71. data/vendor/twitter/bootstrap/sass/_input-groups.scss +9 -0
  72. data/vendor/twitter/bootstrap/sass/_jumbotron.scss +2 -2
  73. data/vendor/twitter/bootstrap/sass/_list-group.scss +16 -16
  74. data/vendor/twitter/bootstrap/sass/_mixins.scss +167 -34
  75. data/vendor/twitter/bootstrap/sass/_modals.scss +2 -15
  76. data/vendor/twitter/bootstrap/sass/_navbar.scss +10 -7
  77. data/vendor/twitter/bootstrap/sass/_navs.scss +53 -20
  78. data/vendor/twitter/bootstrap/sass/_normalize.scss +16 -6
  79. data/vendor/twitter/bootstrap/sass/_pagination.scss +2 -0
  80. data/vendor/twitter/bootstrap/sass/_panels.scss +31 -7
  81. data/vendor/twitter/bootstrap/sass/_print.scss +6 -1
  82. data/vendor/twitter/bootstrap/sass/_progress-bars.scss +4 -7
  83. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +37 -48
  84. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -12
  85. data/vendor/twitter/bootstrap/sass/_tables.scss +52 -44
  86. data/vendor/twitter/bootstrap/sass/_theme.scss +26 -11
  87. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +13 -12
  88. data/vendor/twitter/bootstrap/sass/_tooltip.scss +8 -8
  89. data/vendor/twitter/bootstrap/sass/_type.scss +71 -30
  90. data/vendor/twitter/bootstrap/sass/_utilities.scss +15 -1
  91. data/vendor/twitter/bootstrap/sass/_variables.scss +56 -39
  92. data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -10
  93. metadata +2 -5
  94. data/vendor/assets/javascripts/bootstrap-ie.js +0 -2
  95. data/vendor/assets/javascripts/bootstrap-ie/html5shiv.js +0 -8
  96. data/vendor/assets/javascripts/bootstrap-ie/respond.min.js +0 -6
@@ -16,7 +16,6 @@
16
16
  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
17
17
  // we can just straight up remove this.
18
18
  border-bottom: 0 dotted;
19
- content: "";
20
19
  }
21
20
 
22
21
  // The dropdown wrapper (div)
@@ -167,7 +166,7 @@
167
166
  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
168
167
  // gets fixed, restore `border-top: 0;`.
169
168
  border-top: 0 dotted;
170
- border-bottom: 4px solid $dropdown-caret-color;
169
+ border-bottom: $caret-width-base solid $dropdown-caret-color;
171
170
  content: "";
172
171
  }
173
172
  // Different positioning for bottom up menu
@@ -82,13 +82,14 @@ input[type="number"] {
82
82
  }
83
83
  }
84
84
 
85
-
86
- // Placeholder
87
- //
88
- // Placeholder text gets special styles because when browsers invalidate entire
89
- // lines if it doesn't understand a selector/
90
- .form-control {
91
- @include placeholder();
85
+ // Adjust output element
86
+ output {
87
+ display: block;
88
+ padding-top: ($padding-base-vertical + 1);
89
+ font-size: $font-size-base;
90
+ line-height: $line-height-base;
91
+ color: $input-color;
92
+ vertical-align: middle;
92
93
  }
93
94
 
94
95
 
@@ -124,6 +125,7 @@ input[type="number"] {
124
125
  color: $input-color;
125
126
  vertical-align: middle;
126
127
  background-color: $input-bg;
128
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
127
129
  border: 1px solid $input-border;
128
130
  border-radius: $input-border-radius;
129
131
  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -132,6 +134,12 @@ input[type="number"] {
132
134
  // Customize the `:focus` state to imitate native WebKit styles.
133
135
  @include form-control-focus();
134
136
 
137
+ // Placeholder
138
+ //
139
+ // Placeholder text gets special styles because when browsers invalidate entire
140
+ // lines if it doesn't understand a selector/
141
+ @include placeholder();
142
+
135
143
  // Disabled and read-only inputs
136
144
  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
137
145
  // be disabled if the fieldset is disabled. Due to implementation difficulty,
@@ -142,6 +150,8 @@ input[type="number"] {
142
150
  cursor: not-allowed;
143
151
  background-color: $input-bg-disabled;
144
152
  }
153
+
154
+ // [converter] extracted textarea& to textarea.form-control
145
155
  }
146
156
 
147
157
  // Reset height for `textarea`s
@@ -254,7 +264,6 @@ input[type="checkbox"],
254
264
 
255
265
  .form-control-static {
256
266
  margin-bottom: 0; // Remove default margin from `p`
257
- padding-top: ($padding-base-vertical + 1);
258
267
  }
259
268
 
260
269
 
@@ -286,7 +295,7 @@ input[type="checkbox"],
286
295
  .form-inline {
287
296
 
288
297
  // Kick in the inline
289
- @media (min-width: $screen-tablet) {
298
+ @media (min-width: $screen-sm) {
290
299
  // Inline-block all the things for "inline"
291
300
  .form-group {
292
301
  display: inline-block;
@@ -341,8 +350,12 @@ input[type="checkbox"],
341
350
  @include make-row();
342
351
  }
343
352
 
353
+ .form-control-static {
354
+ padding-top: ($padding-base-vertical + 1);
355
+ }
356
+
344
357
  // Only right align form labels here when the columns stop stacking
345
- @media (min-width: $screen-tablet) {
358
+ @media (min-width: $screen-sm-min) {
346
359
  .control-label {
347
360
  text-align: right;
348
361
  }
@@ -10,11 +10,11 @@
10
10
  // Import the fonts
11
11
  @font-face {
12
12
  font-family: 'Glyphicons Halflings';
13
- src: font-url('#{$icon-font-path}#{$icon-font-name}.eot');
14
- src: font-url('#{$icon-font-path}#{$icon-font-name}.eot?#iefix') format('embedded-opentype'),
15
- font-url('#{$icon-font-path}#{$icon-font-name}.woff') format('woff'),
16
- font-url('#{$icon-font-path}#{$icon-font-name}.ttf') format('truetype'),
17
- font-url('#{$icon-font-path}#{$icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
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#glyphicons_halflingsregular') format('svg');
18
18
  }
19
19
 
20
20
  // Catchall baseclass
@@ -27,6 +27,11 @@
27
27
  font-weight: normal;
28
28
  line-height: 1;
29
29
  -webkit-font-smoothing: antialiased;
30
+ -moz-osx-font-smoothing: grayscale;
31
+
32
+ &:empty {
33
+ width: 1em;
34
+ }
30
35
  }
31
36
 
32
37
  // Individual icons
@@ -68,6 +73,7 @@
68
73
  .glyphicon-repeat { &:before { content: "\e030"; } }
69
74
  .glyphicon-refresh { &:before { content: "\e031"; } }
70
75
  .glyphicon-list-alt { &:before { content: "\e032"; } }
76
+ .glyphicon-lock { &:before { content: "\e033"; } }
71
77
  .glyphicon-flag { &:before { content: "\e034"; } }
72
78
  .glyphicon-headphones { &:before { content: "\e035"; } }
73
79
  .glyphicon-volume-off { &:before { content: "\e036"; } }
@@ -78,7 +84,9 @@
78
84
  .glyphicon-tag { &:before { content: "\e041"; } }
79
85
  .glyphicon-tags { &:before { content: "\e042"; } }
80
86
  .glyphicon-book { &:before { content: "\e043"; } }
87
+ .glyphicon-bookmark { &:before { content: "\e044"; } }
81
88
  .glyphicon-print { &:before { content: "\e045"; } }
89
+ .glyphicon-camera { &:before { content: "\e046"; } }
82
90
  .glyphicon-font { &:before { content: "\e047"; } }
83
91
  .glyphicon-bold { &:before { content: "\e048"; } }
84
92
  .glyphicon-italic { &:before { content: "\e049"; } }
@@ -132,10 +140,12 @@
132
140
  .glyphicon-exclamation-sign { &:before { content: "\e101"; } }
133
141
  .glyphicon-gift { &:before { content: "\e102"; } }
134
142
  .glyphicon-leaf { &:before { content: "\e103"; } }
143
+ .glyphicon-fire { &:before { content: "\e104"; } }
135
144
  .glyphicon-eye-open { &:before { content: "\e105"; } }
136
145
  .glyphicon-eye-close { &:before { content: "\e106"; } }
137
146
  .glyphicon-warning-sign { &:before { content: "\e107"; } }
138
147
  .glyphicon-plane { &:before { content: "\e108"; } }
148
+ .glyphicon-calendar { &:before { content: "\e109"; } }
139
149
  .glyphicon-random { &:before { content: "\e110"; } }
140
150
  .glyphicon-comment { &:before { content: "\e111"; } }
141
151
  .glyphicon-magnet { &:before { content: "\e112"; } }
@@ -149,6 +159,7 @@
149
159
  .glyphicon-resize-horizontal { &:before { content: "\e120"; } }
150
160
  .glyphicon-hdd { &:before { content: "\e121"; } }
151
161
  .glyphicon-bullhorn { &:before { content: "\e122"; } }
162
+ .glyphicon-bell { &:before { content: "\e123"; } }
152
163
  .glyphicon-certificate { &:before { content: "\e124"; } }
153
164
  .glyphicon-thumbs-up { &:before { content: "\e125"; } }
154
165
  .glyphicon-thumbs-down { &:before { content: "\e126"; } }
@@ -161,13 +172,17 @@
161
172
  .glyphicon-circle-arrow-up { &:before { content: "\e133"; } }
162
173
  .glyphicon-circle-arrow-down { &:before { content: "\e134"; } }
163
174
  .glyphicon-globe { &:before { content: "\e135"; } }
175
+ .glyphicon-wrench { &:before { content: "\e136"; } }
164
176
  .glyphicon-tasks { &:before { content: "\e137"; } }
165
177
  .glyphicon-filter { &:before { content: "\e138"; } }
178
+ .glyphicon-briefcase { &:before { content: "\e139"; } }
166
179
  .glyphicon-fullscreen { &:before { content: "\e140"; } }
167
180
  .glyphicon-dashboard { &:before { content: "\e141"; } }
181
+ .glyphicon-paperclip { &:before { content: "\e142"; } }
168
182
  .glyphicon-heart-empty { &:before { content: "\e143"; } }
169
183
  .glyphicon-link { &:before { content: "\e144"; } }
170
184
  .glyphicon-phone { &:before { content: "\e145"; } }
185
+ .glyphicon-pushpin { &:before { content: "\e146"; } }
171
186
  .glyphicon-usd { &:before { content: "\e148"; } }
172
187
  .glyphicon-gbp { &:before { content: "\e149"; } }
173
188
  .glyphicon-sort { &:before { content: "\e150"; } }
@@ -220,13 +235,3 @@
220
235
  .glyphicon-cloud-upload { &:before { content: "\e198"; } }
221
236
  .glyphicon-tree-conifer { &:before { content: "\e199"; } }
222
237
  .glyphicon-tree-deciduous { &:before { content: "\e200"; } }
223
- .glyphicon-briefcase { &:before { content: "\1f4bc"; } }
224
- .glyphicon-calendar { &:before { content: "\1f4c5"; } }
225
- .glyphicon-pushpin { &:before { content: "\1f4cc"; } }
226
- .glyphicon-paperclip { &:before { content: "\1f4ce"; } }
227
- .glyphicon-camera { &:before { content: "\1f4f7"; } }
228
- .glyphicon-lock { &:before { content: "\1f512"; } }
229
- .glyphicon-bell { &:before { content: "\1f514"; } }
230
- .glyphicon-bookmark { &:before { content: "\1f516"; } }
231
- .glyphicon-fire { &:before { content: "\1f525"; } }
232
- .glyphicon-wrench { &:before { content: "\1f527"; } }
@@ -2,7 +2,6 @@
2
2
  // Grid system
3
3
  // --------------------------------------------------
4
4
 
5
-
6
5
  // Set the container width, and override it for fixed navbars in media queries
7
6
  .container {
8
7
  @include container-fixed();
@@ -14,61 +13,7 @@
14
13
  }
15
14
 
16
15
  // Common styles for small and large grid columns
17
- .col-xs-1,
18
- .col-xs-2,
19
- .col-xs-3,
20
- .col-xs-4,
21
- .col-xs-5,
22
- .col-xs-6,
23
- .col-xs-7,
24
- .col-xs-8,
25
- .col-xs-9,
26
- .col-xs-10,
27
- .col-xs-11,
28
- .col-xs-12,
29
- .col-sm-1,
30
- .col-sm-2,
31
- .col-sm-3,
32
- .col-sm-4,
33
- .col-sm-5,
34
- .col-sm-6,
35
- .col-sm-7,
36
- .col-sm-8,
37
- .col-sm-9,
38
- .col-sm-10,
39
- .col-sm-11,
40
- .col-sm-12,
41
- .col-md-1,
42
- .col-md-2,
43
- .col-md-3,
44
- .col-md-4,
45
- .col-md-5,
46
- .col-md-6,
47
- .col-md-7,
48
- .col-md-8,
49
- .col-md-9,
50
- .col-md-10,
51
- .col-md-11,
52
- .col-md-12,
53
- .col-lg-1,
54
- .col-lg-2,
55
- .col-lg-3,
56
- .col-lg-4,
57
- .col-lg-5,
58
- .col-lg-6,
59
- .col-lg-7,
60
- .col-lg-8,
61
- .col-lg-9,
62
- .col-lg-10,
63
- .col-lg-11,
64
- .col-lg-12 {
65
- position: relative;
66
- // Prevent columns from collapsing when empty
67
- min-height: 1px;
68
- // Inner gutter via padding
69
- padding-left: ($grid-gutter-width / 2);
70
- padding-right: ($grid-gutter-width / 2);
71
- }
16
+ @include make-grid-columns();
72
17
 
73
18
 
74
19
  // Extra small grid
@@ -76,34 +21,14 @@
76
21
  // Grid classes for extra small devices like smartphones. No offset, push, or
77
22
  // pull classes are present here due to the size of the target.
78
23
  //
79
- // Note that `.col-xs-12` doesn't get floated on purposethere's no need since
24
+ // Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
80
25
  // it's full-width.
81
26
 
82
- .col-xs-1,
83
- .col-xs-2,
84
- .col-xs-3,
85
- .col-xs-4,
86
- .col-xs-5,
87
- .col-xs-6,
88
- .col-xs-7,
89
- .col-xs-8,
90
- .col-xs-9,
91
- .col-xs-10,
92
- .col-xs-11 {
93
- float: left;
94
- }
95
- .col-xs-1 { width: percentage((1 / $grid-columns)); }
96
- .col-xs-2 { width: percentage((2 / $grid-columns)); }
97
- .col-xs-3 { width: percentage((3 / $grid-columns)); }
98
- .col-xs-4 { width: percentage((4 / $grid-columns)); }
99
- .col-xs-5 { width: percentage((5 / $grid-columns)); }
100
- .col-xs-6 { width: percentage((6 / $grid-columns)); }
101
- .col-xs-7 { width: percentage((7 / $grid-columns)); }
102
- .col-xs-8 { width: percentage((8 / $grid-columns)); }
103
- .col-xs-9 { width: percentage((9 / $grid-columns)); }
104
- .col-xs-10 { width: percentage((10/ $grid-columns)); }
105
- .col-xs-11 { width: percentage((11/ $grid-columns)); }
106
- .col-xs-12 { width: 100%; }
27
+ @include make-grid-columns-float(xs);
28
+ @include make-grid($grid-columns, xs, width);
29
+ @include make-grid($grid-columns, xs, pull);
30
+ @include make-grid($grid-columns, xs, push);
31
+ @include make-grid($grid-columns, xs, offset);
107
32
 
108
33
 
109
34
  // Small grid
@@ -111,77 +36,19 @@
111
36
  // Columns, offsets, pushes, and pulls for the small device range, from phones
112
37
  // to tablets.
113
38
  //
114
- // Note that `.col-sm-12` doesn't get floated on purposethere's no need since
39
+ // Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
115
40
  // it's full-width.
116
41
 
117
- @media (min-width: $screen-tablet) {
42
+ @media (min-width: $screen-sm-min) {
118
43
  .container {
119
- max-width: $container-tablet;
120
- }
121
-
122
- .col-sm-1,
123
- .col-sm-2,
124
- .col-sm-3,
125
- .col-sm-4,
126
- .col-sm-5,
127
- .col-sm-6,
128
- .col-sm-7,
129
- .col-sm-8,
130
- .col-sm-9,
131
- .col-sm-10,
132
- .col-sm-11 {
133
- float: left;
44
+ width: $container-sm;
134
45
  }
135
- .col-sm-1 { width: percentage((1 / $grid-columns)); }
136
- .col-sm-2 { width: percentage((2 / $grid-columns)); }
137
- .col-sm-3 { width: percentage((3 / $grid-columns)); }
138
- .col-sm-4 { width: percentage((4 / $grid-columns)); }
139
- .col-sm-5 { width: percentage((5 / $grid-columns)); }
140
- .col-sm-6 { width: percentage((6 / $grid-columns)); }
141
- .col-sm-7 { width: percentage((7 / $grid-columns)); }
142
- .col-sm-8 { width: percentage((8 / $grid-columns)); }
143
- .col-sm-9 { width: percentage((9 / $grid-columns)); }
144
- .col-sm-10 { width: percentage((10/ $grid-columns)); }
145
- .col-sm-11 { width: percentage((11/ $grid-columns)); }
146
- .col-sm-12 { width: 100%; }
147
-
148
- // Push and pull columns for source order changes
149
- .col-sm-push-1 { left: percentage((1 / $grid-columns)); }
150
- .col-sm-push-2 { left: percentage((2 / $grid-columns)); }
151
- .col-sm-push-3 { left: percentage((3 / $grid-columns)); }
152
- .col-sm-push-4 { left: percentage((4 / $grid-columns)); }
153
- .col-sm-push-5 { left: percentage((5 / $grid-columns)); }
154
- .col-sm-push-6 { left: percentage((6 / $grid-columns)); }
155
- .col-sm-push-7 { left: percentage((7 / $grid-columns)); }
156
- .col-sm-push-8 { left: percentage((8 / $grid-columns)); }
157
- .col-sm-push-9 { left: percentage((9 / $grid-columns)); }
158
- .col-sm-push-10 { left: percentage((10/ $grid-columns)); }
159
- .col-sm-push-11 { left: percentage((11/ $grid-columns)); }
160
46
 
161
- .col-sm-pull-1 { right: percentage((1 / $grid-columns)); }
162
- .col-sm-pull-2 { right: percentage((2 / $grid-columns)); }
163
- .col-sm-pull-3 { right: percentage((3 / $grid-columns)); }
164
- .col-sm-pull-4 { right: percentage((4 / $grid-columns)); }
165
- .col-sm-pull-5 { right: percentage((5 / $grid-columns)); }
166
- .col-sm-pull-6 { right: percentage((6 / $grid-columns)); }
167
- .col-sm-pull-7 { right: percentage((7 / $grid-columns)); }
168
- .col-sm-pull-8 { right: percentage((8 / $grid-columns)); }
169
- .col-sm-pull-9 { right: percentage((9 / $grid-columns)); }
170
- .col-sm-pull-10 { right: percentage((10/ $grid-columns)); }
171
- .col-sm-pull-11 { right: percentage((11/ $grid-columns)); }
172
-
173
- // Offsets
174
- .col-sm-offset-1 { margin-left: percentage((1 / $grid-columns)); }
175
- .col-sm-offset-2 { margin-left: percentage((2 / $grid-columns)); }
176
- .col-sm-offset-3 { margin-left: percentage((3 / $grid-columns)); }
177
- .col-sm-offset-4 { margin-left: percentage((4 / $grid-columns)); }
178
- .col-sm-offset-5 { margin-left: percentage((5 / $grid-columns)); }
179
- .col-sm-offset-6 { margin-left: percentage((6 / $grid-columns)); }
180
- .col-sm-offset-7 { margin-left: percentage((7 / $grid-columns)); }
181
- .col-sm-offset-8 { margin-left: percentage((8 / $grid-columns)); }
182
- .col-sm-offset-9 { margin-left: percentage((9 / $grid-columns)); }
183
- .col-sm-offset-10 { margin-left: percentage((10/ $grid-columns)); }
184
- .col-sm-offset-11 { margin-left: percentage((11/ $grid-columns)); }
47
+ @include make-grid-columns-float(sm);
48
+ @include make-grid($grid-columns, sm, width);
49
+ @include make-grid($grid-columns, sm, pull);
50
+ @include make-grid($grid-columns, sm, push);
51
+ @include make-grid($grid-columns, sm, offset);
185
52
  }
186
53
 
187
54
 
@@ -189,79 +56,19 @@
189
56
  //
190
57
  // Columns, offsets, pushes, and pulls for the desktop device range.
191
58
  //
192
- // Note that `.col-md-12` doesn't get floated on purposethere's no need since
59
+ // Note that `.col-md-12` doesn't get floated on purpose--there's no need since
193
60
  // it's full-width.
194
61
 
195
- @media (min-width: $screen-desktop) {
62
+ @media (min-width: $screen-md-min) {
196
63
  .container {
197
- max-width: $container-desktop;
198
- }
199
- .col-md-1,
200
- .col-md-2,
201
- .col-md-3,
202
- .col-md-4,
203
- .col-md-5,
204
- .col-md-6,
205
- .col-md-7,
206
- .col-md-8,
207
- .col-md-9,
208
- .col-md-10,
209
- .col-md-11 {
210
- float: left;
64
+ width: $container-md;
211
65
  }
212
- .col-md-1 { width: percentage((1 / $grid-columns)); }
213
- .col-md-2 { width: percentage((2 / $grid-columns)); }
214
- .col-md-3 { width: percentage((3 / $grid-columns)); }
215
- .col-md-4 { width: percentage((4 / $grid-columns)); }
216
- .col-md-5 { width: percentage((5 / $grid-columns)); }
217
- .col-md-6 { width: percentage((6 / $grid-columns)); }
218
- .col-md-7 { width: percentage((7 / $grid-columns)); }
219
- .col-md-8 { width: percentage((8 / $grid-columns)); }
220
- .col-md-9 { width: percentage((9 / $grid-columns)); }
221
- .col-md-10 { width: percentage((10/ $grid-columns)); }
222
- .col-md-11 { width: percentage((11/ $grid-columns)); }
223
- .col-md-12 { width: 100%; }
224
66
 
225
- // Push and pull columns for source order changes
226
- .col-md-push-0 { left: auto; }
227
- .col-md-push-1 { left: percentage((1 / $grid-columns)); }
228
- .col-md-push-2 { left: percentage((2 / $grid-columns)); }
229
- .col-md-push-3 { left: percentage((3 / $grid-columns)); }
230
- .col-md-push-4 { left: percentage((4 / $grid-columns)); }
231
- .col-md-push-5 { left: percentage((5 / $grid-columns)); }
232
- .col-md-push-6 { left: percentage((6 / $grid-columns)); }
233
- .col-md-push-7 { left: percentage((7 / $grid-columns)); }
234
- .col-md-push-8 { left: percentage((8 / $grid-columns)); }
235
- .col-md-push-9 { left: percentage((9 / $grid-columns)); }
236
- .col-md-push-10 { left: percentage((10/ $grid-columns)); }
237
- .col-md-push-11 { left: percentage((11/ $grid-columns)); }
238
-
239
- .col-md-pull-0 { right: auto; }
240
- .col-md-pull-1 { right: percentage((1 / $grid-columns)); }
241
- .col-md-pull-2 { right: percentage((2 / $grid-columns)); }
242
- .col-md-pull-3 { right: percentage((3 / $grid-columns)); }
243
- .col-md-pull-4 { right: percentage((4 / $grid-columns)); }
244
- .col-md-pull-5 { right: percentage((5 / $grid-columns)); }
245
- .col-md-pull-6 { right: percentage((6 / $grid-columns)); }
246
- .col-md-pull-7 { right: percentage((7 / $grid-columns)); }
247
- .col-md-pull-8 { right: percentage((8 / $grid-columns)); }
248
- .col-md-pull-9 { right: percentage((9 / $grid-columns)); }
249
- .col-md-pull-10 { right: percentage((10/ $grid-columns)); }
250
- .col-md-pull-11 { right: percentage((11/ $grid-columns)); }
251
-
252
- // Offsets
253
- .col-md-offset-0 { margin-left: 0; }
254
- .col-md-offset-1 { margin-left: percentage((1 / $grid-columns)); }
255
- .col-md-offset-2 { margin-left: percentage((2 / $grid-columns)); }
256
- .col-md-offset-3 { margin-left: percentage((3 / $grid-columns)); }
257
- .col-md-offset-4 { margin-left: percentage((4 / $grid-columns)); }
258
- .col-md-offset-5 { margin-left: percentage((5 / $grid-columns)); }
259
- .col-md-offset-6 { margin-left: percentage((6 / $grid-columns)); }
260
- .col-md-offset-7 { margin-left: percentage((7 / $grid-columns)); }
261
- .col-md-offset-8 { margin-left: percentage((8 / $grid-columns)); }
262
- .col-md-offset-9 { margin-left: percentage((9 / $grid-columns)); }
263
- .col-md-offset-10 { margin-left: percentage((10/ $grid-columns)); }
264
- .col-md-offset-11 { margin-left: percentage((11/ $grid-columns)); }
67
+ @include make-grid-columns-float(md);
68
+ @include make-grid($grid-columns, md, width);
69
+ @include make-grid($grid-columns, md, pull);
70
+ @include make-grid($grid-columns, md, push);
71
+ @include make-grid($grid-columns, md, offset);
265
72
  }
266
73
 
267
74
 
@@ -269,78 +76,18 @@
269
76
  //
270
77
  // Columns, offsets, pushes, and pulls for the large desktop device range.
271
78
  //
272
- // Note that `.col-lg-12` doesn't get floated on purposethere's no need since
79
+ // Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
273
80
  // it's full-width.
274
81
 
275
- @media (min-width: $screen-lg-desktop) {
82
+ @media (min-width: $screen-lg-min) {
276
83
  .container {
277
- max-width: $container-lg-desktop;
278
- }
279
-
280
- .col-lg-1,
281
- .col-lg-2,
282
- .col-lg-3,
283
- .col-lg-4,
284
- .col-lg-5,
285
- .col-lg-6,
286
- .col-lg-7,
287
- .col-lg-8,
288
- .col-lg-9,
289
- .col-lg-10,
290
- .col-lg-11 {
291
- float: left;
84
+ width: $container-lg;
292
85
  }
293
- .col-lg-1 { width: percentage((1 / $grid-columns)); }
294
- .col-lg-2 { width: percentage((2 / $grid-columns)); }
295
- .col-lg-3 { width: percentage((3 / $grid-columns)); }
296
- .col-lg-4 { width: percentage((4 / $grid-columns)); }
297
- .col-lg-5 { width: percentage((5 / $grid-columns)); }
298
- .col-lg-6 { width: percentage((6 / $grid-columns)); }
299
- .col-lg-7 { width: percentage((7 / $grid-columns)); }
300
- .col-lg-8 { width: percentage((8 / $grid-columns)); }
301
- .col-lg-9 { width: percentage((9 / $grid-columns)); }
302
- .col-lg-10 { width: percentage((10/ $grid-columns)); }
303
- .col-lg-11 { width: percentage((11/ $grid-columns)); }
304
- .col-lg-12 { width: 100%; }
305
86
 
306
- // Push and pull columns for source order changes
307
- .col-lg-push-0 { left: auto; }
308
- .col-lg-push-1 { left: percentage((1 / $grid-columns)); }
309
- .col-lg-push-2 { left: percentage((2 / $grid-columns)); }
310
- .col-lg-push-3 { left: percentage((3 / $grid-columns)); }
311
- .col-lg-push-4 { left: percentage((4 / $grid-columns)); }
312
- .col-lg-push-5 { left: percentage((5 / $grid-columns)); }
313
- .col-lg-push-6 { left: percentage((6 / $grid-columns)); }
314
- .col-lg-push-7 { left: percentage((7 / $grid-columns)); }
315
- .col-lg-push-8 { left: percentage((8 / $grid-columns)); }
316
- .col-lg-push-9 { left: percentage((9 / $grid-columns)); }
317
- .col-lg-push-10 { left: percentage((10/ $grid-columns)); }
318
- .col-lg-push-11 { left: percentage((11/ $grid-columns)); }
319
-
320
- .col-lg-pull-0 { right: auto; }
321
- .col-lg-pull-1 { right: percentage((1 / $grid-columns)); }
322
- .col-lg-pull-2 { right: percentage((2 / $grid-columns)); }
323
- .col-lg-pull-3 { right: percentage((3 / $grid-columns)); }
324
- .col-lg-pull-4 { right: percentage((4 / $grid-columns)); }
325
- .col-lg-pull-5 { right: percentage((5 / $grid-columns)); }
326
- .col-lg-pull-6 { right: percentage((6 / $grid-columns)); }
327
- .col-lg-pull-7 { right: percentage((7 / $grid-columns)); }
328
- .col-lg-pull-8 { right: percentage((8 / $grid-columns)); }
329
- .col-lg-pull-9 { right: percentage((9 / $grid-columns)); }
330
- .col-lg-pull-10 { right: percentage((10/ $grid-columns)); }
331
- .col-lg-pull-11 { right: percentage((11/ $grid-columns)); }
332
-
333
- // Offsets
334
- .col-lg-offset-0 { margin-left: 0; }
335
- .col-lg-offset-1 { margin-left: percentage((1 / $grid-columns)); }
336
- .col-lg-offset-2 { margin-left: percentage((2 / $grid-columns)); }
337
- .col-lg-offset-3 { margin-left: percentage((3 / $grid-columns)); }
338
- .col-lg-offset-4 { margin-left: percentage((4 / $grid-columns)); }
339
- .col-lg-offset-5 { margin-left: percentage((5 / $grid-columns)); }
340
- .col-lg-offset-6 { margin-left: percentage((6 / $grid-columns)); }
341
- .col-lg-offset-7 { margin-left: percentage((7 / $grid-columns)); }
342
- .col-lg-offset-8 { margin-left: percentage((8 / $grid-columns)); }
343
- .col-lg-offset-9 { margin-left: percentage((9 / $grid-columns)); }
344
- .col-lg-offset-10 { margin-left: percentage((10/ $grid-columns)); }
345
- .col-lg-offset-11 { margin-left: percentage((11/ $grid-columns)); }
87
+ @include make-grid-columns-float(lg);
88
+ @include make-grid($grid-columns, lg, width);
89
+ @include make-grid($grid-columns, lg, pull);
90
+ @include make-grid($grid-columns, lg, push);
91
+ @include make-grid($grid-columns, lg, offset);
346
92
  }
93
+