bootstrap-generators 3.0.0.1 → 3.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +8 -8
- data/Rakefile +3 -7
- data/lib/bootstrap/generators/version.rb +1 -1
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +57 -40
- data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.scss +57 -40
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.erb +1 -1
- data/lib/generators/bootstrap/install/templates/layouts/starter.html.haml +1 -1
- data/readme-template.md.erb +1 -1
- data/vendor/assets/fonts/glyphicons-halflings-regular.eot +0 -0
- data/vendor/assets/fonts/glyphicons-halflings-regular.svg +200 -199
- data/vendor/assets/fonts/glyphicons-halflings-regular.ttf +0 -0
- data/vendor/assets/fonts/glyphicons-halflings-regular.woff +0 -0
- data/vendor/assets/javascripts/bootstrap.js +5 -5
- data/vendor/assets/javascripts/bootstrap/affix.js +4 -4
- data/vendor/assets/javascripts/bootstrap/alert.js +3 -3
- data/vendor/assets/javascripts/bootstrap/button.js +3 -3
- data/vendor/assets/javascripts/bootstrap/carousel.js +4 -4
- data/vendor/assets/javascripts/bootstrap/collapse.js +4 -4
- data/vendor/assets/javascripts/bootstrap/dropdown.js +4 -4
- data/vendor/assets/javascripts/bootstrap/modal.js +4 -4
- data/vendor/assets/javascripts/bootstrap/popover.js +4 -4
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +4 -4
- data/vendor/assets/javascripts/bootstrap/tab.js +5 -5
- data/vendor/assets/javascripts/bootstrap/tooltip.js +4 -4
- data/vendor/assets/javascripts/bootstrap/transition.js +3 -3
- data/vendor/assets/stylesheets/bootstrap.css +1039 -746
- data/vendor/twitter/bootstrap/less/alerts.less +1 -1
- data/vendor/twitter/bootstrap/less/bootstrap.less +0 -10
- data/vendor/twitter/bootstrap/less/breadcrumbs.less +2 -2
- data/vendor/twitter/bootstrap/less/button-groups.less +6 -1
- data/vendor/twitter/bootstrap/less/buttons.less +2 -4
- data/vendor/twitter/bootstrap/less/carousel.less +32 -10
- data/vendor/twitter/bootstrap/less/code.less +5 -8
- data/vendor/twitter/bootstrap/less/dropdowns.less +1 -2
- data/vendor/twitter/bootstrap/less/forms.less +21 -10
- data/vendor/twitter/bootstrap/less/glyphicons.less +20 -15
- data/vendor/twitter/bootstrap/less/grid.less +32 -285
- data/vendor/twitter/bootstrap/less/input-groups.less +9 -0
- data/vendor/twitter/bootstrap/less/jumbotron.less +2 -2
- data/vendor/twitter/bootstrap/less/list-group.less +12 -12
- data/vendor/twitter/bootstrap/less/mixins.less +164 -29
- data/vendor/twitter/bootstrap/less/modals.less +2 -11
- data/vendor/twitter/bootstrap/less/navbar.less +10 -7
- data/vendor/twitter/bootstrap/less/navs.less +53 -20
- data/vendor/twitter/bootstrap/less/normalize.less +16 -6
- data/vendor/twitter/bootstrap/less/pagination.less +2 -0
- data/vendor/twitter/bootstrap/less/panels.less +31 -7
- data/vendor/twitter/bootstrap/less/print.less +6 -1
- data/vendor/twitter/bootstrap/less/progress-bars.less +4 -7
- data/vendor/twitter/bootstrap/less/responsive-utilities.less +57 -68
- data/vendor/twitter/bootstrap/less/scaffolding.less +1 -12
- data/vendor/twitter/bootstrap/less/tables.less +40 -40
- data/vendor/twitter/bootstrap/less/theme.less +32 -17
- data/vendor/twitter/bootstrap/less/thumbnails.less +14 -15
- data/vendor/twitter/bootstrap/less/tooltip.less +8 -8
- data/vendor/twitter/bootstrap/less/type.less +71 -30
- data/vendor/twitter/bootstrap/less/utilities.less +15 -1
- data/vendor/twitter/bootstrap/less/variables.less +56 -39
- data/vendor/twitter/bootstrap/sass/_alerts.scss +1 -1
- data/vendor/twitter/bootstrap/sass/_breadcrumbs.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_button-groups.scss +6 -1
- data/vendor/twitter/bootstrap/sass/_buttons.scss +2 -4
- data/vendor/twitter/bootstrap/sass/_carousel.scss +32 -10
- data/vendor/twitter/bootstrap/sass/_close.scss +2 -0
- data/vendor/twitter/bootstrap/sass/_code.scss +5 -8
- data/vendor/twitter/bootstrap/sass/_dropdowns.scss +1 -2
- data/vendor/twitter/bootstrap/sass/_forms.scss +23 -10
- data/vendor/twitter/bootstrap/sass/_glyphicons.scss +20 -15
- data/vendor/twitter/bootstrap/sass/_grid.scss +32 -285
- data/vendor/twitter/bootstrap/sass/_input-groups.scss +9 -0
- data/vendor/twitter/bootstrap/sass/_jumbotron.scss +2 -2
- data/vendor/twitter/bootstrap/sass/_list-group.scss +16 -16
- data/vendor/twitter/bootstrap/sass/_mixins.scss +167 -34
- data/vendor/twitter/bootstrap/sass/_modals.scss +2 -15
- data/vendor/twitter/bootstrap/sass/_navbar.scss +10 -7
- data/vendor/twitter/bootstrap/sass/_navs.scss +53 -20
- data/vendor/twitter/bootstrap/sass/_normalize.scss +16 -6
- data/vendor/twitter/bootstrap/sass/_pagination.scss +2 -0
- data/vendor/twitter/bootstrap/sass/_panels.scss +31 -7
- data/vendor/twitter/bootstrap/sass/_print.scss +6 -1
- data/vendor/twitter/bootstrap/sass/_progress-bars.scss +4 -7
- data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +37 -48
- data/vendor/twitter/bootstrap/sass/_scaffolding.scss +1 -12
- data/vendor/twitter/bootstrap/sass/_tables.scss +52 -44
- data/vendor/twitter/bootstrap/sass/_theme.scss +26 -11
- data/vendor/twitter/bootstrap/sass/_thumbnails.scss +13 -12
- data/vendor/twitter/bootstrap/sass/_tooltip.scss +8 -8
- data/vendor/twitter/bootstrap/sass/_type.scss +71 -30
- data/vendor/twitter/bootstrap/sass/_utilities.scss +15 -1
- data/vendor/twitter/bootstrap/sass/_variables.scss +56 -39
- data/vendor/twitter/bootstrap/sass/bootstrap.scss +0 -10
- metadata +2 -5
- data/vendor/assets/javascripts/bootstrap-ie.js +0 -2
- data/vendor/assets/javascripts/bootstrap-ie/html5shiv.js +0 -8
- data/vendor/assets/javascripts/bootstrap-ie/respond.min.js +0 -6
|
@@ -37,17 +37,6 @@ textarea {
|
|
|
37
37
|
line-height: inherit;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
// Reset unusual Firefox-on-Android default style.
|
|
41
|
-
//
|
|
42
|
-
// See https://github.com/necolas/normalize.css/issues/214
|
|
43
|
-
|
|
44
|
-
button,
|
|
45
|
-
input,
|
|
46
|
-
select[multiple],
|
|
47
|
-
textarea {
|
|
48
|
-
background-image: none;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
40
|
|
|
52
41
|
// Links
|
|
53
42
|
|
|
@@ -125,6 +114,6 @@ hr {
|
|
|
125
114
|
margin: -1px;
|
|
126
115
|
padding: 0;
|
|
127
116
|
overflow: hidden;
|
|
128
|
-
clip: rect(0
|
|
117
|
+
clip: rect(0,0,0,0);
|
|
129
118
|
border: 0;
|
|
130
119
|
}
|
|
@@ -18,9 +18,9 @@ th {
|
|
|
18
18
|
width: 100%;
|
|
19
19
|
margin-bottom: $line-height-computed;
|
|
20
20
|
// Cells
|
|
21
|
-
thead,
|
|
22
|
-
tbody,
|
|
23
|
-
tfoot {
|
|
21
|
+
> thead,
|
|
22
|
+
> tbody,
|
|
23
|
+
> tfoot {
|
|
24
24
|
> tr {
|
|
25
25
|
> th,
|
|
26
26
|
> td {
|
|
@@ -32,22 +32,23 @@ th {
|
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
// Bottom align for column headings
|
|
35
|
-
thead > tr > th {
|
|
35
|
+
> thead > tr > th {
|
|
36
36
|
vertical-align: bottom;
|
|
37
37
|
border-bottom: 2px solid $table-border-color;
|
|
38
38
|
}
|
|
39
39
|
// Remove top border from thead by default
|
|
40
|
-
caption + thead,
|
|
41
|
-
colgroup + thead,
|
|
42
|
-
thead:first-child {
|
|
43
|
-
tr:first-child {
|
|
44
|
-
th,
|
|
40
|
+
> caption + thead,
|
|
41
|
+
> colgroup + thead,
|
|
42
|
+
> thead:first-child {
|
|
43
|
+
> tr:first-child {
|
|
44
|
+
> th,
|
|
45
|
+
> td {
|
|
45
46
|
border-top: 0;
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
// Account for multiple tbody instances
|
|
50
|
-
tbody + tbody {
|
|
51
|
+
> tbody + tbody {
|
|
51
52
|
border-top: 2px solid $table-border-color;
|
|
52
53
|
}
|
|
53
54
|
|
|
@@ -61,9 +62,9 @@ th {
|
|
|
61
62
|
// Condensed table w/ half padding
|
|
62
63
|
|
|
63
64
|
.table-condensed {
|
|
64
|
-
thead,
|
|
65
|
-
tbody,
|
|
66
|
-
tfoot {
|
|
65
|
+
> thead,
|
|
66
|
+
> tbody,
|
|
67
|
+
> tfoot {
|
|
67
68
|
> tr {
|
|
68
69
|
> th,
|
|
69
70
|
> td {
|
|
@@ -90,12 +91,10 @@ th {
|
|
|
90
91
|
}
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
|
-
> thead {
|
|
94
|
-
>
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
border-bottom-width: 2px;
|
|
98
|
-
}
|
|
94
|
+
> thead > tr {
|
|
95
|
+
> th,
|
|
96
|
+
> td {
|
|
97
|
+
border-bottom-width: 2px;
|
|
99
98
|
}
|
|
100
99
|
}
|
|
101
100
|
}
|
|
@@ -106,12 +105,10 @@ th {
|
|
|
106
105
|
// Default zebra-stripe styles (alternating gray and transparent backgrounds)
|
|
107
106
|
|
|
108
107
|
.table-striped {
|
|
109
|
-
> tbody {
|
|
110
|
-
>
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
background-color: $table-bg-accent;
|
|
114
|
-
}
|
|
108
|
+
> tbody > tr:nth-child(odd) {
|
|
109
|
+
> td,
|
|
110
|
+
> th {
|
|
111
|
+
background-color: $table-bg-accent;
|
|
115
112
|
}
|
|
116
113
|
}
|
|
117
114
|
}
|
|
@@ -122,12 +119,10 @@ th {
|
|
|
122
119
|
// Placed here since it has to come after the potential zebra striping
|
|
123
120
|
|
|
124
121
|
.table-hover {
|
|
125
|
-
> tbody {
|
|
126
|
-
>
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
background-color: $table-bg-hover;
|
|
130
|
-
}
|
|
122
|
+
> tbody > tr:hover {
|
|
123
|
+
> td,
|
|
124
|
+
> th {
|
|
125
|
+
background-color: $table-bg-hover;
|
|
131
126
|
}
|
|
132
127
|
}
|
|
133
128
|
}
|
|
@@ -157,14 +152,18 @@ table {
|
|
|
157
152
|
// Exact selectors below required to override `.table-striped` and prevent
|
|
158
153
|
// inheritance to nested tables.
|
|
159
154
|
|
|
160
|
-
.table
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
>
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
155
|
+
.table {
|
|
156
|
+
> thead,
|
|
157
|
+
> tbody,
|
|
158
|
+
> tfoot {
|
|
159
|
+
> tr {
|
|
160
|
+
> td.active,
|
|
161
|
+
> th.active,
|
|
162
|
+
&.active > td,
|
|
163
|
+
&.active > th {
|
|
164
|
+
background-color: $table-bg-active;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
168
167
|
}
|
|
169
168
|
}
|
|
170
169
|
|
|
@@ -176,22 +175,23 @@ table {
|
|
|
176
175
|
|
|
177
176
|
// Responsive tables
|
|
178
177
|
//
|
|
179
|
-
// Wrap your tables in `.table-
|
|
178
|
+
// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
|
|
180
179
|
// by enabling horizontal scrolling. Only applies <768px. Everything above that
|
|
181
180
|
// will display normally.
|
|
182
181
|
|
|
183
|
-
@media (max-width: $screen-
|
|
182
|
+
@media (max-width: $screen-xs-max) {
|
|
184
183
|
.table-responsive {
|
|
185
184
|
width: 100%;
|
|
186
|
-
margin-bottom:
|
|
185
|
+
margin-bottom: ($line-height-computed * 0.75);
|
|
187
186
|
overflow-y: hidden;
|
|
188
187
|
overflow-x: scroll;
|
|
188
|
+
-ms-overflow-style: -ms-autohiding-scrollbar;
|
|
189
189
|
border: 1px solid $table-border-color;
|
|
190
|
+
-webkit-overflow-scrolling: touch;
|
|
190
191
|
|
|
191
|
-
// Tighten up spacing
|
|
192
|
+
// Tighten up spacing
|
|
192
193
|
> .table {
|
|
193
194
|
margin-bottom: 0;
|
|
194
|
-
background-color: #fff;
|
|
195
195
|
|
|
196
196
|
// Ensure the content doesn't wrap
|
|
197
197
|
> thead,
|
|
@@ -224,6 +224,13 @@ table {
|
|
|
224
224
|
border-right: 0;
|
|
225
225
|
}
|
|
226
226
|
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// Only nuke the last row's bottom-border in `tbody` and `tfoot` since
|
|
230
|
+
// chances are there will be only one `tr` in a `thead` and that would
|
|
231
|
+
// remove the border altogether.
|
|
232
|
+
> tbody,
|
|
233
|
+
> tfoot {
|
|
227
234
|
> tr:last-child {
|
|
228
235
|
> th,
|
|
229
236
|
> td {
|
|
@@ -231,6 +238,7 @@ table {
|
|
|
231
238
|
}
|
|
232
239
|
}
|
|
233
240
|
}
|
|
241
|
+
|
|
234
242
|
}
|
|
235
243
|
}
|
|
236
244
|
}
|
|
@@ -32,13 +32,21 @@
|
|
|
32
32
|
|
|
33
33
|
// Mixin for generating new styles
|
|
34
34
|
@mixin btn-styles($btn-color: #555) {
|
|
35
|
-
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color,
|
|
36
|
-
|
|
35
|
+
@include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
|
|
36
|
+
@include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
|
|
37
|
+
background-repeat: repeat-x;
|
|
38
|
+
border-color: darken($btn-color, 14%);
|
|
39
|
+
|
|
40
|
+
&:hover,
|
|
41
|
+
&:focus {
|
|
42
|
+
background-color: darken($btn-color, 12%);
|
|
43
|
+
background-position: 0 -15px;
|
|
44
|
+
}
|
|
37
45
|
|
|
38
46
|
&:active,
|
|
39
47
|
&.active {
|
|
40
|
-
background-color: darken($btn-color,
|
|
41
|
-
border-color: darken($btn-color,
|
|
48
|
+
background-color: darken($btn-color, 12%);
|
|
49
|
+
border-color: darken($btn-color, 14%);
|
|
42
50
|
}
|
|
43
51
|
}
|
|
44
52
|
|
|
@@ -77,12 +85,15 @@
|
|
|
77
85
|
// --------------------------------------------------
|
|
78
86
|
|
|
79
87
|
.dropdown-menu > li > a:hover,
|
|
80
|
-
.dropdown-menu > li > a:focus
|
|
88
|
+
.dropdown-menu > li > a:focus {
|
|
89
|
+
@include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
|
|
90
|
+
background-color: darken($dropdown-link-hover-bg, 5%);
|
|
91
|
+
}
|
|
81
92
|
.dropdown-menu > .active > a,
|
|
82
93
|
.dropdown-menu > .active > a:hover,
|
|
83
94
|
.dropdown-menu > .active > a:focus {
|
|
84
|
-
@include gradient-vertical($start-color: $dropdown-link-
|
|
85
|
-
background-color: darken($dropdown-link-
|
|
95
|
+
@include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
|
|
96
|
+
background-color: darken($dropdown-link-active-bg, 5%);
|
|
86
97
|
}
|
|
87
98
|
|
|
88
99
|
|
|
@@ -91,15 +102,17 @@
|
|
|
91
102
|
// Navbar
|
|
92
103
|
// --------------------------------------------------
|
|
93
104
|
|
|
94
|
-
//
|
|
95
|
-
.navbar {
|
|
105
|
+
// Default navbar
|
|
106
|
+
.navbar-default {
|
|
96
107
|
@include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
|
|
108
|
+
@include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
|
97
109
|
border-radius: $navbar-border-radius;
|
|
98
110
|
$shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
|
|
99
111
|
@include box-shadow($shadow);
|
|
100
112
|
|
|
101
113
|
.navbar-nav > .active > a {
|
|
102
|
-
|
|
114
|
+
@include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
|
|
115
|
+
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
|
|
103
116
|
}
|
|
104
117
|
}
|
|
105
118
|
.navbar-brand,
|
|
@@ -110,9 +123,11 @@
|
|
|
110
123
|
// Inverted navbar
|
|
111
124
|
.navbar-inverse {
|
|
112
125
|
@include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
|
|
126
|
+
@include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
|
|
113
127
|
|
|
114
128
|
.navbar-nav > .active > a {
|
|
115
|
-
|
|
129
|
+
@include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
|
|
130
|
+
@include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
|
|
116
131
|
}
|
|
117
132
|
|
|
118
133
|
.navbar-brand,
|
|
@@ -7,25 +7,26 @@
|
|
|
7
7
|
.thumbnail {
|
|
8
8
|
@extend .img-thumbnail;
|
|
9
9
|
display: block; // Override the inline-block from `.img-thumbnail`
|
|
10
|
+
margin-bottom: $line-height-computed;
|
|
10
11
|
|
|
11
12
|
> img {
|
|
12
13
|
@include img-responsive();
|
|
14
|
+
margin-left: auto;
|
|
15
|
+
margin-right: auto;
|
|
13
16
|
}
|
|
14
|
-
}
|
|
15
17
|
|
|
18
|
+
// [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
|
|
19
|
+
|
|
20
|
+
// Image captions
|
|
21
|
+
.caption {
|
|
22
|
+
padding: $thumbnail-caption-padding;
|
|
23
|
+
color: $thumbnail-caption-color;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
16
26
|
|
|
17
27
|
// Add a hover state for linked versions only
|
|
18
28
|
a.thumbnail:hover,
|
|
19
|
-
a.thumbnail:focus
|
|
29
|
+
a.thumbnail:focus,
|
|
30
|
+
a.thumbnail.active {
|
|
20
31
|
border-color: $link-color;
|
|
21
32
|
}
|
|
22
|
-
|
|
23
|
-
// Images and captions
|
|
24
|
-
.thumbnail > img {
|
|
25
|
-
margin-left: auto;
|
|
26
|
-
margin-right: auto;
|
|
27
|
-
}
|
|
28
|
-
.thumbnail .caption {
|
|
29
|
-
padding: $thumbnail-caption-padding;
|
|
30
|
-
color: $thumbnail-caption-color;
|
|
31
|
-
}
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
@include opacity(0);
|
|
15
15
|
|
|
16
16
|
&.in { @include opacity(.9); }
|
|
17
|
-
&.top { margin-top: -3px; padding:
|
|
18
|
-
&.right { margin-left: 3px; padding: 0
|
|
19
|
-
&.bottom { margin-top: 3px; padding:
|
|
20
|
-
&.left { margin-left: -3px; padding: 0
|
|
17
|
+
&.top { margin-top: -3px; padding: $tooltip-arrow-width 0; }
|
|
18
|
+
&.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; }
|
|
19
|
+
&.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; }
|
|
20
|
+
&.left { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
// Wrapper for the tooltip content
|
|
@@ -49,13 +49,13 @@
|
|
|
49
49
|
}
|
|
50
50
|
&.top-left .tooltip-arrow {
|
|
51
51
|
bottom: 0;
|
|
52
|
-
left:
|
|
52
|
+
left: $tooltip-arrow-width;
|
|
53
53
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
|
54
54
|
border-top-color: $tooltip-arrow-color;
|
|
55
55
|
}
|
|
56
56
|
&.top-right .tooltip-arrow {
|
|
57
57
|
bottom: 0;
|
|
58
|
-
right:
|
|
58
|
+
right: $tooltip-arrow-width;
|
|
59
59
|
border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
|
|
60
60
|
border-top-color: $tooltip-arrow-color;
|
|
61
61
|
}
|
|
@@ -82,13 +82,13 @@
|
|
|
82
82
|
}
|
|
83
83
|
&.bottom-left .tooltip-arrow {
|
|
84
84
|
top: 0;
|
|
85
|
-
left:
|
|
85
|
+
left: $tooltip-arrow-width;
|
|
86
86
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
|
87
87
|
border-bottom-color: $tooltip-arrow-color;
|
|
88
88
|
}
|
|
89
89
|
&.bottom-right .tooltip-arrow {
|
|
90
90
|
top: 0;
|
|
91
|
-
right:
|
|
91
|
+
right: $tooltip-arrow-width;
|
|
92
92
|
border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
|
|
93
93
|
border-bottom-color: $tooltip-arrow-color;
|
|
94
94
|
}
|
|
@@ -11,11 +11,11 @@ p {
|
|
|
11
11
|
}
|
|
12
12
|
.lead {
|
|
13
13
|
margin-bottom: $line-height-computed;
|
|
14
|
-
font-size: ($font-size-base * 1.15);
|
|
14
|
+
font-size: floor($font-size-base * 1.15);
|
|
15
15
|
font-weight: 200;
|
|
16
16
|
line-height: 1.4;
|
|
17
17
|
|
|
18
|
-
@media (min-width:
|
|
18
|
+
@media (min-width: $screen-sm-min) {
|
|
19
19
|
font-size: ($font-size-base * 1.5);
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -25,18 +25,46 @@ p {
|
|
|
25
25
|
// -------------------------
|
|
26
26
|
|
|
27
27
|
// Ex: 14px base font * 85% = about 12px
|
|
28
|
-
small
|
|
28
|
+
small,
|
|
29
|
+
.small { font-size: 85%; }
|
|
29
30
|
|
|
30
31
|
// Undo browser default styling
|
|
31
32
|
cite { font-style: normal; }
|
|
32
33
|
|
|
33
34
|
// Contextual emphasis
|
|
34
|
-
.text-muted
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
.text-
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
.text-muted {
|
|
36
|
+
color: $text-muted;
|
|
37
|
+
}
|
|
38
|
+
.text-primary {
|
|
39
|
+
color: $brand-primary;
|
|
40
|
+
&:hover {
|
|
41
|
+
color: darken($brand-primary, 10%);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
.text-warning {
|
|
45
|
+
color: $state-warning-text;
|
|
46
|
+
&:hover {
|
|
47
|
+
color: darken($state-warning-text, 10%);
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
.text-danger {
|
|
51
|
+
color: $state-danger-text;
|
|
52
|
+
&:hover {
|
|
53
|
+
color: darken($state-danger-text, 10%);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
.text-success {
|
|
57
|
+
color: $state-success-text;
|
|
58
|
+
&:hover {
|
|
59
|
+
color: darken($state-success-text, 10%);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
.text-info {
|
|
63
|
+
color: $state-info-text;
|
|
64
|
+
&:hover {
|
|
65
|
+
color: darken($state-info-text, 10%);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
40
68
|
|
|
41
69
|
// Alignment
|
|
42
70
|
.text-left { text-align: left; }
|
|
@@ -52,7 +80,10 @@ h1, h2, h3, h4, h5, h6,
|
|
|
52
80
|
font-family: $headings-font-family;
|
|
53
81
|
font-weight: $headings-font-weight;
|
|
54
82
|
line-height: $headings-line-height;
|
|
55
|
-
|
|
83
|
+
color: $headings-color;
|
|
84
|
+
|
|
85
|
+
small,
|
|
86
|
+
.small {
|
|
56
87
|
font-weight: normal;
|
|
57
88
|
line-height: 1;
|
|
58
89
|
color: $headings-small-color;
|
|
@@ -64,25 +95,30 @@ h2,
|
|
|
64
95
|
h3 {
|
|
65
96
|
margin-top: $line-height-computed;
|
|
66
97
|
margin-bottom: ($line-height-computed / 2);
|
|
98
|
+
|
|
99
|
+
small,
|
|
100
|
+
.small {
|
|
101
|
+
font-size: 65%;
|
|
102
|
+
}
|
|
67
103
|
}
|
|
68
104
|
h4,
|
|
69
105
|
h5,
|
|
70
106
|
h6 {
|
|
71
107
|
margin-top: ($line-height-computed / 2);
|
|
72
108
|
margin-bottom: ($line-height-computed / 2);
|
|
73
|
-
}
|
|
74
109
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
h6, .h6 { font-size: ceil($font-size-base * 0.85); } // ~12px
|
|
110
|
+
small,
|
|
111
|
+
.small {
|
|
112
|
+
font-size: 75%;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
81
115
|
|
|
82
|
-
h1
|
|
83
|
-
h2
|
|
84
|
-
h3
|
|
85
|
-
h4
|
|
116
|
+
h1, .h1 { font-size: $font-size-h1; }
|
|
117
|
+
h2, .h2 { font-size: $font-size-h2; }
|
|
118
|
+
h3, .h3 { font-size: $font-size-h3; }
|
|
119
|
+
h4, .h4 { font-size: $font-size-h4; }
|
|
120
|
+
h5, .h5 { font-size: $font-size-h5; }
|
|
121
|
+
h6, .h6 { font-size: $font-size-h6; }
|
|
86
122
|
|
|
87
123
|
|
|
88
124
|
// Page header
|
|
@@ -105,7 +141,7 @@ ol {
|
|
|
105
141
|
margin-top: 0;
|
|
106
142
|
margin-bottom: ($line-height-computed / 2);
|
|
107
143
|
ul,
|
|
108
|
-
ol{
|
|
144
|
+
ol {
|
|
109
145
|
margin-bottom: 0;
|
|
110
146
|
}
|
|
111
147
|
}
|
|
@@ -117,13 +153,19 @@ ol {
|
|
|
117
153
|
padding-left: 0;
|
|
118
154
|
list-style: none;
|
|
119
155
|
}
|
|
156
|
+
|
|
120
157
|
// Inline turns list items into inline-block
|
|
121
158
|
.list-inline {
|
|
122
159
|
@extend .list-unstyled;
|
|
160
|
+
|
|
123
161
|
> li {
|
|
124
162
|
display: inline-block;
|
|
125
163
|
padding-left: 5px;
|
|
126
164
|
padding-right: 5px;
|
|
165
|
+
|
|
166
|
+
&:first-child {
|
|
167
|
+
padding-left: 0;
|
|
168
|
+
}
|
|
127
169
|
}
|
|
128
170
|
}
|
|
129
171
|
|
|
@@ -168,7 +210,7 @@ dd {
|
|
|
168
210
|
|
|
169
211
|
// Abbreviations and acronyms
|
|
170
212
|
abbr[title],
|
|
171
|
-
//
|
|
213
|
+
// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
|
|
172
214
|
abbr[data-original-title] {
|
|
173
215
|
cursor: help;
|
|
174
216
|
border-bottom: 1px dotted $abbr-border-color;
|
|
@@ -196,7 +238,7 @@ blockquote {
|
|
|
196
238
|
line-height: $line-height-base;
|
|
197
239
|
color: $blockquote-small-color;
|
|
198
240
|
&:before {
|
|
199
|
-
content: '\2014 \00A0'
|
|
241
|
+
content: '\2014 \00A0'; // EM DASH, NBSP
|
|
200
242
|
}
|
|
201
243
|
}
|
|
202
244
|
|
|
@@ -207,23 +249,23 @@ blockquote {
|
|
|
207
249
|
border-right: 5px solid $blockquote-border-color;
|
|
208
250
|
border-left: 0;
|
|
209
251
|
p,
|
|
210
|
-
small
|
|
252
|
+
small,
|
|
253
|
+
.small {
|
|
211
254
|
text-align: right;
|
|
212
255
|
}
|
|
213
|
-
small
|
|
256
|
+
small,
|
|
257
|
+
.small {
|
|
214
258
|
&:before {
|
|
215
259
|
content: '';
|
|
216
260
|
}
|
|
217
261
|
&:after {
|
|
218
|
-
content: '\00A0 \2014'
|
|
262
|
+
content: '\00A0 \2014'; // NBSP, EM DASH
|
|
219
263
|
}
|
|
220
264
|
}
|
|
221
265
|
}
|
|
222
266
|
}
|
|
223
267
|
|
|
224
268
|
// Quotes
|
|
225
|
-
q:before,
|
|
226
|
-
q:after,
|
|
227
269
|
blockquote:before,
|
|
228
270
|
blockquote:after {
|
|
229
271
|
content: "";
|
|
@@ -231,7 +273,6 @@ blockquote:after {
|
|
|
231
273
|
|
|
232
274
|
// Addresses
|
|
233
275
|
address {
|
|
234
|
-
display: block;
|
|
235
276
|
margin-bottom: $line-height-computed;
|
|
236
277
|
font-style: normal;
|
|
237
278
|
line-height: $line-height-base;
|