bootstrap-sass-rails 3.0.0.3 → 3.0.3.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +20 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +200 -199
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
- data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
- data/app/assets/javascripts/twitter/bootstrap/affix.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/alert.js +3 -3
- data/app/assets/javascripts/twitter/bootstrap/button.js +13 -7
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/dropdown.js +8 -8
- data/app/assets/javascripts/twitter/bootstrap/modal.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/popover.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tab.js +5 -5
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +4 -4
- data/app/assets/javascripts/twitter/bootstrap/transition.js +3 -3
- data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +6 -6
- data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +12 -33
- data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +4 -9
- data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_close.scss +1 -0
- data/app/assets/stylesheets/twitter/bootstrap/_code.scss +5 -8
- data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +3 -9
- data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +33 -10
- data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +15 -10
- data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +36 -304
- data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +10 -1
- data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +10 -4
- data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +6 -0
- data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +14 -15
- data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +176 -65
- data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +5 -21
- data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +49 -58
- data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +43 -30
- data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss +16 -6
- data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +2 -0
- data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +41 -7
- data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
- data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +4 -19
- data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +37 -48
- data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -12
- data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +45 -50
- data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +26 -11
- data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +22 -15
- data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +8 -8
- data/app/assets/stylesheets/twitter/bootstrap/_type.scss +105 -62
- data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +15 -1
- data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +69 -47
- data/app/assets/stylesheets/twitter/bootstrap.css.scss +0 -10
- data/lib/bootstrap/sass/rails/engine.rb +9 -1
- data/lib/bootstrap/sass/rails/version.rb +1 -1
- data/lib/generators/bootstrap/customize_generator.rb +37 -0
- data/lib/generators/bootstrap/templates/USAGE +23 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.css.scss +18 -0
- data/lib/generators/bootstrap/templates/bootstrap-custom.js +3 -0
- data/test/cases/less_to_sass_spec.rb +1 -1
- data/test/cases/usage_css_spec.rb +0 -3
- metadata +27 -5
- checksums.yaml +0 -15
@@ -3,36 +3,25 @@
|
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
5
|
|
6
|
-
// IE10
|
7
|
-
// Required for Windows 8 Metro split-screen snapping with IE10
|
6
|
+
// IE10 in Windows (Phone) 8
|
8
7
|
//
|
9
|
-
//
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
// IE10 on Windows Phone 8
|
15
|
-
// IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In
|
16
|
-
// other words, say on a Lumia, you'll get 768px as the device width,
|
17
|
-
// meaning users will see the tablet styles and not phone styles.
|
8
|
+
// Support for responsive views via media queries is kind of borked in IE10, for
|
9
|
+
// Surface/desktop in split view and for Windows Phone 8. This particular fix
|
10
|
+
// must be accompanied by a snippet of JavaScript to sniff the user agent and
|
11
|
+
// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at
|
12
|
+
// our Getting Started page for more information on this bug.
|
18
13
|
//
|
19
|
-
//
|
20
|
-
// we won't be doing that here given our limited scope.
|
14
|
+
// For more information, see the following:
|
21
15
|
//
|
22
|
-
//
|
23
|
-
|
24
|
-
|
25
|
-
width: 320px;
|
26
|
-
}
|
27
|
-
}
|
16
|
+
// Issue: https://github.com/twbs/bootstrap/issues/10497
|
17
|
+
// Docs: http://getbootstrap.com/getting-started/#browsers
|
18
|
+
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
|
28
19
|
|
29
|
-
|
30
|
-
|
31
|
-
.hidden {
|
32
|
-
display: none !important;
|
33
|
-
visibility: hidden !important;
|
20
|
+
@-ms-viewport {
|
21
|
+
width: device-width;
|
34
22
|
}
|
35
23
|
|
24
|
+
|
36
25
|
// Visibility utilities
|
37
26
|
|
38
27
|
@include responsive-invisibility('.visible-xs');
|
@@ -40,17 +29,17 @@
|
|
40
29
|
@include responsive-visibility('.visible-xs');
|
41
30
|
}
|
42
31
|
|
43
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
32
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
44
33
|
@include responsive-visibility('.visible-xs.visible-sm');
|
45
34
|
}
|
46
35
|
|
47
36
|
|
48
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
37
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
49
38
|
@include responsive-visibility('.visible-xs.visible-md');
|
50
39
|
}
|
51
40
|
|
52
41
|
|
53
|
-
@media (min-width: $screen-lg) {
|
42
|
+
@media (min-width: $screen-lg-min) {
|
54
43
|
@include responsive-visibility('.visible-xs.visible-lg');
|
55
44
|
}
|
56
45
|
|
@@ -61,16 +50,16 @@
|
|
61
50
|
@include responsive-visibility('.visible-sm.visible-xs');
|
62
51
|
}
|
63
52
|
|
64
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
53
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
65
54
|
@include responsive-visibility('.visible-sm');
|
66
55
|
}
|
67
56
|
|
68
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
57
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
69
58
|
@include responsive-visibility('.visible-sm.visible-md');
|
70
59
|
}
|
71
60
|
|
72
61
|
|
73
|
-
@media (min-width: $screen-lg) {
|
62
|
+
@media (min-width: $screen-lg-min) {
|
74
63
|
@include responsive-visibility('.visible-sm.visible-lg');
|
75
64
|
}
|
76
65
|
|
@@ -82,15 +71,15 @@
|
|
82
71
|
}
|
83
72
|
|
84
73
|
|
85
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
74
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
86
75
|
@include responsive-visibility('.visible-md.visible-sm');
|
87
76
|
}
|
88
77
|
|
89
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
78
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
90
79
|
@include responsive-visibility('.visible-md');
|
91
80
|
}
|
92
81
|
|
93
|
-
@media (min-width: $screen-lg) {
|
82
|
+
@media (min-width: $screen-lg-min) {
|
94
83
|
@include responsive-visibility('.visible-md.visible-lg');
|
95
84
|
}
|
96
85
|
|
@@ -102,16 +91,16 @@
|
|
102
91
|
}
|
103
92
|
|
104
93
|
|
105
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
94
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
106
95
|
@include responsive-visibility('.visible-lg.visible-sm');
|
107
96
|
}
|
108
97
|
|
109
98
|
|
110
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
99
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
111
100
|
@include responsive-visibility('.visible-lg.visible-md');
|
112
101
|
}
|
113
102
|
|
114
|
-
@media (min-width: $screen-lg) {
|
103
|
+
@media (min-width: $screen-lg-min) {
|
115
104
|
@include responsive-visibility('.visible-lg');
|
116
105
|
}
|
117
106
|
|
@@ -120,17 +109,17 @@
|
|
120
109
|
@include responsive-invisibility('.hidden-xs');
|
121
110
|
}
|
122
111
|
|
123
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
112
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
124
113
|
@include responsive-invisibility('.hidden-xs.hidden-sm');
|
125
114
|
}
|
126
115
|
|
127
116
|
|
128
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
117
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
129
118
|
@include responsive-invisibility('.hidden-xs.hidden-md');
|
130
119
|
}
|
131
120
|
|
132
121
|
|
133
|
-
@media (min-width: $screen-lg) {
|
122
|
+
@media (min-width: $screen-lg-min) {
|
134
123
|
@include responsive-invisibility('.hidden-xs.hidden-lg');
|
135
124
|
}
|
136
125
|
|
@@ -141,16 +130,16 @@
|
|
141
130
|
@include responsive-invisibility('.hidden-sm.hidden-xs');
|
142
131
|
}
|
143
132
|
|
144
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
133
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
145
134
|
@include responsive-invisibility('.hidden-sm');
|
146
135
|
}
|
147
136
|
|
148
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
137
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
149
138
|
@include responsive-invisibility('.hidden-sm.hidden-md');
|
150
139
|
}
|
151
140
|
|
152
141
|
|
153
|
-
@media (min-width: $screen-lg) {
|
142
|
+
@media (min-width: $screen-lg-min) {
|
154
143
|
@include responsive-invisibility('.hidden-sm.hidden-lg');
|
155
144
|
}
|
156
145
|
|
@@ -162,15 +151,15 @@
|
|
162
151
|
}
|
163
152
|
|
164
153
|
|
165
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
154
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
166
155
|
@include responsive-invisibility('.hidden-md.hidden-sm');
|
167
156
|
}
|
168
157
|
|
169
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
158
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
170
159
|
@include responsive-invisibility('.hidden-md');
|
171
160
|
}
|
172
161
|
|
173
|
-
@media (min-width: $screen-lg) {
|
162
|
+
@media (min-width: $screen-lg-min) {
|
174
163
|
@include responsive-invisibility('.hidden-md.hidden-lg');
|
175
164
|
}
|
176
165
|
|
@@ -182,16 +171,16 @@
|
|
182
171
|
}
|
183
172
|
|
184
173
|
|
185
|
-
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
|
174
|
+
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
186
175
|
@include responsive-invisibility('.hidden-lg.hidden-sm');
|
187
176
|
}
|
188
177
|
|
189
178
|
|
190
|
-
@media (min-width: $screen-md) and (max-width: $screen-md-max) {
|
179
|
+
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
191
180
|
@include responsive-invisibility('.hidden-lg.hidden-md');
|
192
181
|
}
|
193
182
|
|
194
|
-
@media (min-width: $screen-lg) {
|
183
|
+
@media (min-width: $screen-lg-min) {
|
195
184
|
@include responsive-invisibility('.hidden-lg');
|
196
185
|
}
|
197
186
|
|
@@ -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
|
}
|
@@ -138,6 +133,7 @@ th {
|
|
138
133
|
// Reset default table behavior
|
139
134
|
|
140
135
|
table col[class*="col-"] {
|
136
|
+
position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
|
141
137
|
float: none;
|
142
138
|
display: table-column;
|
143
139
|
}
|
@@ -157,41 +153,32 @@ table {
|
|
157
153
|
// Exact selectors below required to override `.table-striped` and prevent
|
158
154
|
// inheritance to nested tables.
|
159
155
|
|
160
|
-
.table > thead > tr,
|
161
|
-
.table > tbody > tr,
|
162
|
-
.table > tfoot > tr {
|
163
|
-
> td.active,
|
164
|
-
> th.active,
|
165
|
-
&.active > td,
|
166
|
-
&.active > th {
|
167
|
-
background-color: $table-bg-active;
|
168
|
-
}
|
169
|
-
}
|
170
|
-
|
171
156
|
// Generate the contextual variants
|
172
|
-
@include table-row-variant('
|
173
|
-
@include table-row-variant('
|
174
|
-
@include table-row-variant('
|
157
|
+
@include table-row-variant('active', $table-bg-active);
|
158
|
+
@include table-row-variant('success', $state-success-bg);
|
159
|
+
@include table-row-variant('danger', $state-danger-bg);
|
160
|
+
@include table-row-variant('warning', $state-warning-bg);
|
175
161
|
|
176
162
|
|
177
163
|
// Responsive tables
|
178
164
|
//
|
179
|
-
// Wrap your tables in `.table-
|
165
|
+
// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
|
180
166
|
// by enabling horizontal scrolling. Only applies <768px. Everything above that
|
181
167
|
// will display normally.
|
182
168
|
|
183
|
-
@media (max-width: $screen-
|
169
|
+
@media (max-width: $screen-xs-max) {
|
184
170
|
.table-responsive {
|
185
171
|
width: 100%;
|
186
|
-
margin-bottom:
|
172
|
+
margin-bottom: ($line-height-computed * 0.75);
|
187
173
|
overflow-y: hidden;
|
188
174
|
overflow-x: scroll;
|
175
|
+
-ms-overflow-style: -ms-autohiding-scrollbar;
|
189
176
|
border: 1px solid $table-border-color;
|
177
|
+
-webkit-overflow-scrolling: touch;
|
190
178
|
|
191
|
-
// Tighten up spacing
|
179
|
+
// Tighten up spacing
|
192
180
|
> .table {
|
193
181
|
margin-bottom: 0;
|
194
|
-
background-color: #fff;
|
195
182
|
|
196
183
|
// Ensure the content doesn't wrap
|
197
184
|
> thead,
|
@@ -224,6 +211,13 @@ table {
|
|
224
211
|
border-right: 0;
|
225
212
|
}
|
226
213
|
}
|
214
|
+
}
|
215
|
+
|
216
|
+
// Only nuke the last row's bottom-border in `tbody` and `tfoot` since
|
217
|
+
// chances are there will be only one `tr` in a `thead` and that would
|
218
|
+
// remove the border altogether.
|
219
|
+
> tbody,
|
220
|
+
> tfoot {
|
227
221
|
> tr:last-child {
|
228
222
|
> th,
|
229
223
|
> td {
|
@@ -231,6 +225,7 @@ table {
|
|
231
225
|
}
|
232
226
|
}
|
233
227
|
}
|
228
|
+
|
234
229
|
}
|
235
230
|
}
|
236
231
|
}
|
@@ -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,
|
@@ -5,27 +5,34 @@
|
|
5
5
|
|
6
6
|
// Mixin and adjust the regular image class
|
7
7
|
.thumbnail {
|
8
|
-
|
9
|
-
|
8
|
+
display: block;
|
9
|
+
padding: $thumbnail-padding;
|
10
|
+
margin-bottom: $line-height-computed;
|
11
|
+
line-height: $line-height-base;
|
12
|
+
background-color: $thumbnail-bg;
|
13
|
+
border: 1px solid $thumbnail-border;
|
14
|
+
border-radius: $thumbnail-border-radius;
|
15
|
+
@include transition(all .2s ease-in-out);
|
10
16
|
|
11
|
-
> img
|
17
|
+
> img,
|
18
|
+
a > img {
|
12
19
|
@include img-responsive();
|
20
|
+
margin-left: auto;
|
21
|
+
margin-right: auto;
|
13
22
|
}
|
14
|
-
}
|
15
23
|
|
16
24
|
|
25
|
+
|
26
|
+
// Image captions
|
27
|
+
.caption {
|
28
|
+
padding: $thumbnail-caption-padding;
|
29
|
+
color: $thumbnail-caption-color;
|
30
|
+
}
|
31
|
+
}
|
32
|
+
|
17
33
|
// Add a hover state for linked versions only
|
18
34
|
a.thumbnail:hover,
|
19
|
-
a.thumbnail:focus
|
35
|
+
a.thumbnail:focus,
|
36
|
+
a.thumbnail.active {
|
20
37
|
border-color: $link-color;
|
21
38
|
}
|
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
|
}
|