bootstrap-sass 3.3.5 → 3.4.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 +5 -5
- data/.gitignore +1 -0
- data/.travis.yml +8 -12
- data/CHANGELOG.md +20 -0
- data/Gemfile +1 -4
- data/LICENSE +2 -1
- data/README.md +79 -74
- data/Rakefile +46 -11
- data/assets/javascripts/bootstrap/affix.js +7 -5
- data/assets/javascripts/bootstrap/alert.js +6 -5
- data/assets/javascripts/bootstrap/button.js +14 -9
- data/assets/javascripts/bootstrap/carousel.js +16 -7
- data/assets/javascripts/bootstrap/collapse.js +7 -6
- data/assets/javascripts/bootstrap/dropdown.js +7 -7
- data/assets/javascripts/bootstrap/modal.js +44 -23
- data/assets/javascripts/bootstrap/popover.js +25 -10
- data/assets/javascripts/bootstrap/scrollspy.js +4 -4
- data/assets/javascripts/bootstrap/tab.js +10 -10
- data/assets/javascripts/bootstrap/tooltip.js +177 -14
- data/assets/javascripts/bootstrap/transition.js +5 -5
- data/assets/javascripts/bootstrap-sprockets.js +2 -2
- data/assets/javascripts/bootstrap.js +326 -109
- data/assets/javascripts/bootstrap.min.js +3 -4
- data/assets/stylesheets/_bootstrap-mincer.scss +2 -2
- data/assets/stylesheets/_bootstrap.scss +2 -2
- data/assets/stylesheets/bootstrap/_alerts.scss +3 -3
- data/assets/stylesheets/bootstrap/_badges.scss +3 -3
- data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
- data/assets/stylesheets/bootstrap/_button-groups.scss +8 -8
- data/assets/stylesheets/bootstrap/_buttons.scss +4 -4
- data/assets/stylesheets/bootstrap/_carousel.scss +33 -31
- data/assets/stylesheets/bootstrap/_close.scss +1 -0
- data/assets/stylesheets/bootstrap/_code.scss +3 -3
- data/assets/stylesheets/bootstrap/_component-animations.scss +1 -0
- data/assets/stylesheets/bootstrap/_dropdowns.scss +20 -23
- data/assets/stylesheets/bootstrap/_forms.scss +56 -60
- data/assets/stylesheets/bootstrap/_glyphicons.scss +11 -11
- data/assets/stylesheets/bootstrap/_grid.scss +10 -0
- data/assets/stylesheets/bootstrap/_input-groups.scss +9 -5
- data/assets/stylesheets/bootstrap/_jumbotron.scss +5 -3
- data/assets/stylesheets/bootstrap/_labels.scss +1 -1
- data/assets/stylesheets/bootstrap/_list-group.scss +30 -32
- data/assets/stylesheets/bootstrap/_media.scss +1 -1
- data/assets/stylesheets/bootstrap/_modals.scss +8 -8
- data/assets/stylesheets/bootstrap/_navbar.scss +75 -81
- data/assets/stylesheets/bootstrap/_navs.scss +4 -4
- data/assets/stylesheets/bootstrap/_normalize.scss +5 -2
- data/assets/stylesheets/bootstrap/_pager.scss +2 -2
- data/assets/stylesheets/bootstrap/_pagination.scss +13 -16
- data/assets/stylesheets/bootstrap/_panels.scss +5 -5
- data/assets/stylesheets/bootstrap/_popovers.scss +47 -52
- data/assets/stylesheets/bootstrap/_print.scss +90 -92
- data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
- data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -2
- data/assets/stylesheets/bootstrap/_responsive-utilities.scss +3 -3
- data/assets/stylesheets/bootstrap/_scaffolding.scss +7 -7
- data/assets/stylesheets/bootstrap/_tables.scss +23 -23
- data/assets/stylesheets/bootstrap/_theme.scss +21 -17
- data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
- data/assets/stylesheets/bootstrap/_tooltip.scss +38 -27
- data/assets/stylesheets/bootstrap/_type.scss +11 -11
- data/assets/stylesheets/bootstrap/_variables.scss +9 -7
- data/assets/stylesheets/bootstrap/_wells.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
- data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +7 -14
- data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
- data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +7 -7
- data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
- data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
- data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +4 -4
- data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +0 -4
- data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +3 -3
- data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +3 -3
- data/bootstrap-sass.gemspec +10 -9
- data/bower.json +4 -3
- data/composer.json +2 -2
- data/eyeglass-exports.js +7 -0
- data/lib/bootstrap-sass/engine.rb +6 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/lib/bootstrap-sass.rb +17 -10
- data/package-lock.json +1611 -0
- data/package.json +20 -6
- data/sache.json +1 -1
- data/tasks/converter/less_conversion.rb +12 -8
- data/tasks/converter/network.rb +2 -2
- data/templates/project/_bootstrap-variables.sass +10 -8
- data/test/compilation_test.rb +24 -12
- data/test/dummy_rails/config/application.rb +2 -1
- data/test/dummy_rails/config/boot.rb +1 -1
- data/test/dummy_sass_only/Gemfile +1 -1
- data/test/dummy_sass_only/compile.rb +14 -7
- data/test/dummy_sass_only/import_all.scss +2 -0
- data/test/gemfiles/default.gemfile +3 -0
- data/test/node_mincer_test.rb +2 -3
- data/test/node_sass_compile_test.sh +4 -3
- data/test/sass_test.rb +10 -7
- data/test/sprockets_rails_test.rb +12 -8
- data/test/support/dummy_rails_integration.rb +1 -1
- data/test/support/reporting.rb +10 -0
- data/test/test_helper.rb +3 -2
- metadata +37 -28
- data/test/compass_test.rb +0 -9
- data/test/dummy_sass_only/import_all.sass +0 -2
- data/test/gemfiles/sass_3_2.gemfile +0 -6
- data/test/gemfiles/sass_3_3.gemfile +0 -6
- data/test/gemfiles/sass_3_4.gemfile +0 -7
- data/test/gemfiles/sass_head.gemfile +0 -6
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
height: 0;
|
|
11
11
|
margin-left: 2px;
|
|
12
12
|
vertical-align: middle;
|
|
13
|
-
border-top:
|
|
14
|
-
border-top:
|
|
13
|
+
border-top: $caret-width-base dashed;
|
|
14
|
+
border-top: $caret-width-base solid \9; // IE8
|
|
15
15
|
border-right: $caret-width-base solid transparent;
|
|
16
|
-
border-left:
|
|
16
|
+
border-left: $caret-width-base solid transparent;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
// The dropdown wrapper (div)
|
|
@@ -38,15 +38,15 @@
|
|
|
38
38
|
min-width: 160px;
|
|
39
39
|
padding: 5px 0;
|
|
40
40
|
margin: 2px 0 0; // override default ul
|
|
41
|
-
list-style: none;
|
|
42
41
|
font-size: $font-size-base;
|
|
43
42
|
text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
|
|
43
|
+
list-style: none;
|
|
44
44
|
background-color: $dropdown-bg;
|
|
45
|
+
background-clip: padding-box;
|
|
45
46
|
border: 1px solid $dropdown-fallback-border; // IE8 fallback
|
|
46
47
|
border: 1px solid $dropdown-border;
|
|
47
48
|
border-radius: $border-radius-base;
|
|
48
|
-
@include box-shadow(0 6px 12px rgba(0,0,0
|
|
49
|
-
background-clip: padding-box;
|
|
49
|
+
@include box-shadow(0 6px 12px rgba(0, 0, 0, .175));
|
|
50
50
|
|
|
51
51
|
// Aligns the dropdown menu to right
|
|
52
52
|
//
|
|
@@ -66,20 +66,17 @@
|
|
|
66
66
|
display: block;
|
|
67
67
|
padding: 3px 20px;
|
|
68
68
|
clear: both;
|
|
69
|
-
font-weight:
|
|
69
|
+
font-weight: 400;
|
|
70
70
|
line-height: $line-height-base;
|
|
71
71
|
color: $dropdown-link-color;
|
|
72
72
|
white-space: nowrap; // prevent links from randomly breaking onto new lines
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
73
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
background-color: $dropdown-link-hover-bg;
|
|
74
|
+
&:hover,
|
|
75
|
+
&:focus {
|
|
76
|
+
color: $dropdown-link-hover-color;
|
|
77
|
+
text-decoration: none;
|
|
78
|
+
background-color: $dropdown-link-hover-bg;
|
|
79
|
+
}
|
|
83
80
|
}
|
|
84
81
|
}
|
|
85
82
|
|
|
@@ -90,8 +87,8 @@
|
|
|
90
87
|
&:focus {
|
|
91
88
|
color: $dropdown-link-active-color;
|
|
92
89
|
text-decoration: none;
|
|
93
|
-
outline: 0;
|
|
94
90
|
background-color: $dropdown-link-active-bg;
|
|
91
|
+
outline: 0;
|
|
95
92
|
}
|
|
96
93
|
}
|
|
97
94
|
|
|
@@ -110,10 +107,10 @@
|
|
|
110
107
|
&:hover,
|
|
111
108
|
&:focus {
|
|
112
109
|
text-decoration: none;
|
|
110
|
+
cursor: $cursor-disabled;
|
|
113
111
|
background-color: transparent;
|
|
114
112
|
background-image: none; // Remove CSS gradient
|
|
115
113
|
@include reset-filter;
|
|
116
|
-
cursor: $cursor-disabled;
|
|
117
114
|
}
|
|
118
115
|
}
|
|
119
116
|
|
|
@@ -135,8 +132,8 @@
|
|
|
135
132
|
// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
|
|
136
133
|
// menu with the parent.
|
|
137
134
|
.dropdown-menu-right {
|
|
138
|
-
left: auto; // Reset the default from `.dropdown-menu`
|
|
139
135
|
right: 0;
|
|
136
|
+
left: auto; // Reset the default from `.dropdown-menu`
|
|
140
137
|
}
|
|
141
138
|
// With v3, we enabled auto-flipping if you have a dropdown within a right
|
|
142
139
|
// aligned nav component. To enable the undoing of that, we provide an override
|
|
@@ -145,8 +142,8 @@
|
|
|
145
142
|
// This is only for left-aligning a dropdown menu within a `.navbar-right` or
|
|
146
143
|
// `.pull-right` nav component.
|
|
147
144
|
.dropdown-menu-left {
|
|
148
|
-
left: 0;
|
|
149
145
|
right: auto;
|
|
146
|
+
left: 0;
|
|
150
147
|
}
|
|
151
148
|
|
|
152
149
|
// Dropdown section headers
|
|
@@ -162,10 +159,10 @@
|
|
|
162
159
|
// Backdrop to catch body clicks on mobile, etc.
|
|
163
160
|
.dropdown-backdrop {
|
|
164
161
|
position: fixed;
|
|
165
|
-
|
|
162
|
+
top: 0;
|
|
166
163
|
right: 0;
|
|
167
164
|
bottom: 0;
|
|
168
|
-
|
|
165
|
+
left: 0;
|
|
169
166
|
z-index: ($zindex-dropdown - 10);
|
|
170
167
|
}
|
|
171
168
|
|
|
@@ -184,10 +181,10 @@
|
|
|
184
181
|
.navbar-fixed-bottom .dropdown {
|
|
185
182
|
// Reverse the caret
|
|
186
183
|
.caret {
|
|
184
|
+
content: "";
|
|
187
185
|
border-top: 0;
|
|
188
186
|
border-bottom: $caret-width-base dashed;
|
|
189
187
|
border-bottom: $caret-width-base solid \9; // IE8
|
|
190
|
-
content: "";
|
|
191
188
|
}
|
|
192
189
|
// Different positioning for bottom up menu
|
|
193
190
|
.dropdown-menu {
|
|
@@ -8,13 +8,13 @@
|
|
|
8
8
|
// Restyle and baseline non-control form elements.
|
|
9
9
|
|
|
10
10
|
fieldset {
|
|
11
|
-
padding: 0;
|
|
12
|
-
margin: 0;
|
|
13
|
-
border: 0;
|
|
14
11
|
// Chrome and Firefox set a `min-width: min-content;` on fieldsets,
|
|
15
12
|
// so we reset that to ensure it behaves more like a standard block element.
|
|
16
13
|
// See https://github.com/twbs/bootstrap/issues/12359.
|
|
17
14
|
min-width: 0;
|
|
15
|
+
padding: 0;
|
|
16
|
+
margin: 0;
|
|
17
|
+
border: 0;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
20
|
legend {
|
|
@@ -33,7 +33,7 @@ label {
|
|
|
33
33
|
display: inline-block;
|
|
34
34
|
max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
|
|
35
35
|
margin-bottom: 5px;
|
|
36
|
-
font-weight:
|
|
36
|
+
font-weight: 700;
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
|
|
@@ -43,9 +43,18 @@ label {
|
|
|
43
43
|
// is required to ensure optimum display with or without those classes to better
|
|
44
44
|
// address browser inconsistencies.
|
|
45
45
|
|
|
46
|
-
// Override content-box in Normalize (* isn't specific enough)
|
|
47
46
|
input[type="search"] {
|
|
47
|
+
// Override content-box in Normalize (* isn't specific enough)
|
|
48
48
|
@include box-sizing(border-box);
|
|
49
|
+
|
|
50
|
+
// Search inputs in iOS
|
|
51
|
+
//
|
|
52
|
+
// This overrides the extra rounded corners on search inputs in iOS so that our
|
|
53
|
+
// `.form-control` class can properly style them. Note that this cannot simply
|
|
54
|
+
// be added to `.form-control` as it's not specific enough. For details, see
|
|
55
|
+
// https://github.com/twbs/bootstrap/issues/11586.
|
|
56
|
+
-webkit-appearance: none;
|
|
57
|
+
appearance: none;
|
|
49
58
|
}
|
|
50
59
|
|
|
51
60
|
// Position radios and checkboxes better
|
|
@@ -54,6 +63,16 @@ input[type="checkbox"] {
|
|
|
54
63
|
margin: 4px 0 0;
|
|
55
64
|
margin-top: 1px \9; // IE8-9
|
|
56
65
|
line-height: normal;
|
|
66
|
+
|
|
67
|
+
// Apply same disabled cursor tweak as for inputs
|
|
68
|
+
// Some special care is needed because <label>s don't inherit their parent's `cursor`.
|
|
69
|
+
//
|
|
70
|
+
// Note: Neither radios nor checkboxes can be readonly.
|
|
71
|
+
&[disabled],
|
|
72
|
+
&.disabled,
|
|
73
|
+
fieldset[disabled] & {
|
|
74
|
+
cursor: $cursor-disabled;
|
|
75
|
+
}
|
|
57
76
|
}
|
|
58
77
|
|
|
59
78
|
input[type="file"] {
|
|
@@ -123,7 +142,7 @@ output {
|
|
|
123
142
|
background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
|
|
124
143
|
border: 1px solid $input-border;
|
|
125
144
|
border-radius: $input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
|
|
126
|
-
@include box-shadow(inset 0 1px 1px rgba(0,0,0
|
|
145
|
+
@include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075));
|
|
127
146
|
@include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
|
|
128
147
|
|
|
129
148
|
// Customize the `:focus` state to imitate native WebKit styles.
|
|
@@ -132,6 +151,12 @@ output {
|
|
|
132
151
|
// Placeholder
|
|
133
152
|
@include placeholder;
|
|
134
153
|
|
|
154
|
+
// Unstyle the caret on `<select>`s in IE10+.
|
|
155
|
+
&::-ms-expand {
|
|
156
|
+
background-color: transparent;
|
|
157
|
+
border: 0;
|
|
158
|
+
}
|
|
159
|
+
|
|
135
160
|
// Disabled and read-only inputs
|
|
136
161
|
//
|
|
137
162
|
// HTML5 says that controls under a fieldset > legend:first-child won't be
|
|
@@ -158,18 +183,6 @@ textarea.form-control {
|
|
|
158
183
|
}
|
|
159
184
|
|
|
160
185
|
|
|
161
|
-
// Search inputs in iOS
|
|
162
|
-
//
|
|
163
|
-
// This overrides the extra rounded corners on search inputs in iOS so that our
|
|
164
|
-
// `.form-control` class can properly style them. Note that this cannot simply
|
|
165
|
-
// be added to `.form-control` as it's not specific enough. For details, see
|
|
166
|
-
// https://github.com/twbs/bootstrap/issues/11586.
|
|
167
|
-
|
|
168
|
-
input[type="search"] {
|
|
169
|
-
-webkit-appearance: none;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
|
|
173
186
|
// Special styles for iOS temporal inputs
|
|
174
187
|
//
|
|
175
188
|
// In Mobile Safari, setting `display: block` on temporal inputs causes the
|
|
@@ -177,7 +190,7 @@ input[type="search"] {
|
|
|
177
190
|
// set a pixel line-height that matches the given height of the input, but only
|
|
178
191
|
// for Safari. See https://bugs.webkit.org/show_bug.cgi?id=139848
|
|
179
192
|
//
|
|
180
|
-
// Note that as of
|
|
193
|
+
// Note that as of 9.3, iOS doesn't support `week`.
|
|
181
194
|
|
|
182
195
|
@media screen and (-webkit-min-device-pixel-ratio: 0) {
|
|
183
196
|
input[type="date"],
|
|
@@ -222,11 +235,19 @@ input[type="search"] {
|
|
|
222
235
|
margin-top: 10px;
|
|
223
236
|
margin-bottom: 10px;
|
|
224
237
|
|
|
238
|
+
// These are used on elements with <label> descendants
|
|
239
|
+
&.disabled,
|
|
240
|
+
fieldset[disabled] & {
|
|
241
|
+
label {
|
|
242
|
+
cursor: $cursor-disabled;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
|
|
225
246
|
label {
|
|
226
247
|
min-height: $line-height-computed; // Ensure the input doesn't jump when there is no text
|
|
227
248
|
padding-left: 20px;
|
|
228
249
|
margin-bottom: 0;
|
|
229
|
-
font-weight:
|
|
250
|
+
font-weight: 400;
|
|
230
251
|
cursor: pointer;
|
|
231
252
|
}
|
|
232
253
|
}
|
|
@@ -235,8 +256,8 @@ input[type="search"] {
|
|
|
235
256
|
.checkbox input[type="checkbox"],
|
|
236
257
|
.checkbox-inline input[type="checkbox"] {
|
|
237
258
|
position: absolute;
|
|
238
|
-
margin-left: -20px;
|
|
239
259
|
margin-top: 4px \9;
|
|
260
|
+
margin-left: -20px;
|
|
240
261
|
}
|
|
241
262
|
|
|
242
263
|
.radio + .radio,
|
|
@@ -251,45 +272,20 @@ input[type="search"] {
|
|
|
251
272
|
display: inline-block;
|
|
252
273
|
padding-left: 20px;
|
|
253
274
|
margin-bottom: 0;
|
|
275
|
+
font-weight: 400;
|
|
254
276
|
vertical-align: middle;
|
|
255
|
-
font-weight: normal;
|
|
256
277
|
cursor: pointer;
|
|
257
|
-
}
|
|
258
|
-
.radio-inline + .radio-inline,
|
|
259
|
-
.checkbox-inline + .checkbox-inline {
|
|
260
|
-
margin-top: 0;
|
|
261
|
-
margin-left: 10px; // space out consecutive inline controls
|
|
262
|
-
}
|
|
263
278
|
|
|
264
|
-
//
|
|
265
|
-
// Some special care is needed because <label>s don't inherit their parent's `cursor`.
|
|
266
|
-
//
|
|
267
|
-
// Note: Neither radios nor checkboxes can be readonly.
|
|
268
|
-
input[type="radio"],
|
|
269
|
-
input[type="checkbox"] {
|
|
270
|
-
&[disabled],
|
|
271
|
-
&.disabled,
|
|
272
|
-
fieldset[disabled] & {
|
|
273
|
-
cursor: $cursor-disabled;
|
|
274
|
-
}
|
|
275
|
-
}
|
|
276
|
-
// These classes are used directly on <label>s
|
|
277
|
-
.radio-inline,
|
|
278
|
-
.checkbox-inline {
|
|
279
|
+
// These are used directly on <label>s
|
|
279
280
|
&.disabled,
|
|
280
281
|
fieldset[disabled] & {
|
|
281
282
|
cursor: $cursor-disabled;
|
|
282
283
|
}
|
|
283
284
|
}
|
|
284
|
-
|
|
285
|
-
.
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
fieldset[disabled] & {
|
|
289
|
-
label {
|
|
290
|
-
cursor: $cursor-disabled;
|
|
291
|
-
}
|
|
292
|
-
}
|
|
285
|
+
.radio-inline + .radio-inline,
|
|
286
|
+
.checkbox-inline + .checkbox-inline {
|
|
287
|
+
margin-top: 0;
|
|
288
|
+
margin-left: 10px; // space out consecutive inline controls
|
|
293
289
|
}
|
|
294
290
|
|
|
295
291
|
|
|
@@ -299,17 +295,17 @@ input[type="checkbox"] {
|
|
|
299
295
|
// a horizontal form layout.
|
|
300
296
|
|
|
301
297
|
.form-control-static {
|
|
298
|
+
min-height: ($line-height-computed + $font-size-base);
|
|
302
299
|
// Size it appropriately next to real form controls
|
|
303
300
|
padding-top: ($padding-base-vertical + 1);
|
|
304
301
|
padding-bottom: ($padding-base-vertical + 1);
|
|
305
302
|
// Remove default margin from `p`
|
|
306
303
|
margin-bottom: 0;
|
|
307
|
-
min-height: ($line-height-computed + $font-size-base);
|
|
308
304
|
|
|
309
305
|
&.input-lg,
|
|
310
306
|
&.input-sm {
|
|
311
|
-
padding-left: 0;
|
|
312
307
|
padding-right: 0;
|
|
308
|
+
padding-left: 0;
|
|
313
309
|
}
|
|
314
310
|
}
|
|
315
311
|
|
|
@@ -431,10 +427,10 @@ input[type="checkbox"] {
|
|
|
431
427
|
.has-feedback label {
|
|
432
428
|
|
|
433
429
|
& ~ .form-control-feedback {
|
|
434
|
-
|
|
430
|
+
top: ($line-height-computed + 5); // Height of the `label` and its margin
|
|
435
431
|
}
|
|
436
432
|
&.sr-only ~ .form-control-feedback {
|
|
437
|
-
|
|
433
|
+
top: 0;
|
|
438
434
|
}
|
|
439
435
|
}
|
|
440
436
|
|
|
@@ -554,9 +550,9 @@ input[type="checkbox"] {
|
|
|
554
550
|
.checkbox,
|
|
555
551
|
.radio-inline,
|
|
556
552
|
.checkbox-inline {
|
|
553
|
+
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
|
|
557
554
|
margin-top: 0;
|
|
558
555
|
margin-bottom: 0;
|
|
559
|
-
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
|
|
560
556
|
}
|
|
561
557
|
// Account for padding we're adding to ensure the alignment and of help text
|
|
562
558
|
// and other content below items
|
|
@@ -574,9 +570,9 @@ input[type="checkbox"] {
|
|
|
574
570
|
// labels on narrow viewports stack the same as a default form example.
|
|
575
571
|
@media (min-width: $screen-sm-min) {
|
|
576
572
|
.control-label {
|
|
577
|
-
text-align: right;
|
|
578
|
-
margin-bottom: 0;
|
|
579
573
|
padding-top: ($padding-base-vertical + 1); // Default padding plus a border
|
|
574
|
+
margin-bottom: 0;
|
|
575
|
+
text-align: right;
|
|
580
576
|
}
|
|
581
577
|
}
|
|
582
578
|
|
|
@@ -595,7 +591,7 @@ input[type="checkbox"] {
|
|
|
595
591
|
.form-group-lg {
|
|
596
592
|
@media (min-width: $screen-sm-min) {
|
|
597
593
|
.control-label {
|
|
598
|
-
padding-top: (
|
|
594
|
+
padding-top: ($padding-large-vertical + 1);
|
|
599
595
|
font-size: $font-size-large;
|
|
600
596
|
}
|
|
601
597
|
}
|
|
@@ -10,13 +10,13 @@
|
|
|
10
10
|
@at-root {
|
|
11
11
|
// Import the fonts
|
|
12
12
|
@font-face {
|
|
13
|
-
font-family:
|
|
14
|
-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
15
|
-
src: url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
16
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
17
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
18
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
19
|
-
url(if($bootstrap-sass-asset-helper, twbs-font-path(
|
|
13
|
+
font-family: "Glyphicons Halflings";
|
|
14
|
+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.eot"), "#{$icon-font-path}#{$icon-font-name}.eot"));
|
|
15
|
+
src: url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.eot?#iefix"), "#{$icon-font-path}#{$icon-font-name}.eot?#iefix")) format("embedded-opentype"),
|
|
16
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.woff2"), "#{$icon-font-path}#{$icon-font-name}.woff2")) format("woff2"),
|
|
17
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.woff"), "#{$icon-font-path}#{$icon-font-name}.woff")) format("woff"),
|
|
18
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.ttf"), "#{$icon-font-path}#{$icon-font-name}.ttf")) format("truetype"),
|
|
19
|
+
url(if($bootstrap-sass-asset-helper, twbs-font-path("#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}"), "#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}")) format("svg");
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
|
|
@@ -25,17 +25,17 @@
|
|
|
25
25
|
position: relative;
|
|
26
26
|
top: 1px;
|
|
27
27
|
display: inline-block;
|
|
28
|
-
font-family:
|
|
28
|
+
font-family: "Glyphicons Halflings";
|
|
29
29
|
font-style: normal;
|
|
30
|
-
font-weight:
|
|
30
|
+
font-weight: 400;
|
|
31
31
|
line-height: 1;
|
|
32
32
|
-webkit-font-smoothing: antialiased;
|
|
33
33
|
-moz-osx-font-smoothing: grayscale;
|
|
34
34
|
}
|
|
35
35
|
|
|
36
36
|
// Individual icons
|
|
37
|
-
.glyphicon-asterisk { &:before { content: "\
|
|
38
|
-
.glyphicon-plus { &:before { content: "\
|
|
37
|
+
.glyphicon-asterisk { &:before { content: "\002a"; } }
|
|
38
|
+
.glyphicon-plus { &:before { content: "\002b"; } }
|
|
39
39
|
.glyphicon-euro,
|
|
40
40
|
.glyphicon-eur { &:before { content: "\20ac"; } }
|
|
41
41
|
.glyphicon-minus { &:before { content: "\2212"; } }
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
// Undo padding and float of grid classes
|
|
13
13
|
&[class*="col-"] {
|
|
14
14
|
float: none;
|
|
15
|
-
padding-left: 0;
|
|
16
15
|
padding-right: 0;
|
|
16
|
+
padding-left: 0;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
19
|
.form-control {
|
|
@@ -29,6 +29,10 @@
|
|
|
29
29
|
|
|
30
30
|
width: 100%;
|
|
31
31
|
margin-bottom: 0;
|
|
32
|
+
|
|
33
|
+
&:focus {
|
|
34
|
+
z-index: 3;
|
|
35
|
+
}
|
|
32
36
|
}
|
|
33
37
|
}
|
|
34
38
|
|
|
@@ -73,24 +77,24 @@
|
|
|
73
77
|
.input-group-addon {
|
|
74
78
|
padding: $padding-base-vertical $padding-base-horizontal;
|
|
75
79
|
font-size: $font-size-base;
|
|
76
|
-
font-weight:
|
|
80
|
+
font-weight: 400;
|
|
77
81
|
line-height: 1;
|
|
78
82
|
color: $input-color;
|
|
79
83
|
text-align: center;
|
|
80
84
|
background-color: $input-group-addon-bg;
|
|
81
85
|
border: 1px solid $input-group-addon-border-color;
|
|
82
|
-
border-radius: $border-radius
|
|
86
|
+
border-radius: $input-border-radius;
|
|
83
87
|
|
|
84
88
|
// Sizing
|
|
85
89
|
&.input-sm {
|
|
86
90
|
padding: $padding-small-vertical $padding-small-horizontal;
|
|
87
91
|
font-size: $font-size-small;
|
|
88
|
-
border-radius: $border-radius-small;
|
|
92
|
+
border-radius: $input-border-radius-small;
|
|
89
93
|
}
|
|
90
94
|
&.input-lg {
|
|
91
95
|
padding: $padding-large-vertical $padding-large-horizontal;
|
|
92
96
|
font-size: $font-size-large;
|
|
93
|
-
border-radius: $border-radius-large;
|
|
97
|
+
border-radius: $input-border-radius-large;
|
|
94
98
|
}
|
|
95
99
|
|
|
96
100
|
// Nuke default margins from checkboxes and radios to vertically center within.
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
.jumbotron {
|
|
7
|
-
padding-top:
|
|
7
|
+
padding-top: $jumbotron-padding;
|
|
8
8
|
padding-bottom: $jumbotron-padding;
|
|
9
9
|
margin-bottom: $jumbotron-padding;
|
|
10
10
|
color: $jumbotron-color;
|
|
@@ -27,6 +27,8 @@
|
|
|
27
27
|
|
|
28
28
|
.container &,
|
|
29
29
|
.container-fluid & {
|
|
30
|
+
padding-right: ($grid-gutter-width / 2);
|
|
31
|
+
padding-left: ($grid-gutter-width / 2);
|
|
30
32
|
border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
|
|
31
33
|
}
|
|
32
34
|
|
|
@@ -35,13 +37,13 @@
|
|
|
35
37
|
}
|
|
36
38
|
|
|
37
39
|
@media screen and (min-width: $screen-sm-min) {
|
|
38
|
-
padding-top:
|
|
40
|
+
padding-top: ($jumbotron-padding * 1.6);
|
|
39
41
|
padding-bottom: ($jumbotron-padding * 1.6);
|
|
40
42
|
|
|
41
43
|
.container &,
|
|
42
44
|
.container-fluid & {
|
|
43
|
-
padding-left: ($jumbotron-padding * 2);
|
|
44
45
|
padding-right: ($jumbotron-padding * 2);
|
|
46
|
+
padding-left: ($jumbotron-padding * 2);
|
|
45
47
|
}
|
|
46
48
|
|
|
47
49
|
h1,
|
|
@@ -9,8 +9,8 @@
|
|
|
9
9
|
|
|
10
10
|
.list-group {
|
|
11
11
|
// No need to set list-style: none; since .list-group-item is block level
|
|
12
|
-
margin-bottom: 20px;
|
|
13
12
|
padding-left: 0; // reset padding because ul and ol
|
|
13
|
+
margin-bottom: 20px;
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
|
|
@@ -35,44 +35,14 @@
|
|
|
35
35
|
margin-bottom: 0;
|
|
36
36
|
@include border-bottom-radius($list-group-border-radius);
|
|
37
37
|
}
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
// Interactive list items
|
|
42
|
-
//
|
|
43
|
-
// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
|
|
44
|
-
// Includes an extra `.active` modifier class for showing selected items.
|
|
45
|
-
|
|
46
|
-
a.list-group-item,
|
|
47
|
-
button.list-group-item {
|
|
48
|
-
color: $list-group-link-color;
|
|
49
|
-
|
|
50
|
-
.list-group-item-heading {
|
|
51
|
-
color: $list-group-link-heading-color;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
// Hover state
|
|
55
|
-
&:hover,
|
|
56
|
-
&:focus {
|
|
57
|
-
text-decoration: none;
|
|
58
|
-
color: $list-group-link-hover-color;
|
|
59
|
-
background-color: $list-group-hover-bg;
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
button.list-group-item {
|
|
64
|
-
width: 100%;
|
|
65
|
-
text-align: left;
|
|
66
|
-
}
|
|
67
38
|
|
|
68
|
-
.list-group-item {
|
|
69
39
|
// Disabled state
|
|
70
40
|
&.disabled,
|
|
71
41
|
&.disabled:hover,
|
|
72
42
|
&.disabled:focus {
|
|
73
|
-
background-color: $list-group-disabled-bg;
|
|
74
43
|
color: $list-group-disabled-color;
|
|
75
44
|
cursor: $cursor-disabled;
|
|
45
|
+
background-color: $list-group-disabled-bg;
|
|
76
46
|
|
|
77
47
|
// Force color to inherit for custom content
|
|
78
48
|
.list-group-item-heading {
|
|
@@ -105,6 +75,34 @@ button.list-group-item {
|
|
|
105
75
|
}
|
|
106
76
|
|
|
107
77
|
|
|
78
|
+
// Interactive list items
|
|
79
|
+
//
|
|
80
|
+
// Use anchor or button elements instead of `li`s or `div`s to create interactive items.
|
|
81
|
+
// Includes an extra `.active` modifier class for showing selected items.
|
|
82
|
+
|
|
83
|
+
a.list-group-item,
|
|
84
|
+
button.list-group-item {
|
|
85
|
+
color: $list-group-link-color;
|
|
86
|
+
|
|
87
|
+
.list-group-item-heading {
|
|
88
|
+
color: $list-group-link-heading-color;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
// Hover state
|
|
92
|
+
&:hover,
|
|
93
|
+
&:focus {
|
|
94
|
+
color: $list-group-link-hover-color;
|
|
95
|
+
text-decoration: none;
|
|
96
|
+
background-color: $list-group-hover-bg;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
button.list-group-item {
|
|
101
|
+
width: 100%;
|
|
102
|
+
text-align: left;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
|
|
108
106
|
// Contextual variants
|
|
109
107
|
//
|
|
110
108
|
// Add modifier classes to change text and background color on individual items.
|