bootstrap-generators 2.0.4 → 2.1.1
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +211 -63
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +102 -28
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +104 -31
- data/vendor/assets/images/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/bootstrap-affix.js +104 -0
- data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/bootstrap-button.js +2 -2
- data/vendor/assets/javascripts/bootstrap-carousel.js +12 -5
- data/vendor/assets/javascripts/bootstrap-collapse.js +4 -3
- data/vendor/assets/javascripts/bootstrap-dropdown.js +66 -16
- data/vendor/assets/javascripts/bootstrap-modal.js +95 -74
- data/vendor/assets/javascripts/bootstrap-popover.js +9 -4
- data/vendor/assets/javascripts/bootstrap-scrollspy.js +9 -9
- data/vendor/assets/javascripts/bootstrap-tab.js +2 -2
- data/vendor/assets/javascripts/bootstrap-tooltip.js +15 -15
- data/vendor/assets/javascripts/bootstrap-transition.js +2 -3
- data/vendor/assets/javascripts/bootstrap-typeahead.js +51 -36
- data/vendor/assets/javascripts/bootstrap.js +1 -1
- data/vendor/assets/stylesheets/bootstrap-responsive.css +1058 -0
- data/vendor/assets/stylesheets/bootstrap-responsive.min.css +9 -0
- data/vendor/assets/stylesheets/bootstrap.css +5774 -0
- data/vendor/assets/stylesheets/bootstrap.min.css +9 -0
- data/vendor/twitter/bootstrap/less/accordion.less +3 -2
- data/vendor/twitter/bootstrap/less/alerts.less +16 -9
- data/vendor/twitter/bootstrap/less/bootstrap.less +1 -1
- data/vendor/twitter/bootstrap/less/breadcrumbs.less +10 -10
- data/vendor/twitter/bootstrap/less/button-groups.less +79 -25
- data/vendor/twitter/bootstrap/less/buttons.less +107 -67
- data/vendor/twitter/bootstrap/less/carousel.less +13 -3
- data/vendor/twitter/bootstrap/less/close.less +4 -2
- data/vendor/twitter/bootstrap/less/code.less +6 -5
- data/vendor/twitter/bootstrap/less/component-animations.less +4 -2
- data/vendor/twitter/bootstrap/less/dropdowns.less +82 -15
- data/vendor/twitter/bootstrap/less/forms.less +124 -57
- data/vendor/twitter/bootstrap/less/grid.less +17 -1
- data/vendor/twitter/bootstrap/less/hero-unit.less +4 -2
- data/vendor/twitter/bootstrap/less/labels-badges.less +19 -2
- data/vendor/twitter/bootstrap/less/layouts.less +1 -2
- data/vendor/twitter/bootstrap/less/mixins.less +112 -77
- data/vendor/twitter/bootstrap/less/modals.less +12 -4
- data/vendor/twitter/bootstrap/less/navbar.less +245 -128
- data/vendor/twitter/bootstrap/less/navs.less +38 -17
- data/vendor/twitter/bootstrap/less/pager.less +11 -7
- data/vendor/twitter/bootstrap/less/pagination.less +23 -15
- data/vendor/twitter/bootstrap/less/popovers.less +101 -33
- data/vendor/twitter/bootstrap/less/progress-bars.less +18 -13
- data/vendor/twitter/bootstrap/less/reset.less +10 -4
- data/vendor/twitter/bootstrap/less/responsive-1200px-min.less +9 -7
- data/vendor/twitter/bootstrap/less/responsive-767px-max.less +95 -70
- data/vendor/twitter/bootstrap/less/responsive-768px-979px.less +7 -5
- data/vendor/twitter/bootstrap/less/responsive-navbar.less +30 -6
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +17 -15
- data/vendor/twitter/bootstrap/less/responsive.less +5 -5
- data/vendor/twitter/bootstrap/less/scaffolding.less +27 -4
- data/vendor/twitter/bootstrap/less/sprites.less +21 -19
- data/vendor/twitter/bootstrap/less/tables.less +81 -12
- data/vendor/twitter/bootstrap/less/thumbnails.less +9 -4
- data/vendor/twitter/bootstrap/less/tooltip.less +47 -12
- data/vendor/twitter/bootstrap/less/type.less +75 -86
- data/vendor/twitter/bootstrap/less/utilities.less +9 -2
- data/vendor/twitter/bootstrap/less/variables.less +104 -31
- data/vendor/twitter/bootstrap/less/wells.less +7 -5
- data/vendor/twitter/bootstrap/sass/_accordion.scss +3 -2
- data/vendor/twitter/bootstrap/sass/_alerts.scss +15 -8
- data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +10 -10
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +77 -23
- data/vendor/twitter/bootstrap/sass/_buttons.scss +106 -66
- data/vendor/twitter/bootstrap/sass/_carousel.scss +13 -3
- data/vendor/twitter/bootstrap/sass/_close.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_code.scss +7 -6
- data/vendor/twitter/bootstrap/sass/_component-animations.scss +5 -3
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +85 -18
- data/vendor/twitter/bootstrap/sass/_forms.scss +121 -53
- data/vendor/twitter/bootstrap/sass/_grid.scss +17 -1
- data/vendor/twitter/bootstrap/sass/_hero-unit.scss +4 -2
- data/vendor/twitter/bootstrap/sass/_labels-badges.scss +29 -12
- data/vendor/twitter/bootstrap/sass/_layouts.scss +2 -3
- data/vendor/twitter/bootstrap/sass/_mixins.scss +163 -127
- data/vendor/twitter/bootstrap/sass/_modals.scss +12 -4
- data/vendor/twitter/bootstrap/sass/_navbar.scss +243 -127
- data/vendor/twitter/bootstrap/sass/_navs.scss +36 -15
- data/vendor/twitter/bootstrap/sass/_pager.scss +12 -8
- data/vendor/twitter/bootstrap/sass/_pagination.scss +23 -15
- data/vendor/twitter/bootstrap/sass/_popovers.scss +101 -33
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +18 -13
- data/vendor/twitter/bootstrap/sass/_reset.scss +8 -3
- data/vendor/twitter/bootstrap/sass/_responsive-1200px-min.scss +9 -7
- data/vendor/twitter/bootstrap/sass/_responsive-767px-max.scss +95 -70
- data/vendor/twitter/bootstrap/sass/_responsive-768px-979px.scss +8 -6
- data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +29 -5
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +32 -15
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +29 -4
- data/vendor/twitter/bootstrap/sass/_sprites.scss +21 -19
- data/vendor/twitter/bootstrap/sass/_tables.scss +79 -11
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +9 -4
- data/vendor/twitter/bootstrap/sass/_tooltip.scss +47 -12
- data/vendor/twitter/bootstrap/sass/_type.scss +74 -85
- data/vendor/twitter/bootstrap/sass/_utilities.scss +24 -2
- data/vendor/twitter/bootstrap/sass/_variables.scss +102 -28
- data/vendor/twitter/bootstrap/sass/_wells.scss +7 -5
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
- data/vendor/twitter/bootstrap/sass/responsive.scss +5 -5
- metadata +15 -10
@@ -1,6 +1,6 @@
|
|
1
|
-
//
|
2
|
-
//
|
3
|
-
//
|
1
|
+
//
|
2
|
+
// Sprites
|
3
|
+
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
6
|
// ICONS
|
@@ -25,9 +25,23 @@
|
|
25
25
|
background-image: url($iconSpritePath);
|
26
26
|
background-position: 14px 14px;
|
27
27
|
background-repeat: no-repeat;
|
28
|
-
|
28
|
+
margin-top: 1px;
|
29
29
|
}
|
30
|
-
|
30
|
+
|
31
|
+
/* White icons with optional class, or on hover/active states of certain elements */
|
32
|
+
.icon-white,
|
33
|
+
.nav-tabs > .active > a > [class^="icon-"],
|
34
|
+
.nav-tabs > .active > a > [class*=" icon-"],
|
35
|
+
.nav-pills > .active > a > [class^="icon-"],
|
36
|
+
.nav-pills > .active > a > [class*=" icon-"],
|
37
|
+
.nav-list > .active > a > [class^="icon-"],
|
38
|
+
.nav-list > .active > a > [class*=" icon-"],
|
39
|
+
.navbar-inverse .nav > .active > a > [class^="icon-"],
|
40
|
+
.navbar-inverse .nav > .active > a > [class*=" icon-"],
|
41
|
+
.dropdown-menu > li > a:hover > [class^="icon-"],
|
42
|
+
.dropdown-menu > li > a:hover > [class*=" icon-"],
|
43
|
+
.dropdown-menu > .active > a > [class^="icon-"],
|
44
|
+
.dropdown-menu > .active > a > [class*=" icon-"] {
|
31
45
|
background-image: url($iconWhiteSpritePath);
|
32
46
|
}
|
33
47
|
|
@@ -145,7 +159,7 @@
|
|
145
159
|
.icon-warning-sign { background-position: -144px -120px; }
|
146
160
|
.icon-plane { background-position: -168px -120px; }
|
147
161
|
.icon-calendar { background-position: -192px -120px; }
|
148
|
-
.icon-random { background-position: -216px -120px; }
|
162
|
+
.icon-random { background-position: -216px -120px; width: 16px; }
|
149
163
|
.icon-comment { background-position: -240px -120px; }
|
150
164
|
.icon-magnet { background-position: -264px -120px; }
|
151
165
|
.icon-chevron-up { background-position: -288px -120px; }
|
@@ -153,7 +167,7 @@
|
|
153
167
|
.icon-retweet { background-position: -336px -120px; }
|
154
168
|
.icon-shopping-cart { background-position: -360px -120px; }
|
155
169
|
.icon-folder-close { background-position: -384px -120px; }
|
156
|
-
.icon-folder-open { background-position: -408px -120px; }
|
170
|
+
.icon-folder-open { background-position: -408px -120px; width: 16px; }
|
157
171
|
.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
|
158
172
|
.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
|
159
173
|
|
@@ -177,15 +191,3 @@
|
|
177
191
|
.icon-filter { background-position: -408px -144px; }
|
178
192
|
.icon-briefcase { background-position: -432px -144px; }
|
179
193
|
.icon-fullscreen { background-position: -456px -144px; }
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
@@ -1,7 +1,6 @@
|
|
1
1
|
//
|
2
2
|
// Tables
|
3
|
-
//
|
4
|
-
// ----------------------------------------
|
3
|
+
// --------------------------------------------------
|
5
4
|
|
6
5
|
|
7
6
|
// BASE TABLES
|
@@ -70,7 +69,7 @@ table {
|
|
70
69
|
.table-bordered {
|
71
70
|
border: 1px solid $tableBorder;
|
72
71
|
border-collapse: separate; // Done so we can round those corners!
|
73
|
-
*border-collapse:
|
72
|
+
*border-collapse: collapse; // IE7 can't round corners anyway
|
74
73
|
border-left: 0;
|
75
74
|
@include border-radius(4px);
|
76
75
|
th,
|
@@ -104,18 +103,39 @@ table {
|
|
104
103
|
}
|
105
104
|
// For first th or td in the first row in the first thead or tbody
|
106
105
|
thead:last-child tr:last-child th:first-child,
|
107
|
-
tbody:last-child tr:last-child td:first-child
|
106
|
+
tbody:last-child tr:last-child td:first-child,
|
107
|
+
tfoot:last-child tr:last-child td:first-child {
|
108
108
|
@include border-radius(0 0 0 4px);
|
109
109
|
-webkit-border-bottom-left-radius: 4px;
|
110
110
|
border-bottom-left-radius: 4px;
|
111
111
|
-moz-border-radius-bottomleft: 4px;
|
112
112
|
}
|
113
113
|
thead:last-child tr:last-child th:last-child,
|
114
|
-
tbody:last-child tr:last-child td:last-child
|
114
|
+
tbody:last-child tr:last-child td:last-child,
|
115
|
+
tfoot:last-child tr:last-child td:last-child {
|
115
116
|
-webkit-border-bottom-right-radius: 4px;
|
116
117
|
border-bottom-right-radius: 4px;
|
117
118
|
-moz-border-radius-bottomright: 4px;
|
118
119
|
}
|
120
|
+
|
121
|
+
// Special fixes to round the left border on the first td/th
|
122
|
+
caption + thead tr:first-child th:first-child,
|
123
|
+
caption + tbody tr:first-child td:first-child,
|
124
|
+
colgroup + thead tr:first-child th:first-child,
|
125
|
+
colgroup + tbody tr:first-child td:first-child {
|
126
|
+
-webkit-border-top-left-radius: 4px;
|
127
|
+
border-top-left-radius: 4px;
|
128
|
+
-moz-border-radius-topleft: 4px;
|
129
|
+
}
|
130
|
+
caption + thead tr:first-child th:last-child,
|
131
|
+
caption + tbody tr:first-child td:last-child,
|
132
|
+
colgroup + thead tr:first-child th:last-child,
|
133
|
+
colgroup + tbody tr:first-child td:last-child {
|
134
|
+
-webkit-border-top-right-radius: 4px;
|
135
|
+
border-top-right-radius: 4px;
|
136
|
+
-moz-border-radius-topleft: 4px;
|
137
|
+
}
|
138
|
+
|
119
139
|
}
|
120
140
|
|
121
141
|
|
@@ -136,10 +156,12 @@ table {
|
|
136
156
|
// HOVER EFFECT
|
137
157
|
// ------------
|
138
158
|
// Placed here since it has to come after the potential zebra striping
|
139
|
-
.table {
|
140
|
-
tbody
|
141
|
-
|
142
|
-
|
159
|
+
.table-hover {
|
160
|
+
tbody {
|
161
|
+
tr:hover td,
|
162
|
+
tr:hover th {
|
163
|
+
background-color: $tableBackgroundHover;
|
164
|
+
}
|
143
165
|
}
|
144
166
|
}
|
145
167
|
|
@@ -147,9 +169,55 @@ table {
|
|
147
169
|
// TABLE CELL SIZING
|
148
170
|
// -----------------
|
149
171
|
|
150
|
-
//
|
151
|
-
table
|
172
|
+
// Reset default grid behavior
|
173
|
+
table [class*=span],
|
174
|
+
.row-fluid table [class*=span] {
|
175
|
+
display: table-cell;
|
176
|
+
float: none; // undo default grid column styles
|
177
|
+
margin-left: 0; // undo default grid column styles
|
178
|
+
}
|
179
|
+
|
180
|
+
// Change the column widths to account for td/th padding
|
181
|
+
.table {
|
152
182
|
@for $i from 1 through 24 {
|
153
183
|
.span#{$i} { @include tableColumns($i); }
|
154
184
|
}
|
155
185
|
}
|
186
|
+
|
187
|
+
|
188
|
+
|
189
|
+
// TABLE BACKGROUNDS
|
190
|
+
// -----------------
|
191
|
+
// Exact selectors below required to override .table-striped
|
192
|
+
|
193
|
+
.table tbody tr {
|
194
|
+
&.success td {
|
195
|
+
background-color: $successBackground;
|
196
|
+
}
|
197
|
+
&.error td {
|
198
|
+
background-color: $errorBackground;
|
199
|
+
}
|
200
|
+
&.warning td {
|
201
|
+
background-color: $warningBackground;
|
202
|
+
}
|
203
|
+
&.info td {
|
204
|
+
background-color: $infoBackground;
|
205
|
+
}
|
206
|
+
}
|
207
|
+
|
208
|
+
|
209
|
+
// Hover states for .table-hover
|
210
|
+
.table-hover tbody tr {
|
211
|
+
&.success:hover td {
|
212
|
+
background-color: darken($successBackground, 5%);
|
213
|
+
}
|
214
|
+
&.error:hover td {
|
215
|
+
background-color: darken($errorBackground, 5%);
|
216
|
+
}
|
217
|
+
&.warning:hover td {
|
218
|
+
background-color: darken($warningBackground, 5%);
|
219
|
+
}
|
220
|
+
&.info:hover td {
|
221
|
+
background-color: darken($infoBackground, 5%);
|
222
|
+
}
|
223
|
+
}
|
@@ -1,5 +1,8 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Thumbnails
|
3
|
+
// --------------------------------------------------
|
4
|
+
|
5
|
+
|
3
6
|
// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
|
4
7
|
|
5
8
|
// Make wrapper ul behave like the grid
|
@@ -24,10 +27,11 @@
|
|
24
27
|
.thumbnail {
|
25
28
|
display: block;
|
26
29
|
padding: 4px;
|
27
|
-
line-height:
|
30
|
+
line-height: $baseLineHeight;
|
28
31
|
border: 1px solid #ddd;
|
29
32
|
@include border-radius(4px);
|
30
|
-
@include box-shadow(0 1px
|
33
|
+
@include box-shadow(0 1px 3px rgba(0,0,0,.055));
|
34
|
+
@include transition(all .2s ease-in-out);
|
31
35
|
}
|
32
36
|
// Add a hover state for linked versions only
|
33
37
|
a.thumbnail:hover {
|
@@ -44,4 +48,5 @@ a.thumbnail:hover {
|
|
44
48
|
}
|
45
49
|
.thumbnail .caption {
|
46
50
|
padding: 9px;
|
51
|
+
color: $gray;
|
47
52
|
}
|
@@ -1,6 +1,9 @@
|
|
1
|
-
//
|
2
|
-
//
|
1
|
+
//
|
2
|
+
// Tooltips
|
3
|
+
// --------------------------------------------------
|
3
4
|
|
5
|
+
|
6
|
+
// Base class
|
4
7
|
.tooltip {
|
5
8
|
position: absolute;
|
6
9
|
z-index: $zindexTooltip;
|
@@ -10,26 +13,58 @@
|
|
10
13
|
font-size: 11px;
|
11
14
|
@include opacity(0);
|
12
15
|
&.in { @include opacity(80); }
|
13
|
-
&.top { margin-top: -
|
14
|
-
&.right { margin-left:
|
15
|
-
&.bottom { margin-top:
|
16
|
-
&.left { margin-left: -
|
17
|
-
&.top .tooltip-arrow { @include popoverArrow-top(); }
|
18
|
-
&.left .tooltip-arrow { @include popoverArrow-left(); }
|
19
|
-
&.bottom .tooltip-arrow { @include popoverArrow-bottom(); }
|
20
|
-
&.right .tooltip-arrow { @include popoverArrow-right(); }
|
16
|
+
&.top { margin-top: -3px; }
|
17
|
+
&.right { margin-left: 3px; }
|
18
|
+
&.bottom { margin-top: 3px; }
|
19
|
+
&.left { margin-left: -3px; }
|
21
20
|
}
|
21
|
+
|
22
|
+
// Wrapper for the tooltip content
|
22
23
|
.tooltip-inner {
|
23
24
|
max-width: 200px;
|
24
25
|
padding: 3px 8px;
|
25
|
-
color: $
|
26
|
+
color: $tooltipColor;
|
26
27
|
text-align: center;
|
27
28
|
text-decoration: none;
|
28
|
-
background-color: $
|
29
|
+
background-color: $tooltipBackground;
|
29
30
|
@include border-radius(4px);
|
30
31
|
}
|
32
|
+
|
33
|
+
// Arrows
|
31
34
|
.tooltip-arrow {
|
32
35
|
position: absolute;
|
33
36
|
width: 0;
|
34
37
|
height: 0;
|
38
|
+
border-color: transparent;
|
39
|
+
border-style: solid;
|
40
|
+
}
|
41
|
+
.tooltip {
|
42
|
+
&.top .tooltip-arrow {
|
43
|
+
bottom: 0;
|
44
|
+
left: 50%;
|
45
|
+
margin-left: -$tooltipArrowWidth;
|
46
|
+
border-width: $tooltipArrowWidth $tooltipArrowWidth 0;
|
47
|
+
border-top-color: $tooltipArrowColor;
|
48
|
+
}
|
49
|
+
&.right .tooltip-arrow {
|
50
|
+
top: 50%;
|
51
|
+
left: 0;
|
52
|
+
margin-top: -$tooltipArrowWidth;
|
53
|
+
border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0;
|
54
|
+
border-right-color: $tooltipArrowColor;
|
55
|
+
}
|
56
|
+
&.left .tooltip-arrow {
|
57
|
+
top: 50%;
|
58
|
+
right: 0;
|
59
|
+
margin-top: -$tooltipArrowWidth;
|
60
|
+
border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth;
|
61
|
+
border-left-color: $tooltipArrowColor;
|
62
|
+
}
|
63
|
+
&.bottom .tooltip-arrow {
|
64
|
+
top: 0;
|
65
|
+
left: 50%;
|
66
|
+
margin-left: -$tooltipArrowWidth;
|
67
|
+
border-width: 0 $tooltipArrowWidth $tooltipArrowWidth;
|
68
|
+
border-bottom-color: $tooltipArrowColor;
|
69
|
+
}
|
35
70
|
}
|
@@ -1,92 +1,98 @@
|
|
1
|
+
//
|
1
2
|
// Typography
|
2
|
-
//
|
3
|
-
// ----------------------------------------------------------------------------------------
|
3
|
+
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
|
-
//
|
7
|
-
//
|
6
|
+
// Body text
|
7
|
+
// -------------------------
|
8
8
|
|
9
9
|
p {
|
10
10
|
margin: 0 0 $baseLineHeight / 2;
|
11
|
-
small {
|
12
|
-
font-size: $baseFontSize - 2;
|
13
|
-
color: $grayLight;
|
14
|
-
}
|
15
11
|
}
|
16
12
|
.lead {
|
17
13
|
margin-bottom: $baseLineHeight;
|
18
|
-
font-size:
|
14
|
+
font-size: $baseFontSize * 1.5;;
|
19
15
|
font-weight: 200;
|
20
16
|
line-height: $baseLineHeight * 1.5;
|
21
17
|
}
|
22
18
|
|
23
|
-
|
24
|
-
//
|
19
|
+
|
20
|
+
// Emphasis & misc
|
21
|
+
// -------------------------
|
22
|
+
|
23
|
+
small {
|
24
|
+
font-size: 85%; // Ex: 14px base font * 85% = about 12px
|
25
|
+
}
|
26
|
+
strong {
|
27
|
+
font-weight: bold;
|
28
|
+
}
|
29
|
+
em {
|
30
|
+
font-style: italic;
|
31
|
+
}
|
32
|
+
cite {
|
33
|
+
font-style: normal;
|
34
|
+
}
|
35
|
+
|
36
|
+
// Utility classes
|
37
|
+
.muted {
|
38
|
+
color: $grayLight;
|
39
|
+
}
|
40
|
+
.text-warning {
|
41
|
+
color: $warningText;
|
42
|
+
}
|
43
|
+
.text-error {
|
44
|
+
color: $errorText;
|
45
|
+
}
|
46
|
+
.text-info {
|
47
|
+
color: $infoText;
|
48
|
+
}
|
49
|
+
.text-success {
|
50
|
+
color: $successText;
|
51
|
+
}
|
52
|
+
|
53
|
+
|
54
|
+
// Headings
|
55
|
+
// -------------------------
|
25
56
|
|
26
57
|
h1, h2, h3, h4, h5, h6 {
|
27
|
-
margin: 0;
|
58
|
+
margin: ($baseLineHeight / 2) 0;
|
28
59
|
font-family: $headingsFontFamily;
|
29
60
|
font-weight: $headingsFontWeight;
|
61
|
+
line-height: 1;
|
30
62
|
color: $headingsColor;
|
31
63
|
text-rendering: optimizelegibility; // Fix the character spacing for headings
|
32
64
|
small {
|
33
65
|
font-weight: normal;
|
66
|
+
line-height: 1;
|
34
67
|
color: $grayLight;
|
35
68
|
}
|
36
69
|
}
|
37
|
-
h1 {
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
}
|
50
|
-
}
|
51
|
-
h3 {
|
52
|
-
font-size: 18px;
|
53
|
-
line-height: $baseLineHeight * 1.5;
|
54
|
-
small {
|
55
|
-
font-size: 14px;
|
56
|
-
}
|
57
|
-
}
|
58
|
-
h4, h5, h6 {
|
59
|
-
line-height: $baseLineHeight;
|
60
|
-
}
|
61
|
-
h4 {
|
62
|
-
font-size: 14px;
|
63
|
-
small {
|
64
|
-
font-size: 12px;
|
65
|
-
}
|
66
|
-
}
|
67
|
-
h5 {
|
68
|
-
font-size: 12px;
|
69
|
-
}
|
70
|
-
h6 {
|
71
|
-
font-size: 11px;
|
72
|
-
color: $grayLight;
|
73
|
-
text-transform: uppercase;
|
74
|
-
}
|
70
|
+
h1 { font-size: 36px; line-height: 40px; }
|
71
|
+
h2 { font-size: 30px; line-height: 40px; }
|
72
|
+
h3 { font-size: 24px; line-height: 40px; }
|
73
|
+
h4 { font-size: 18px; line-height: 20px; }
|
74
|
+
h5 { font-size: 14px; line-height: 20px; }
|
75
|
+
h6 { font-size: 12px; line-height: 20px; }
|
76
|
+
|
77
|
+
h1 small { font-size: 24px; }
|
78
|
+
h2 small { font-size: 18px; }
|
79
|
+
h3 small { font-size: 14px; }
|
80
|
+
h4 small { font-size: 14px; }
|
81
|
+
|
75
82
|
|
76
83
|
// Page header
|
84
|
+
// -------------------------
|
85
|
+
|
77
86
|
.page-header {
|
78
|
-
padding-bottom: $baseLineHeight - 1;
|
79
|
-
margin: $baseLineHeight 0;
|
87
|
+
padding-bottom: ($baseLineHeight / 2) - 1;
|
88
|
+
margin: $baseLineHeight 0 ($baseLineHeight * 1.5);
|
80
89
|
border-bottom: 1px solid $grayLighter;
|
81
90
|
}
|
82
|
-
.page-header h1 {
|
83
|
-
line-height: 1;
|
84
|
-
}
|
85
91
|
|
86
92
|
|
87
93
|
|
88
|
-
//
|
89
|
-
//
|
94
|
+
// Lists
|
95
|
+
// --------------------------------------------------
|
90
96
|
|
91
97
|
// Unordered and Ordered lists
|
92
98
|
ul, ol {
|
@@ -99,12 +105,6 @@ ol ol,
|
|
99
105
|
ol ul {
|
100
106
|
margin-bottom: 0;
|
101
107
|
}
|
102
|
-
ul {
|
103
|
-
list-style: disc;
|
104
|
-
}
|
105
|
-
ol {
|
106
|
-
list-style: decimal;
|
107
|
-
}
|
108
108
|
li {
|
109
109
|
line-height: $baseLineHeight;
|
110
110
|
}
|
@@ -124,22 +124,22 @@ dd {
|
|
124
124
|
}
|
125
125
|
dt {
|
126
126
|
font-weight: bold;
|
127
|
-
line-height: $baseLineHeight - 1; // fix jank Helvetica Neue font bug
|
128
127
|
}
|
129
128
|
dd {
|
130
129
|
margin-left: $baseLineHeight / 2;
|
131
130
|
}
|
132
131
|
// Horizontal layout (like forms)
|
133
132
|
.dl-horizontal {
|
133
|
+
@include clearfix(); // Ensure dl clears floats if empty dd elements present
|
134
134
|
dt {
|
135
135
|
float: left;
|
136
|
-
width:
|
136
|
+
width: $horizontalComponentOffset - 20;
|
137
137
|
clear: left;
|
138
138
|
text-align: right;
|
139
139
|
@include text-overflow();
|
140
140
|
}
|
141
141
|
dd {
|
142
|
-
margin-left:
|
142
|
+
margin-left: $horizontalComponentOffset;
|
143
143
|
}
|
144
144
|
}
|
145
145
|
|
@@ -154,17 +154,6 @@ hr {
|
|
154
154
|
border-bottom: 1px solid $white;
|
155
155
|
}
|
156
156
|
|
157
|
-
// Emphasis
|
158
|
-
strong {
|
159
|
-
font-weight: bold;
|
160
|
-
}
|
161
|
-
em {
|
162
|
-
font-style: italic;
|
163
|
-
}
|
164
|
-
.muted {
|
165
|
-
color: $grayLight;
|
166
|
-
}
|
167
|
-
|
168
157
|
// Abbreviations and acronyms
|
169
158
|
abbr[title] {
|
170
159
|
cursor: help;
|
@@ -204,6 +193,14 @@ blockquote {
|
|
204
193
|
small {
|
205
194
|
text-align: right;
|
206
195
|
}
|
196
|
+
small {
|
197
|
+
&:before {
|
198
|
+
content: '';
|
199
|
+
}
|
200
|
+
&:after {
|
201
|
+
content: '\00A0 \2014';
|
202
|
+
}
|
203
|
+
}
|
207
204
|
}
|
208
205
|
}
|
209
206
|
|
@@ -222,11 +219,3 @@ address {
|
|
222
219
|
font-style: normal;
|
223
220
|
line-height: $baseLineHeight;
|
224
221
|
}
|
225
|
-
|
226
|
-
// Misc
|
227
|
-
small {
|
228
|
-
font-size: 100%;
|
229
|
-
}
|
230
|
-
cite {
|
231
|
-
font-style: normal;
|
232
|
-
}
|