bootstrap-sass 3.1.1.0 → 3.1.1.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bootstrap-sass might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.gitignore +3 -1
- data/.travis.yml +5 -2
- data/Gemfile +4 -0
- data/README.md +41 -20
- data/Rakefile +5 -2
- data/bootstrap-sass.gemspec +10 -7
- data/bower.json +98 -2
- data/lib/bootstrap-sass.rb +0 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/package.json +25 -0
- data/tasks/bower.rake +33 -0
- data/tasks/converter.rb +3 -1
- data/tasks/converter/less_conversion.rb +54 -35
- data/tasks/converter/network.rb +10 -7
- data/templates/project/_variables.sass.erb +6 -0
- data/templates/project/manifest.rb +2 -2
- data/templates/project/styles.sass +3 -0
- data/test/dummy_node_mincer/apple-touch-icon-144-precomposed.png +0 -0
- data/test/dummy_node_mincer/application.css.ejs.scss +6 -0
- data/test/dummy_node_mincer/manifest.js +87 -0
- data/test/{dummy → dummy_rails}/README.rdoc +0 -0
- data/test/{dummy → dummy_rails}/Rakefile +0 -0
- data/test/{dummy → dummy_rails}/app/assets/images/.keep +0 -0
- data/test/{dummy → dummy_rails}/app/assets/javascripts/application.js +0 -0
- data/test/{dummy → dummy_rails}/app/assets/stylesheets/application.css.sass +0 -0
- data/test/{dummy → dummy_rails}/app/controllers/application_controller.rb +0 -0
- data/test/{dummy → dummy_rails}/app/controllers/pages_controller.rb +0 -0
- data/test/{dummy → dummy_rails}/app/helpers/application_helper.rb +0 -0
- data/test/{dummy → dummy_rails}/app/views/layouts/application.html.erb +0 -0
- data/test/{dummy → dummy_rails}/app/views/pages/root.html.slim +0 -0
- data/test/{dummy → dummy_rails}/bin/bundle +0 -0
- data/test/{dummy → dummy_rails}/bin/rails +0 -0
- data/test/{dummy → dummy_rails}/bin/rake +0 -0
- data/test/{dummy → dummy_rails}/config.ru +0 -0
- data/test/{dummy → dummy_rails}/config/application.rb +3 -6
- data/test/{dummy → dummy_rails}/config/boot.rb +0 -0
- data/test/{dummy → dummy_rails}/config/environment.rb +0 -0
- data/test/{dummy → dummy_rails}/config/environments/development.rb +0 -0
- data/test/{dummy → dummy_rails}/config/environments/production.rb +0 -0
- data/test/{dummy → dummy_rails}/config/environments/test.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/backtrace_silencers.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/filter_parameter_logging.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/inflections.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/mime_types.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/secret_token.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/session_store.rb +0 -0
- data/test/{dummy → dummy_rails}/config/initializers/wrap_parameters.rb +0 -0
- data/test/{dummy → dummy_rails}/config/locales/en.yml +0 -0
- data/test/{dummy → dummy_rails}/config/locales/es.yml +0 -0
- data/test/{dummy → dummy_rails}/config/routes.rb +0 -0
- data/test/{dummy → dummy_rails}/db/test.sqlite3 +0 -0
- data/test/{dummy → dummy_rails}/lib/assets/.keep +0 -0
- data/test/{dummy → dummy_rails}/log/.keep +0 -0
- data/test/{dummy → dummy_rails}/public/404.html +0 -0
- data/test/{dummy → dummy_rails}/public/422.html +0 -0
- data/test/{dummy → dummy_rails}/public/500.html +0 -0
- data/test/{dummy → dummy_rails}/public/favicon.ico +0 -0
- data/test/gemfiles/sass_3_2.gemfile +3 -0
- data/test/gemfiles/sass_3_3.gemfile +17 -0
- data/test/gemfiles/sass_head.gemfile +5 -2
- data/test/node_mincer_test.rb +35 -0
- data/test/node_sass_test.rb +15 -0
- data/test/test_helper.rb +2 -2
- data/vendor/assets/javascripts/bootstrap/affix.js +2 -4
- data/vendor/assets/javascripts/bootstrap/carousel.js +5 -5
- data/vendor/assets/javascripts/bootstrap/collapse.js +18 -13
- data/vendor/assets/javascripts/bootstrap/dropdown.js +8 -8
- data/vendor/assets/javascripts/bootstrap/modal.js +43 -15
- data/vendor/assets/javascripts/bootstrap/popover.js +1 -1
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +5 -4
- data/vendor/assets/javascripts/bootstrap/tooltip.js +64 -41
- data/vendor/assets/javascripts/bootstrap/transition.js +4 -4
- data/vendor/assets/stylesheets/_bootstrap-mincer.scss +17 -0
- data/vendor/assets/stylesheets/bootstrap.scss +3 -2
- data/vendor/assets/stylesheets/bootstrap/_badges.scss +13 -11
- data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +12 -2
- data/vendor/assets/stylesheets/bootstrap/_carousel.scss +12 -3
- data/vendor/assets/stylesheets/bootstrap/_code.scss +0 -1
- data/vendor/assets/stylesheets/bootstrap/_component-animations.scss +10 -4
- data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +1 -0
- data/vendor/assets/stylesheets/bootstrap/_forms.scss +62 -20
- data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +4 -0
- data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +4 -0
- data/vendor/assets/stylesheets/bootstrap/_labels.scss +11 -9
- data/vendor/assets/stylesheets/bootstrap/_list-group.scss +19 -0
- data/vendor/assets/stylesheets/bootstrap/_mixins.scss +35 -943
- data/vendor/assets/stylesheets/bootstrap/_modals.scss +11 -3
- data/vendor/assets/stylesheets/bootstrap/_navbar.scss +40 -2
- data/vendor/assets/stylesheets/bootstrap/_normalize.scss +21 -19
- data/vendor/assets/stylesheets/bootstrap/_panels.scss +2 -3
- data/vendor/assets/stylesheets/bootstrap/_popovers.scss +1 -1
- data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +16 -7
- data/vendor/assets/stylesheets/bootstrap/_responsive-embed.scss +34 -0
- data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +99 -0
- data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +16 -0
- data/vendor/assets/stylesheets/bootstrap/_tables.scss +2 -2
- data/vendor/assets/stylesheets/bootstrap/_type.scss +16 -6
- data/vendor/assets/stylesheets/bootstrap/_variables.scss +26 -10
- data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +3 -2
- data/vendor/assets/stylesheets/bootstrap/mixins/_alerts.scss +14 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_background-variant.scss +11 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_buttons.scss +50 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_forms.scss +84 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_gradients.scss +58 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +87 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_grid.scss +122 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_image.scss +33 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_labels.scss +12 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_list-group.scss +31 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_opacity.scss +8 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_pagination.scss +23 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_panels.scss +20 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_progress-bar.scss +8 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_resize.scss +6 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +21 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_size.scss +10 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +11 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
- data/vendor/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +224 -0
- metadata +169 -136
- data/templates/project/_variables.scss.erb +0 -3
- data/templates/project/styles.scss +0 -3
@@ -17,10 +17,10 @@
|
|
17
17
|
var el = document.createElement('bootstrap')
|
18
18
|
|
19
19
|
var transEndEventNames = {
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
20
|
+
WebkitTransition : 'webkitTransitionEnd',
|
21
|
+
MozTransition : 'transitionend',
|
22
|
+
OTransition : 'oTransitionEnd otransitionend',
|
23
|
+
transition : 'transitionend'
|
24
24
|
}
|
25
25
|
|
26
26
|
for (var name in transEndEventNames) {
|
@@ -0,0 +1,17 @@
|
|
1
|
+
// Mincer asset helper functions
|
2
|
+
//
|
3
|
+
// This must be imported into a .css.ejs.scss file.
|
4
|
+
// Then, <% %>-interpolations will be parsed as strings by Sass, and evaluated by EJS after Sass compilation.
|
5
|
+
|
6
|
+
|
7
|
+
@function twbs-font-path($path) {
|
8
|
+
// do something like following
|
9
|
+
// from "path/to/font.ext#suffix" to "<%- asset_path(path/to/font.ext)) + #suffix %>"
|
10
|
+
// from "path/to/font.ext?#suffix" to "<%- asset_path(path/to/font.ext)) + ?#suffix %>"
|
11
|
+
// or from "path/to/font.ext" just "<%- asset_path(path/to/font.ext)) %>"
|
12
|
+
@return "<%- asset_path('#{$path}'.replace(/[#?].*$/, '')) + '#{$path}'.replace(/(^[^#?]*)([#?]?.*$)/, '$2') %>";
|
13
|
+
}
|
14
|
+
|
15
|
+
@function twbs-image-path($file) {
|
16
|
+
@return "<%- asset_path('#{$file}') %>";
|
17
|
+
}
|
@@ -2,9 +2,10 @@
|
|
2
2
|
@import "bootstrap/variables";
|
3
3
|
@import "bootstrap/mixins";
|
4
4
|
|
5
|
-
// Reset
|
5
|
+
// Reset and dependencies
|
6
6
|
@import "bootstrap/normalize";
|
7
7
|
@import "bootstrap/print";
|
8
|
+
@import "bootstrap/glyphicons";
|
8
9
|
|
9
10
|
// Core CSS
|
10
11
|
@import "bootstrap/scaffolding";
|
@@ -17,7 +18,6 @@
|
|
17
18
|
|
18
19
|
// Components
|
19
20
|
@import "bootstrap/component-animations";
|
20
|
-
@import "bootstrap/glyphicons";
|
21
21
|
@import "bootstrap/dropdowns";
|
22
22
|
@import "bootstrap/button-groups";
|
23
23
|
@import "bootstrap/input-groups";
|
@@ -35,6 +35,7 @@
|
|
35
35
|
@import "bootstrap/media";
|
36
36
|
@import "bootstrap/list-group";
|
37
37
|
@import "bootstrap/panels";
|
38
|
+
@import "bootstrap/responsive-embed";
|
38
39
|
@import "bootstrap/wells";
|
39
40
|
@import "bootstrap/close";
|
40
41
|
|
@@ -3,7 +3,7 @@
|
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
|
-
// Base
|
6
|
+
// Base class
|
7
7
|
.badge {
|
8
8
|
display: inline-block;
|
9
9
|
min-width: 10px;
|
@@ -32,6 +32,18 @@
|
|
32
32
|
top: 0;
|
33
33
|
padding: 1px 5px;
|
34
34
|
}
|
35
|
+
|
36
|
+
// [converter] extracted a& to a.badge
|
37
|
+
|
38
|
+
// Account for badges in navs
|
39
|
+
a.list-group-item.active > &,
|
40
|
+
.nav-pills > .active > a > & {
|
41
|
+
color: $badge-active-color;
|
42
|
+
background-color: $badge-active-bg;
|
43
|
+
}
|
44
|
+
.nav-pills > li > a > & {
|
45
|
+
margin-left: 3px;
|
46
|
+
}
|
35
47
|
}
|
36
48
|
|
37
49
|
// Hover state, but only for links
|
@@ -43,13 +55,3 @@ a.badge {
|
|
43
55
|
cursor: pointer;
|
44
56
|
}
|
45
57
|
}
|
46
|
-
|
47
|
-
// Account for counters in navs
|
48
|
-
a.list-group-item.active > .badge,
|
49
|
-
.nav-pills > .active > a > .badge {
|
50
|
-
color: $badge-active-color;
|
51
|
-
background-color: $badge-active-bg;
|
52
|
-
}
|
53
|
-
.nav-pills > li > a > .badge {
|
54
|
-
margin-left: 3px;
|
55
|
-
}
|
@@ -20,7 +20,7 @@
|
|
20
20
|
}
|
21
21
|
&:focus {
|
22
22
|
// Remove focus outline when dropdown JS adds it after closing the menu
|
23
|
-
outline:
|
23
|
+
outline: 0;
|
24
24
|
}
|
25
25
|
}
|
26
26
|
}
|
@@ -220,7 +220,17 @@
|
|
220
220
|
|
221
221
|
|
222
222
|
// Checkbox and radio options
|
223
|
+
//
|
224
|
+
// In order to support the browser's form validation feedback, powered by the
|
225
|
+
// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
|
226
|
+
// use `display: none;` or `visibility: hidden;` as that also hides the popover.
|
227
|
+
// This way, we ensure a DOM element is visible to position the popover from.
|
228
|
+
//
|
229
|
+
// See https://github.com/twbs/bootstrap/pull/12794 for more.
|
230
|
+
|
223
231
|
[data-toggle="buttons"] > .btn > input[type="radio"],
|
224
232
|
[data-toggle="buttons"] > .btn > input[type="checkbox"] {
|
225
|
-
|
233
|
+
position: absolute;
|
234
|
+
z-index: -1;
|
235
|
+
opacity: 0;
|
226
236
|
}
|
@@ -91,7 +91,7 @@
|
|
91
91
|
// Hover/focus state
|
92
92
|
&:hover,
|
93
93
|
&:focus {
|
94
|
-
outline:
|
94
|
+
outline: 0;
|
95
95
|
color: $carousel-control-color;
|
96
96
|
text-decoration: none;
|
97
97
|
@include opacity(.9);
|
@@ -110,20 +110,22 @@
|
|
110
110
|
.icon-prev,
|
111
111
|
.glyphicon-chevron-left {
|
112
112
|
left: 50%;
|
113
|
+
margin-left: -10px;
|
113
114
|
}
|
114
115
|
.icon-next,
|
115
116
|
.glyphicon-chevron-right {
|
116
117
|
right: 50%;
|
118
|
+
margin-right: -10px;
|
117
119
|
}
|
118
120
|
.icon-prev,
|
119
121
|
.icon-next {
|
120
122
|
width: 20px;
|
121
123
|
height: 20px;
|
122
124
|
margin-top: -10px;
|
123
|
-
margin-left: -10px;
|
124
125
|
font-family: serif;
|
125
126
|
}
|
126
127
|
|
128
|
+
|
127
129
|
.icon-prev {
|
128
130
|
&:before {
|
129
131
|
content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
|
@@ -213,9 +215,16 @@
|
|
213
215
|
width: 30px;
|
214
216
|
height: 30px;
|
215
217
|
margin-top: -15px;
|
216
|
-
margin-left: -15px;
|
217
218
|
font-size: 30px;
|
218
219
|
}
|
220
|
+
.glyphicon-chevron-left,
|
221
|
+
.icon-prev {
|
222
|
+
margin-left: -15px;
|
223
|
+
}
|
224
|
+
.glyphicon-chevron-right,
|
225
|
+
.icon-next {
|
226
|
+
margin-right: -15px;
|
227
|
+
}
|
219
228
|
}
|
220
229
|
|
221
230
|
// Show and left align the captions
|
@@ -5,7 +5,7 @@
|
|
5
5
|
// Heads up!
|
6
6
|
//
|
7
7
|
// We don't use the `.opacity()` mixin here since it causes a bug with text
|
8
|
-
// fields in IE7-8. Source: https://github.com/
|
8
|
+
// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
|
9
9
|
|
10
10
|
.fade {
|
11
11
|
opacity: 0;
|
@@ -17,10 +17,16 @@
|
|
17
17
|
|
18
18
|
.collapse {
|
19
19
|
display: none;
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
|
21
|
+
&.in { display: block; }
|
22
|
+
// [converter] extracted tr&.in to tr.collapse.in
|
23
|
+
// [converter] extracted tbody&.in to tbody.collapse.in
|
23
24
|
}
|
25
|
+
|
26
|
+
tr.collapse.in { display: table-row; }
|
27
|
+
|
28
|
+
tbody.collapse.in { display: table-row-group; }
|
29
|
+
|
24
30
|
.collapsing {
|
25
31
|
position: relative;
|
26
32
|
height: 0;
|
@@ -38,6 +38,7 @@
|
|
38
38
|
margin: 2px 0 0; // override default ul
|
39
39
|
list-style: none;
|
40
40
|
font-size: $font-size-base;
|
41
|
+
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
|
41
42
|
background-color: $dropdown-bg;
|
42
43
|
border: 1px solid $dropdown-fallback-border; // IE8 fallback
|
43
44
|
border: 1px solid $dropdown-border;
|
@@ -31,6 +31,7 @@ legend {
|
|
31
31
|
|
32
32
|
label {
|
33
33
|
display: inline-block;
|
34
|
+
max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
|
34
35
|
margin-bottom: 5px;
|
35
36
|
font-weight: bold;
|
36
37
|
}
|
@@ -51,7 +52,7 @@ input[type="search"] {
|
|
51
52
|
input[type="radio"],
|
52
53
|
input[type="checkbox"] {
|
53
54
|
margin: 4px 0 0;
|
54
|
-
margin-top: 1px \9;
|
55
|
+
margin-top: 1px \9; // IE8-9
|
55
56
|
line-height: normal;
|
56
57
|
}
|
57
58
|
|
@@ -169,10 +170,23 @@ input[type="search"] {
|
|
169
170
|
// Special styles for iOS date input
|
170
171
|
//
|
171
172
|
// In Mobile Safari, date inputs require a pixel line-height that matches the
|
172
|
-
// given height of the input.
|
173
|
+
// given height of the input. Since this fucks up everything else, we have to
|
174
|
+
// appropriately reset it for Internet Explorer and the size variations.
|
173
175
|
|
174
|
-
input[type="date"]
|
176
|
+
input[type="date"],
|
177
|
+
input[type="time"],
|
178
|
+
input[type="datetime-local"],
|
179
|
+
input[type="month"] {
|
175
180
|
line-height: $input-height-base;
|
181
|
+
// IE8+ misaligns the text within date inputs, so we reset
|
182
|
+
line-height: $line-height-base #{\0};
|
183
|
+
|
184
|
+
&.input-sm {
|
185
|
+
line-height: $input-height-small;
|
186
|
+
}
|
187
|
+
&.input-lg {
|
188
|
+
line-height: $input-height-large;
|
189
|
+
}
|
176
190
|
}
|
177
191
|
|
178
192
|
|
@@ -196,9 +210,10 @@ input[type="date"] {
|
|
196
210
|
min-height: $line-height-computed; // clear the floating input if there is no label text
|
197
211
|
margin-top: 10px;
|
198
212
|
margin-bottom: 10px;
|
199
|
-
|
213
|
+
|
200
214
|
label {
|
201
|
-
|
215
|
+
padding-left: 20px;
|
216
|
+
margin-bottom: 0;
|
202
217
|
font-weight: normal;
|
203
218
|
cursor: pointer;
|
204
219
|
}
|
@@ -269,18 +284,28 @@ input[type="checkbox"],
|
|
269
284
|
.form-control {
|
270
285
|
padding-right: ($input-height-base * 1.25);
|
271
286
|
}
|
272
|
-
|
273
|
-
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
287
|
+
}
|
288
|
+
// Feedback icon (requires .glyphicon classes)
|
289
|
+
.form-control-feedback {
|
290
|
+
position: absolute;
|
291
|
+
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
292
|
+
right: 0;
|
293
|
+
z-index: 2; // Ensure icon is above input groups
|
294
|
+
display: block;
|
295
|
+
width: $input-height-base;
|
296
|
+
height: $input-height-base;
|
297
|
+
line-height: $input-height-base;
|
298
|
+
text-align: center;
|
299
|
+
}
|
300
|
+
.input-lg + .form-control-feedback {
|
301
|
+
width: $input-height-large;
|
302
|
+
height: $input-height-large;
|
303
|
+
line-height: $input-height-large;
|
304
|
+
}
|
305
|
+
.input-sm + .form-control-feedback {
|
306
|
+
width: $input-height-small;
|
307
|
+
height: $input-height-small;
|
308
|
+
line-height: $input-height-small;
|
284
309
|
}
|
285
310
|
|
286
311
|
// Feedback states
|
@@ -347,6 +372,18 @@ input[type="checkbox"],
|
|
347
372
|
width: auto; // Prevent labels from stacking above inputs in `.form-group`
|
348
373
|
vertical-align: middle;
|
349
374
|
}
|
375
|
+
|
376
|
+
.input-group {
|
377
|
+
display: inline-table;
|
378
|
+
vertical-align: middle;
|
379
|
+
|
380
|
+
.input-group-addon,
|
381
|
+
.input-group-btn,
|
382
|
+
.form-control {
|
383
|
+
width: auto;
|
384
|
+
}
|
385
|
+
}
|
386
|
+
|
350
387
|
// Input groups need that 100% width though
|
351
388
|
.input-group > .form-control {
|
352
389
|
width: 100%;
|
@@ -392,8 +429,9 @@ input[type="checkbox"],
|
|
392
429
|
|
393
430
|
.form-horizontal {
|
394
431
|
|
395
|
-
// Consistent vertical alignment of
|
396
|
-
|
432
|
+
// Consistent vertical alignment of radios and checkboxes
|
433
|
+
//
|
434
|
+
// Labels also get some reset styles, but that is scoped to a media query below.
|
397
435
|
.radio,
|
398
436
|
.checkbox,
|
399
437
|
.radio-inline,
|
@@ -416,12 +454,16 @@ input[type="checkbox"],
|
|
416
454
|
|
417
455
|
.form-control-static {
|
418
456
|
padding-top: ($padding-base-vertical + 1);
|
457
|
+
padding-bottom: ($padding-base-vertical + 1);
|
419
458
|
}
|
420
459
|
|
421
|
-
//
|
460
|
+
// Reset spacing and right align labels, but scope to media queries so that
|
461
|
+
// labels on narrow viewports stack the same as a default form example.
|
422
462
|
@media (min-width: $screen-sm-min) {
|
423
463
|
.control-label {
|
424
464
|
text-align: right;
|
465
|
+
margin-bottom: 0;
|
466
|
+
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
|
425
467
|
}
|
426
468
|
}
|
427
469
|
|
@@ -1,3 +1,7 @@
|
|
1
|
+
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.eot"
|
2
|
+
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.svg"
|
3
|
+
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.ttf"
|
4
|
+
//= depend_on_asset "bootstrap/glyphicons-halflings-regular.woff"
|
1
5
|
//
|
2
6
|
// Glyphicons for Bootstrap
|
3
7
|
//
|
@@ -14,15 +14,7 @@
|
|
14
14
|
vertical-align: baseline;
|
15
15
|
border-radius: .25em;
|
16
16
|
|
17
|
-
//
|
18
|
-
&[href] {
|
19
|
-
&:hover,
|
20
|
-
&:focus {
|
21
|
-
color: $label-link-hover-color;
|
22
|
-
text-decoration: none;
|
23
|
-
cursor: pointer;
|
24
|
-
}
|
25
|
-
}
|
17
|
+
// [converter] extracted a& to a.label
|
26
18
|
|
27
19
|
// Empty labels collapse automatically (not available in IE8)
|
28
20
|
&:empty {
|
@@ -36,6 +28,16 @@
|
|
36
28
|
}
|
37
29
|
}
|
38
30
|
|
31
|
+
// Add hover effects, but only for links
|
32
|
+
a.label {
|
33
|
+
&:hover,
|
34
|
+
&:focus {
|
35
|
+
color: $label-link-hover-color;
|
36
|
+
text-decoration: none;
|
37
|
+
cursor: pointer;
|
38
|
+
}
|
39
|
+
}
|
40
|
+
|
39
41
|
// Colors
|
40
42
|
// Contextual variations (linked labels get darker on :hover)
|
41
43
|
|
@@ -62,8 +62,27 @@ a.list-group-item {
|
|
62
62
|
&:hover,
|
63
63
|
&:focus {
|
64
64
|
text-decoration: none;
|
65
|
+
color: $list-group-link-hover-color;
|
65
66
|
background-color: $list-group-hover-bg;
|
66
67
|
}
|
68
|
+
}
|
69
|
+
|
70
|
+
.list-group-item {
|
71
|
+
// Disabled state
|
72
|
+
&.disabled,
|
73
|
+
&.disabled:hover,
|
74
|
+
&.disabled:focus {
|
75
|
+
background-color: $list-group-disabled-bg;
|
76
|
+
color: $list-group-disabled-color;
|
77
|
+
|
78
|
+
// Force color to inherit for custom content
|
79
|
+
.list-group-item-heading {
|
80
|
+
color: inherit;
|
81
|
+
}
|
82
|
+
.list-group-item-text {
|
83
|
+
color: $list-group-disabled-text-color;
|
84
|
+
}
|
85
|
+
}
|
67
86
|
|
68
87
|
// Active class on item itself, not parent
|
69
88
|
&.active,
|