twbs_sass_rails 0.2.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +17 -8
- data/CONTRIBUTING.md +4 -4
- data/Gemfile.lock +52 -65
- data/LICENSE +2 -2
- data/README.md +48 -18
- data/Rakefile +67 -32
- data/app/assets/fonts/fontawesome-webfont.eot +0 -0
- data/app/assets/fonts/fontawesome-webfont.svg +23 -8
- data/app/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/app/assets/fonts/fontawesome-webfont.woff +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.svg +200 -199
- data/app/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/gemfiles/Gemfile.rails-3.2.x +2 -3
- data/gemfiles/Gemfile.rails-4.0.x +2 -3
- data/lib/generators/twbs_sass_rails/install/install_generator.rb +2 -2
- data/lib/generators/twbs_sass_rails/install/templates/{twbs-variables.css.less → twbs-variables.css.scss} +4 -3
- data/lib/generators/twbs_sass_rails/install/templates/{twbs.css.less → twbs.css.scss} +12 -7
- data/lib/twbs_sass_rails/version.rb +1 -1
- data/test/dummy/app/assets/stylesheets/{default-twbs.css.less → default-twbs.css.scss} +0 -0
- data/test/dummy/app/assets/stylesheets/test.css.scss +9 -0
- data/test/dummy/app/assets/stylesheets/twbs-variables.css.scss +7 -0
- data/test/dummy/app/assets/stylesheets/{twbs.css.less → twbs.css.scss} +12 -7
- data/test/dummy/config/application.rb +4 -1
- data/test/dummy/config/environments/development.rb +1 -1
- data/test/generators/install_generator_test.rb +4 -4
- data/test/integration/assets_precompile_integration_test.rb +11 -5
- data/test/integration/twbs_sass_rails_integration_test.rb +8 -7
- data/test/test_helper.rb +2 -4
- data/twbs_sass_rails.gemspec +6 -9
- data/vendor/assets/javascripts/respond.js +223 -212
- data/vendor/assets/javascripts/twbs/bootstrap/affix.js +36 -25
- data/vendor/assets/javascripts/twbs/bootstrap/alert.js +7 -17
- data/vendor/assets/javascripts/twbs/bootstrap/button.js +26 -28
- data/vendor/assets/javascripts/twbs/bootstrap/carousel.js +22 -34
- data/vendor/assets/javascripts/twbs/bootstrap/collapse.js +9 -18
- data/vendor/assets/javascripts/twbs/bootstrap/dropdown.js +25 -32
- data/vendor/assets/javascripts/twbs/bootstrap/modal.js +27 -30
- data/vendor/assets/javascripts/twbs/bootstrap/popover.js +16 -23
- data/vendor/assets/javascripts/twbs/bootstrap/scrollspy.js +19 -24
- data/vendor/assets/javascripts/twbs/bootstrap/tab.js +10 -20
- data/vendor/assets/javascripts/twbs/bootstrap/tooltip.js +54 -41
- data/vendor/assets/javascripts/twbs/bootstrap/transition.js +13 -21
- data/vendor/assets/stylesheets/fontawesome/_bordered-pulled.scss +16 -0
- data/vendor/assets/stylesheets/fontawesome/_core.scss +12 -0
- data/vendor/assets/stylesheets/fontawesome/_extras.scss +44 -0
- data/vendor/assets/stylesheets/fontawesome/_fixed-width.scss +6 -0
- data/vendor/assets/stylesheets/fontawesome/_icons.scss +412 -0
- data/vendor/assets/stylesheets/fontawesome/_larger.scss +13 -0
- data/vendor/assets/stylesheets/fontawesome/_list.scss +19 -0
- data/vendor/assets/stylesheets/fontawesome/_mixins.scss +20 -0
- data/vendor/assets/stylesheets/fontawesome/_path.scss +14 -0
- data/vendor/assets/stylesheets/fontawesome/_rotated-flipped.scss +9 -0
- data/vendor/assets/stylesheets/fontawesome/_spinning.scss +30 -0
- data/vendor/assets/stylesheets/fontawesome/_stacked.scss +20 -0
- data/vendor/assets/stylesheets/fontawesome/_variables.scss +381 -0
- data/vendor/assets/stylesheets/fontawesome/font-awesome.scss +17 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{alerts.less → _alerts.scss} +10 -10
- data/vendor/assets/stylesheets/twbs/bootstrap/{badges.less → _badges.scss} +19 -15
- data/vendor/assets/stylesheets/twbs/bootstrap/_breadcrumbs.scss +26 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{button-groups.less → _button-groups.scss} +38 -60
- data/vendor/assets/stylesheets/twbs/bootstrap/{buttons.less → _buttons.scss} +28 -34
- data/vendor/assets/stylesheets/twbs/bootstrap/{carousel.less → _carousel.scss} +38 -19
- data/vendor/assets/stylesheets/twbs/bootstrap/_close.scss +35 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_code.scss +63 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{component-animations.less → _component-animations.scss} +2 -2
- data/vendor/assets/stylesheets/twbs/bootstrap/{dropdowns.less → _dropdowns.scss} +53 -33
- data/vendor/assets/stylesheets/twbs/bootstrap/{forms.less → _forms.scss} +133 -79
- data/vendor/assets/stylesheets/twbs/bootstrap/{glyphicons.less → _glyphicons.scss} +16 -19
- data/vendor/assets/stylesheets/twbs/bootstrap/_grid.scss +100 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{input-groups.less → _input-groups.scss} +58 -29
- data/vendor/assets/stylesheets/twbs/bootstrap/_jumbotron.scss +44 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{labels.less → _labels.scss} +14 -8
- data/vendor/assets/stylesheets/twbs/bootstrap/_list-group.scss +110 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{media.less → _media.scss} +0 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_mixins.scss +931 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{modals.less → _modals.scss} +37 -40
- data/vendor/assets/stylesheets/twbs/bootstrap/_navbar.scss +620 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{navs.less → _navs.scss} +41 -52
- data/vendor/assets/stylesheets/twbs/bootstrap/{normalize.less → _normalize.scss} +148 -121
- data/vendor/assets/stylesheets/twbs/bootstrap/{pager.less → _pager.scss} +8 -8
- data/vendor/assets/stylesheets/twbs/bootstrap/_pagination.scss +88 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_panels.scss +230 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{popovers.less → _popovers.scss} +36 -36
- data/vendor/assets/stylesheets/twbs/bootstrap/{print.less → _print.scss} +6 -5
- data/vendor/assets/stylesheets/twbs/bootstrap/_progress-bars.scss +80 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_responsive-utilities.scss +80 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{scaffolding.less → _scaffolding.scss} +39 -24
- data/vendor/assets/stylesheets/twbs/bootstrap/{tables.less → _tables.scss} +42 -48
- data/vendor/assets/stylesheets/twbs/bootstrap/_theme.scss +247 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_thumbnails.scss +38 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_tooltip.scss +95 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/_type.scss +296 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{utilities.less → _utilities.scss} +14 -3
- data/vendor/assets/stylesheets/twbs/bootstrap/_variables.scss +831 -0
- data/vendor/assets/stylesheets/twbs/bootstrap/{wells.less → _wells.scss} +6 -6
- data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.scss +48 -0
- data/vendor/assets/stylesheets/twbs/{bootstrap.less → bootstrap.scss} +0 -0
- metadata +94 -134
- data/test/dummy/app/assets/stylesheets/test.css.less +0 -5
- data/test/dummy/app/assets/stylesheets/twbs-variables.css.less +0 -6
- data/test/dummy/config/database.yml +0 -25
- data/test/dummy/db/.keep +0 -0
- data/vendor/assets/stylesheets/fontawesome/bootstrap.less +0 -84
- data/vendor/assets/stylesheets/fontawesome/core.less +0 -129
- data/vendor/assets/stylesheets/fontawesome/extras.less +0 -93
- data/vendor/assets/stylesheets/fontawesome/font-awesome.less +0 -33
- data/vendor/assets/stylesheets/fontawesome/icons.less +0 -381
- data/vendor/assets/stylesheets/fontawesome/mixins.less +0 -48
- data/vendor/assets/stylesheets/fontawesome/path.less +0 -14
- data/vendor/assets/stylesheets/fontawesome/variables.less +0 -735
- data/vendor/assets/stylesheets/twbs/bootstrap/bootstrap.less +0 -58
- data/vendor/assets/stylesheets/twbs/bootstrap/breadcrumbs.less +0 -23
- data/vendor/assets/stylesheets/twbs/bootstrap/close.less +0 -33
- data/vendor/assets/stylesheets/twbs/bootstrap/code.less +0 -56
- data/vendor/assets/stylesheets/twbs/bootstrap/grid.less +0 -346
- data/vendor/assets/stylesheets/twbs/bootstrap/jumbotron.less +0 -40
- data/vendor/assets/stylesheets/twbs/bootstrap/list-group.less +0 -88
- data/vendor/assets/stylesheets/twbs/bootstrap/mixins.less +0 -744
- data/vendor/assets/stylesheets/twbs/bootstrap/navbar.less +0 -621
- data/vendor/assets/stylesheets/twbs/bootstrap/pagination.less +0 -85
- data/vendor/assets/stylesheets/twbs/bootstrap/panels.less +0 -143
- data/vendor/assets/stylesheets/twbs/bootstrap/progress-bars.less +0 -96
- data/vendor/assets/stylesheets/twbs/bootstrap/responsive-utilities.less +0 -220
- data/vendor/assets/stylesheets/twbs/bootstrap/theme.less +0 -244
- data/vendor/assets/stylesheets/twbs/bootstrap/thumbnails.less +0 -32
- data/vendor/assets/stylesheets/twbs/bootstrap/tooltip.less +0 -95
- data/vendor/assets/stylesheets/twbs/bootstrap/type.less +0 -271
- data/vendor/assets/stylesheets/twbs/bootstrap/variables.less +0 -635
@@ -10,7 +10,7 @@
|
|
10
10
|
margin-bottom: 0;
|
11
11
|
padding-left: 0; // Override default ul/ol
|
12
12
|
list-style: none;
|
13
|
-
|
13
|
+
@include clearfix();
|
14
14
|
|
15
15
|
> li {
|
16
16
|
position: relative;
|
@@ -19,21 +19,21 @@
|
|
19
19
|
> a {
|
20
20
|
position: relative;
|
21
21
|
display: block;
|
22
|
-
padding:
|
22
|
+
padding: $nav-link-padding;
|
23
23
|
&:hover,
|
24
24
|
&:focus {
|
25
25
|
text-decoration: none;
|
26
|
-
background-color:
|
26
|
+
background-color: $nav-link-hover-bg;
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
30
30
|
// Disabled state sets text to gray and nukes hover/tab effects
|
31
31
|
&.disabled > a {
|
32
|
-
color:
|
32
|
+
color: $nav-disabled-link-color;
|
33
33
|
|
34
34
|
&:hover,
|
35
35
|
&:focus {
|
36
|
-
color:
|
36
|
+
color: $nav-disabled-link-hover-color;
|
37
37
|
text-decoration: none;
|
38
38
|
background-color: transparent;
|
39
39
|
cursor: not-allowed;
|
@@ -46,8 +46,8 @@
|
|
46
46
|
&,
|
47
47
|
&:hover,
|
48
48
|
&:focus {
|
49
|
-
background-color:
|
50
|
-
border-color:
|
49
|
+
background-color: $nav-link-hover-bg;
|
50
|
+
border-color: $link-color;
|
51
51
|
}
|
52
52
|
}
|
53
53
|
|
@@ -57,7 +57,7 @@
|
|
57
57
|
// we missed it. We don't currently support this anywhere, but in the interest
|
58
58
|
// of maintaining backward compatibility in case you use it, it's deprecated.
|
59
59
|
.nav-divider {
|
60
|
-
|
60
|
+
@include nav-divider();
|
61
61
|
}
|
62
62
|
|
63
63
|
// Prevent IE8 from misplacing imgs
|
@@ -74,7 +74,7 @@
|
|
74
74
|
|
75
75
|
// Give the tabs something to sit on
|
76
76
|
.nav-tabs {
|
77
|
-
border-bottom: 1px solid
|
77
|
+
border-bottom: 1px solid $nav-tabs-border-color;
|
78
78
|
> li {
|
79
79
|
float: left;
|
80
80
|
// Make the list-items overlay the bottom border
|
@@ -83,22 +83,22 @@
|
|
83
83
|
// Actual tabs (as links)
|
84
84
|
> a {
|
85
85
|
margin-right: 2px;
|
86
|
-
line-height:
|
86
|
+
line-height: $line-height-base;
|
87
87
|
border: 1px solid transparent;
|
88
|
-
border-radius:
|
88
|
+
border-radius: $border-radius-base $border-radius-base 0 0;
|
89
89
|
&:hover {
|
90
|
-
border-color:
|
90
|
+
border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
|
91
91
|
}
|
92
92
|
}
|
93
93
|
|
94
|
-
// Active state, and
|
94
|
+
// Active state, and its :hover to override normal :hover
|
95
95
|
&.active > a {
|
96
96
|
&,
|
97
97
|
&:hover,
|
98
98
|
&:focus {
|
99
|
-
color:
|
100
|
-
background-color:
|
101
|
-
border: 1px solid
|
99
|
+
color: $nav-tabs-active-link-hover-color;
|
100
|
+
background-color: $nav-tabs-active-link-hover-bg;
|
101
|
+
border: 1px solid $nav-tabs-active-link-hover-border-color;
|
102
102
|
border-bottom-color: transparent;
|
103
103
|
cursor: default;
|
104
104
|
}
|
@@ -106,8 +106,8 @@
|
|
106
106
|
}
|
107
107
|
// pulling this in mainly for less shorthand
|
108
108
|
&.nav-justified {
|
109
|
-
.nav-justified
|
110
|
-
.nav-tabs-justified
|
109
|
+
@extend .nav-justified;
|
110
|
+
@extend .nav-tabs-justified;
|
111
111
|
}
|
112
112
|
}
|
113
113
|
|
@@ -120,7 +120,7 @@
|
|
120
120
|
|
121
121
|
// Links rendered as pills
|
122
122
|
> a {
|
123
|
-
border-radius:
|
123
|
+
border-radius: $nav-pills-border-radius;
|
124
124
|
}
|
125
125
|
+ li {
|
126
126
|
margin-left: 2px;
|
@@ -131,8 +131,8 @@
|
|
131
131
|
&,
|
132
132
|
&:hover,
|
133
133
|
&:focus {
|
134
|
-
color:
|
135
|
-
background-color:
|
134
|
+
color: $nav-pills-active-link-hover-color;
|
135
|
+
background-color: $nav-pills-active-link-hover-bg;
|
136
136
|
}
|
137
137
|
}
|
138
138
|
}
|
@@ -168,7 +168,12 @@
|
|
168
168
|
}
|
169
169
|
}
|
170
170
|
|
171
|
-
|
171
|
+
> .dropdown .dropdown-menu {
|
172
|
+
top: auto;
|
173
|
+
left: auto;
|
174
|
+
}
|
175
|
+
|
176
|
+
@media (min-width: $screen-sm-min) {
|
172
177
|
> li {
|
173
178
|
display: table-cell;
|
174
179
|
width: 1%;
|
@@ -180,30 +185,32 @@
|
|
180
185
|
}
|
181
186
|
|
182
187
|
// Move borders to anchors instead of bottom of list
|
188
|
+
//
|
189
|
+
// Mixin for adding on top the shared `.nav-justified` styles for our tabs
|
183
190
|
.nav-tabs-justified {
|
184
191
|
border-bottom: 0;
|
185
192
|
|
186
193
|
> li > a {
|
187
194
|
// Override margin from .nav-tabs
|
188
195
|
margin-right: 0;
|
189
|
-
border-radius:
|
196
|
+
border-radius: $border-radius-base;
|
190
197
|
}
|
191
198
|
|
192
199
|
> .active > a,
|
193
200
|
> .active > a:hover,
|
194
201
|
> .active > a:focus {
|
195
|
-
border: 1px solid
|
202
|
+
border: 1px solid $nav-tabs-justified-link-border-color;
|
196
203
|
}
|
197
204
|
|
198
|
-
@media (min-width:
|
205
|
+
@media (min-width: $screen-sm-min) {
|
199
206
|
> li > a {
|
200
|
-
border-bottom: 1px solid
|
201
|
-
border-radius:
|
207
|
+
border-bottom: 1px solid $nav-tabs-justified-link-border-color;
|
208
|
+
border-radius: $border-radius-base $border-radius-base 0 0;
|
202
209
|
}
|
203
210
|
> .active > a,
|
204
211
|
> .active > a:hover,
|
205
212
|
> .active > a:focus {
|
206
|
-
border-bottom-color:
|
213
|
+
border-bottom-color: $nav-tabs-justified-active-link-border-color;
|
207
214
|
}
|
208
215
|
}
|
209
216
|
}
|
@@ -212,42 +219,24 @@
|
|
212
219
|
// Tabbable tabs
|
213
220
|
// -------------------------
|
214
221
|
|
215
|
-
//
|
216
|
-
.
|
217
|
-
.
|
218
|
-
|
219
|
-
|
220
|
-
// Show/hide tabbable areas
|
221
|
-
.tab-content > .tab-pane,
|
222
|
-
.pill-content > .pill-pane {
|
223
|
-
display: none;
|
224
|
-
}
|
225
|
-
.tab-content,
|
226
|
-
.pill-content {
|
222
|
+
// Hide tabbable panes to start, show them when `.active`
|
223
|
+
.tab-content {
|
224
|
+
> .tab-pane {
|
225
|
+
display: none;
|
226
|
+
}
|
227
227
|
> .active {
|
228
228
|
display: block;
|
229
229
|
}
|
230
230
|
}
|
231
231
|
|
232
232
|
|
233
|
-
|
234
233
|
// Dropdowns
|
235
234
|
// -------------------------
|
236
235
|
|
237
|
-
// Make dropdown carets use link color in navs
|
238
|
-
.nav .caret {
|
239
|
-
border-top-color: @link-color;
|
240
|
-
border-bottom-color: @link-color;
|
241
|
-
}
|
242
|
-
.nav a:hover .caret {
|
243
|
-
border-top-color: @link-hover-color;
|
244
|
-
border-bottom-color: @link-hover-color;
|
245
|
-
}
|
246
|
-
|
247
236
|
// Specific dropdowns
|
248
237
|
.nav-tabs .dropdown-menu {
|
249
238
|
// make dropdown border overlap tab border
|
250
239
|
margin-top: -1px;
|
251
240
|
// Remove the top rounded corners here since there is a hard edge above the menu
|
252
|
-
|
241
|
+
@include border-top-radius(0);
|
253
242
|
}
|
@@ -1,6 +1,25 @@
|
|
1
|
-
/*! normalize.css
|
1
|
+
/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
|
2
|
+
|
3
|
+
//
|
4
|
+
// 1. Set default font family to sans-serif.
|
5
|
+
// 2. Prevent iOS text size adjust after orientation change, without disabling
|
6
|
+
// user zoom.
|
7
|
+
//
|
8
|
+
|
9
|
+
html {
|
10
|
+
font-family: sans-serif; // 1
|
11
|
+
-ms-text-size-adjust: 100%; // 2
|
12
|
+
-webkit-text-size-adjust: 100%; // 2
|
13
|
+
}
|
14
|
+
|
15
|
+
//
|
16
|
+
// Remove default margin.
|
17
|
+
//
|
18
|
+
|
19
|
+
body {
|
20
|
+
margin: 0;
|
21
|
+
}
|
2
22
|
|
3
|
-
// ==========================================================================
|
4
23
|
// HTML5 display definitions
|
5
24
|
// ==========================================================================
|
6
25
|
|
@@ -24,13 +43,16 @@ summary {
|
|
24
43
|
}
|
25
44
|
|
26
45
|
//
|
27
|
-
// Correct `inline-block` display not defined in IE 8/9.
|
46
|
+
// 1. Correct `inline-block` display not defined in IE 8/9.
|
47
|
+
// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
|
28
48
|
//
|
29
49
|
|
30
50
|
audio,
|
31
51
|
canvas,
|
52
|
+
progress,
|
32
53
|
video {
|
33
|
-
display: inline-block;
|
54
|
+
display: inline-block; // 1
|
55
|
+
vertical-align: baseline; // 2
|
34
56
|
}
|
35
57
|
|
36
58
|
//
|
@@ -44,47 +66,24 @@ audio:not([controls]) {
|
|
44
66
|
}
|
45
67
|
|
46
68
|
//
|
47
|
-
// Address styling not present in IE 8/9.
|
69
|
+
// Address `[hidden]` styling not present in IE 8/9.
|
70
|
+
// Hide the `template` element in IE, Safari, and Firefox < 22.
|
48
71
|
//
|
49
72
|
|
50
|
-
[hidden]
|
73
|
+
[hidden],
|
74
|
+
template {
|
51
75
|
display: none;
|
52
76
|
}
|
53
77
|
|
54
|
-
// ==========================================================================
|
55
|
-
// Base
|
56
|
-
// ==========================================================================
|
57
|
-
|
58
|
-
//
|
59
|
-
// 1. Set default font family to sans-serif.
|
60
|
-
// 2. Prevent iOS text size adjust after orientation change, without disabling
|
61
|
-
// user zoom.
|
62
|
-
//
|
63
|
-
|
64
|
-
html {
|
65
|
-
font-family: sans-serif; // 1
|
66
|
-
-webkit-text-size-adjust: 100%; // 2
|
67
|
-
-ms-text-size-adjust: 100%; // 2
|
68
|
-
}
|
69
|
-
|
70
|
-
//
|
71
|
-
// Remove default margin.
|
72
|
-
//
|
73
|
-
|
74
|
-
body {
|
75
|
-
margin: 0;
|
76
|
-
}
|
77
|
-
|
78
|
-
// ==========================================================================
|
79
78
|
// Links
|
80
79
|
// ==========================================================================
|
81
80
|
|
82
81
|
//
|
83
|
-
//
|
82
|
+
// Remove the gray background color from active links in IE 10.
|
84
83
|
//
|
85
84
|
|
86
|
-
a
|
87
|
-
|
85
|
+
a {
|
86
|
+
background: transparent;
|
88
87
|
}
|
89
88
|
|
90
89
|
//
|
@@ -96,19 +95,8 @@ a:hover {
|
|
96
95
|
outline: 0;
|
97
96
|
}
|
98
97
|
|
98
|
+
// Text-level semantics
|
99
99
|
// ==========================================================================
|
100
|
-
// Typography
|
101
|
-
// ==========================================================================
|
102
|
-
|
103
|
-
//
|
104
|
-
// Address variable `h1` font-size and margin within `section` and `article`
|
105
|
-
// contexts in Firefox 4+, Safari 5, and Chrome.
|
106
|
-
//
|
107
|
-
|
108
|
-
h1 {
|
109
|
-
font-size: 2em;
|
110
|
-
margin: 0.67em 0;
|
111
|
-
}
|
112
100
|
|
113
101
|
//
|
114
102
|
// Address styling not present in IE 8/9, Safari 5, and Chrome.
|
@@ -136,13 +124,13 @@ dfn {
|
|
136
124
|
}
|
137
125
|
|
138
126
|
//
|
139
|
-
// Address
|
127
|
+
// Address variable `h1` font-size and margin within `section` and `article`
|
128
|
+
// contexts in Firefox 4+, Safari 5, and Chrome.
|
140
129
|
//
|
141
130
|
|
142
|
-
|
143
|
-
-
|
144
|
-
|
145
|
-
height: 0;
|
131
|
+
h1 {
|
132
|
+
font-size: 2em;
|
133
|
+
margin: 0.67em 0;
|
146
134
|
}
|
147
135
|
|
148
136
|
//
|
@@ -154,34 +142,6 @@ mark {
|
|
154
142
|
color: #000;
|
155
143
|
}
|
156
144
|
|
157
|
-
//
|
158
|
-
// Correct font family set oddly in Safari 5 and Chrome.
|
159
|
-
//
|
160
|
-
|
161
|
-
code,
|
162
|
-
kbd,
|
163
|
-
pre,
|
164
|
-
samp {
|
165
|
-
font-family: monospace, serif;
|
166
|
-
font-size: 1em;
|
167
|
-
}
|
168
|
-
|
169
|
-
//
|
170
|
-
// Improve readability of pre-formatted text in all browsers.
|
171
|
-
//
|
172
|
-
|
173
|
-
pre {
|
174
|
-
white-space: pre-wrap;
|
175
|
-
}
|
176
|
-
|
177
|
-
//
|
178
|
-
// Set consistent quote types.
|
179
|
-
//
|
180
|
-
|
181
|
-
q {
|
182
|
-
quotes: "\201C" "\201D" "\2018" "\2019";
|
183
|
-
}
|
184
|
-
|
185
145
|
//
|
186
146
|
// Address inconsistent and variable font size in all browsers.
|
187
147
|
//
|
@@ -210,7 +170,6 @@ sub {
|
|
210
170
|
bottom: -0.25em;
|
211
171
|
}
|
212
172
|
|
213
|
-
// ==========================================================================
|
214
173
|
// Embedded content
|
215
174
|
// ==========================================================================
|
216
175
|
|
@@ -230,8 +189,7 @@ svg:not(:root) {
|
|
230
189
|
overflow: hidden;
|
231
190
|
}
|
232
191
|
|
233
|
-
//
|
234
|
-
// Figures
|
192
|
+
// Grouping content
|
235
193
|
// ==========================================================================
|
236
194
|
|
237
195
|
//
|
@@ -239,63 +197,77 @@ svg:not(:root) {
|
|
239
197
|
//
|
240
198
|
|
241
199
|
figure {
|
242
|
-
margin:
|
200
|
+
margin: 1em 40px;
|
243
201
|
}
|
244
202
|
|
245
|
-
//
|
246
|
-
//
|
247
|
-
//
|
203
|
+
//
|
204
|
+
// Address differences between Firefox and other browsers.
|
205
|
+
//
|
206
|
+
|
207
|
+
hr {
|
208
|
+
-moz-box-sizing: content-box;
|
209
|
+
box-sizing: content-box;
|
210
|
+
height: 0;
|
211
|
+
}
|
248
212
|
|
249
213
|
//
|
250
|
-
//
|
214
|
+
// Contain overflow in all browsers.
|
251
215
|
//
|
252
216
|
|
253
|
-
|
254
|
-
|
255
|
-
margin: 0 2px;
|
256
|
-
padding: 0.35em 0.625em 0.75em;
|
217
|
+
pre {
|
218
|
+
overflow: auto;
|
257
219
|
}
|
258
220
|
|
259
221
|
//
|
260
|
-
//
|
261
|
-
// 2. Remove padding so people aren't caught out if they zero out fieldsets.
|
222
|
+
// Address odd `em`-unit font size rendering in all browsers.
|
262
223
|
//
|
263
224
|
|
264
|
-
|
265
|
-
|
266
|
-
|
225
|
+
code,
|
226
|
+
kbd,
|
227
|
+
pre,
|
228
|
+
samp {
|
229
|
+
font-family: monospace, monospace;
|
230
|
+
font-size: 1em;
|
267
231
|
}
|
268
232
|
|
233
|
+
// Forms
|
234
|
+
// ==========================================================================
|
235
|
+
|
236
|
+
//
|
237
|
+
// Known limitation: by default, Chrome and Safari on OS X allow very limited
|
238
|
+
// styling of `select`, unless a `border` property is set.
|
239
|
+
//
|
240
|
+
|
269
241
|
//
|
270
|
-
// 1. Correct
|
271
|
-
//
|
242
|
+
// 1. Correct color not being inherited.
|
243
|
+
// Known issue: affects color of disabled elements.
|
244
|
+
// 2. Correct font properties not being inherited.
|
272
245
|
// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
|
273
246
|
//
|
274
247
|
|
275
248
|
button,
|
276
249
|
input,
|
250
|
+
optgroup,
|
277
251
|
select,
|
278
252
|
textarea {
|
279
|
-
|
280
|
-
font
|
253
|
+
color: inherit; // 1
|
254
|
+
font: inherit; // 2
|
281
255
|
margin: 0; // 3
|
282
256
|
}
|
283
257
|
|
284
258
|
//
|
285
|
-
// Address
|
286
|
-
// the UA stylesheet.
|
259
|
+
// Address `overflow` set to `hidden` in IE 8/9/10.
|
287
260
|
//
|
288
261
|
|
289
|
-
button
|
290
|
-
|
291
|
-
line-height: normal;
|
262
|
+
button {
|
263
|
+
overflow: visible;
|
292
264
|
}
|
293
265
|
|
294
266
|
//
|
295
267
|
// Address inconsistent `text-transform` inheritance for `button` and `select`.
|
296
268
|
// All other form control elements do not inherit `text-transform` values.
|
297
|
-
// Correct `button` style inheritance in
|
298
|
-
// Correct `select` style inheritance in Firefox
|
269
|
+
// Correct `button` style inheritance in Firefox, IE 8+, and Opera
|
270
|
+
// Correct `select` style inheritance in Firefox.
|
299
271
|
//
|
300
272
|
|
301
273
|
button,
|
@@ -329,8 +301,30 @@ html input[disabled] {
|
|
329
301
|
}
|
330
302
|
|
331
303
|
//
|
332
|
-
//
|
333
|
-
//
|
304
|
+
// Remove inner padding and border in Firefox 4+.
|
305
|
+
//
|
306
|
+
|
307
|
+
button::-moz-focus-inner,
|
308
|
+
input::-moz-focus-inner {
|
309
|
+
border: 0;
|
310
|
+
padding: 0;
|
311
|
+
}
|
312
|
+
|
313
|
+
//
|
314
|
+
// Address Firefox 4+ setting `line-height` on `input` using `!important` in
|
315
|
+
// the UA stylesheet.
|
316
|
+
//
|
317
|
+
|
318
|
+
input {
|
319
|
+
line-height: normal;
|
320
|
+
}
|
321
|
+
|
322
|
+
//
|
323
|
+
// It's recommended that you don't attempt to style these elements.
|
324
|
+
// Firefox's implementation doesn't respect box-sizing, padding, or width.
|
325
|
+
//
|
326
|
+
// 1. Address box sizing set to `content-box` in IE 8/9/10.
|
327
|
+
// 2. Remove excess padding in IE 8/9/10.
|
334
328
|
//
|
335
329
|
|
336
330
|
input[type="checkbox"],
|
@@ -339,6 +333,17 @@ input[type="radio"] {
|
|
339
333
|
padding: 0; // 2
|
340
334
|
}
|
341
335
|
|
336
|
+
//
|
337
|
+
// Fix the cursor style for Chrome's increment/decrement buttons. For certain
|
338
|
+
// `font-size` values of the `input`, it causes the cursor style of the
|
339
|
+
// decrement button to change from `default` to `text`.
|
340
|
+
//
|
341
|
+
|
342
|
+
input[type="number"]::-webkit-inner-spin-button,
|
343
|
+
input[type="number"]::-webkit-outer-spin-button {
|
344
|
+
height: auto;
|
345
|
+
}
|
346
|
+
|
342
347
|
//
|
343
348
|
// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
|
344
349
|
// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
|
@@ -353,8 +358,9 @@ input[type="search"] {
|
|
353
358
|
}
|
354
359
|
|
355
360
|
//
|
356
|
-
// Remove inner padding and search cancel button in Safari
|
357
|
-
//
|
361
|
+
// Remove inner padding and search cancel button in Safari and Chrome on OS X.
|
362
|
+
// Safari (but not Chrome) clips the cancel button when the search input has
|
363
|
+
// padding (and `textfield` appearance).
|
358
364
|
//
|
359
365
|
|
360
366
|
input[type="search"]::-webkit-search-cancel-button,
|
@@ -363,26 +369,42 @@ input[type="search"]::-webkit-search-decoration {
|
|
363
369
|
}
|
364
370
|
|
365
371
|
//
|
366
|
-
//
|
372
|
+
// Define consistent border, margin, and padding.
|
367
373
|
//
|
368
374
|
|
369
|
-
|
370
|
-
|
371
|
-
|
372
|
-
padding: 0;
|
375
|
+
fieldset {
|
376
|
+
border: 1px solid #c0c0c0;
|
377
|
+
margin: 0 2px;
|
378
|
+
padding: 0.35em 0.625em 0.75em;
|
373
379
|
}
|
374
380
|
|
375
381
|
//
|
376
|
-
// 1.
|
377
|
-
// 2.
|
382
|
+
// 1. Correct `color` not being inherited in IE 8/9.
|
383
|
+
// 2. Remove padding so people aren't caught out if they zero out fieldsets.
|
384
|
+
//
|
385
|
+
|
386
|
+
legend {
|
387
|
+
border: 0; // 1
|
388
|
+
padding: 0; // 2
|
389
|
+
}
|
390
|
+
|
391
|
+
//
|
392
|
+
// Remove default vertical scrollbar in IE 8/9.
|
378
393
|
//
|
379
394
|
|
380
395
|
textarea {
|
381
|
-
overflow: auto;
|
382
|
-
|
396
|
+
overflow: auto;
|
397
|
+
}
|
398
|
+
|
399
|
+
//
|
400
|
+
// Don't inherit the `font-weight` (applied by a rule above).
|
401
|
+
// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
|
402
|
+
//
|
403
|
+
|
404
|
+
optgroup {
|
405
|
+
font-weight: bold;
|
383
406
|
}
|
384
407
|
|
385
|
-
// ==========================================================================
|
386
408
|
// Tables
|
387
409
|
// ==========================================================================
|
388
410
|
|
@@ -394,3 +416,8 @@ table {
|
|
394
416
|
border-collapse: collapse;
|
395
417
|
border-spacing: 0;
|
396
418
|
}
|
419
|
+
|
420
|
+
td,
|
421
|
+
th {
|
422
|
+
padding: 0;
|
423
|
+
}
|
@@ -5,25 +5,25 @@
|
|
5
5
|
|
6
6
|
.pager {
|
7
7
|
padding-left: 0;
|
8
|
-
margin:
|
8
|
+
margin: $line-height-computed 0;
|
9
9
|
list-style: none;
|
10
10
|
text-align: center;
|
11
|
-
|
11
|
+
@include clearfix();
|
12
12
|
li {
|
13
13
|
display: inline;
|
14
14
|
> a,
|
15
15
|
> span {
|
16
16
|
display: inline-block;
|
17
17
|
padding: 5px 14px;
|
18
|
-
background-color:
|
19
|
-
border: 1px solid
|
20
|
-
border-radius:
|
18
|
+
background-color: $pager-bg;
|
19
|
+
border: 1px solid $pager-border;
|
20
|
+
border-radius: $pager-border-radius;
|
21
21
|
}
|
22
22
|
|
23
23
|
> a:hover,
|
24
24
|
> a:focus {
|
25
25
|
text-decoration: none;
|
26
|
-
background-color:
|
26
|
+
background-color: $pager-hover-bg;
|
27
27
|
}
|
28
28
|
}
|
29
29
|
|
@@ -46,8 +46,8 @@
|
|
46
46
|
> a:hover,
|
47
47
|
> a:focus,
|
48
48
|
> span {
|
49
|
-
color:
|
50
|
-
background-color:
|
49
|
+
color: $pager-disabled-color;
|
50
|
+
background-color: $pager-bg;
|
51
51
|
cursor: not-allowed;
|
52
52
|
}
|
53
53
|
}
|