bootstrap-sass 3.0.3.0 → 3.1.0.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bootstrap-sass might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/CHANGELOG.md +4 -0
- data/CONTRIBUTING.md +2 -2
- data/Gemfile +1 -1
- data/LICENSE +17 -10
- data/README.md +17 -17
- data/Rakefile +7 -2
- data/bootstrap-sass.gemspec +9 -9
- data/bower.json +22 -0
- data/composer.json +35 -0
- data/lib/bootstrap-sass.rb +1 -3
- data/lib/bootstrap-sass/sass_functions.rb +4 -3
- data/lib/bootstrap-sass/version.rb +2 -2
- data/tasks/converter.rb +21 -15
- data/tasks/converter/fonts_conversion.rb +7 -3
- data/tasks/converter/js_conversion.rb +20 -3
- data/tasks/converter/less_conversion.rb +89 -60
- data/tasks/converter/logger.rb +6 -14
- data/tasks/converter/network.rb +7 -32
- data/test/compilation_test.rb +1 -1
- data/test/dummy/app/views/pages/root.html.slim +8 -2
- data/test/dummy/config/application.rb +2 -2
- data/test/gemfiles/sass_3_2.gemfile +1 -1
- data/test/gemfiles/sass_head.gemfile +2 -3
- data/test/sprockets_rails_test.rb +21 -0
- data/vendor/assets/javascripts/bootstrap/affix.js +34 -23
- data/vendor/assets/javascripts/bootstrap/alert.js +5 -15
- data/vendor/assets/javascripts/bootstrap/button.js +21 -29
- data/vendor/assets/javascripts/bootstrap/carousel.js +16 -28
- data/vendor/assets/javascripts/bootstrap/collapse.js +7 -16
- data/vendor/assets/javascripts/bootstrap/dropdown.js +19 -26
- data/vendor/assets/javascripts/bootstrap/modal.js +25 -28
- data/vendor/assets/javascripts/bootstrap/popover.js +14 -21
- data/vendor/assets/javascripts/bootstrap/scrollspy.js +16 -21
- data/vendor/assets/javascripts/bootstrap/tab.js +7 -17
- data/vendor/assets/javascripts/bootstrap/tooltip.js +52 -39
- data/vendor/assets/javascripts/bootstrap/transition.js +11 -19
- data/vendor/assets/stylesheets/bootstrap/_badges.scss +4 -0
- data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +4 -1
- data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +8 -9
- data/vendor/assets/stylesheets/bootstrap/_buttons.scss +8 -8
- data/vendor/assets/stylesheets/bootstrap/_code.scss +10 -0
- data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +28 -3
- data/vendor/assets/stylesheets/bootstrap/_forms.scss +81 -38
- data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +1 -5
- data/vendor/assets/stylesheets/bootstrap/_grid.scss +26 -5
- data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +39 -18
- data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +3 -5
- data/vendor/assets/stylesheets/bootstrap/_list-group.scss +25 -3
- data/vendor/assets/stylesheets/bootstrap/_mixins.scss +124 -41
- data/vendor/assets/stylesheets/bootstrap/_modals.scss +15 -6
- data/vendor/assets/stylesheets/bootstrap/_navbar.scss +21 -17
- data/vendor/assets/stylesheets/bootstrap/_navs.scss +1 -1
- data/vendor/assets/stylesheets/bootstrap/_normalize.scss +139 -122
- data/vendor/assets/stylesheets/bootstrap/_pager.scss +4 -4
- data/vendor/assets/stylesheets/bootstrap/_pagination.scss +6 -3
- data/vendor/assets/stylesheets/bootstrap/_panels.scss +63 -15
- data/vendor/assets/stylesheets/bootstrap/_print.scss +0 -4
- data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +6 -124
- data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +17 -2
- data/vendor/assets/stylesheets/bootstrap/_tables.scss +3 -1
- data/vendor/assets/stylesheets/bootstrap/_theme.scss +3 -3
- data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +4 -4
- data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +1 -1
- data/vendor/assets/stylesheets/bootstrap/_type.scss +77 -62
- data/vendor/assets/stylesheets/bootstrap/_variables.scss +350 -163
- data/vendor/assets/stylesheets/bootstrap/_wells.scss +1 -1
- data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +38 -38
- metadata +22 -4
@@ -15,15 +15,15 @@
|
|
15
15
|
> span {
|
16
16
|
display: inline-block;
|
17
17
|
padding: 5px 14px;
|
18
|
-
background-color: $
|
19
|
-
border: 1px solid $
|
18
|
+
background-color: $pager-bg;
|
19
|
+
border: 1px solid $pager-border;
|
20
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
|
|
@@ -47,7 +47,7 @@
|
|
47
47
|
> a:focus,
|
48
48
|
> span {
|
49
49
|
color: $pager-disabled-color;
|
50
|
-
background-color: $
|
50
|
+
background-color: $pager-bg;
|
51
51
|
cursor: not-allowed;
|
52
52
|
}
|
53
53
|
}
|
@@ -16,6 +16,7 @@
|
|
16
16
|
padding: $padding-base-vertical $padding-base-horizontal;
|
17
17
|
line-height: $line-height-base;
|
18
18
|
text-decoration: none;
|
19
|
+
color: $pagination-color;
|
19
20
|
background-color: $pagination-bg;
|
20
21
|
border: 1px solid $pagination-border;
|
21
22
|
margin-left: -1px;
|
@@ -39,7 +40,9 @@
|
|
39
40
|
> li > span {
|
40
41
|
&:hover,
|
41
42
|
&:focus {
|
43
|
+
color: $pagination-hover-color;
|
42
44
|
background-color: $pagination-hover-bg;
|
45
|
+
border-color: $pagination-hover-border;
|
43
46
|
}
|
44
47
|
}
|
45
48
|
|
@@ -51,7 +54,7 @@
|
|
51
54
|
z-index: 2;
|
52
55
|
color: $pagination-active-color;
|
53
56
|
background-color: $pagination-active-bg;
|
54
|
-
border-color: $pagination-active-
|
57
|
+
border-color: $pagination-active-border;
|
55
58
|
cursor: default;
|
56
59
|
}
|
57
60
|
}
|
@@ -64,8 +67,8 @@
|
|
64
67
|
> a:hover,
|
65
68
|
> a:focus {
|
66
69
|
color: $pagination-disabled-color;
|
67
|
-
background-color: $pagination-bg;
|
68
|
-
border-color: $pagination-border;
|
70
|
+
background-color: $pagination-disabled-bg;
|
71
|
+
border-color: $pagination-disabled-border;
|
69
72
|
cursor: not-allowed;
|
70
73
|
}
|
71
74
|
}
|
@@ -14,7 +14,7 @@
|
|
14
14
|
|
15
15
|
// Panel contents
|
16
16
|
.panel-body {
|
17
|
-
padding:
|
17
|
+
padding: $panel-body-padding;
|
18
18
|
@include clearfix();
|
19
19
|
}
|
20
20
|
|
@@ -27,19 +27,28 @@
|
|
27
27
|
.panel {
|
28
28
|
> .list-group {
|
29
29
|
margin-bottom: 0;
|
30
|
-
|
31
30
|
.list-group-item {
|
32
31
|
border-width: 1px 0;
|
33
|
-
|
34
|
-
// Remove border radius for top one
|
32
|
+
border-radius: 0;
|
35
33
|
&:first-child {
|
36
|
-
|
34
|
+
border-top: 0;
|
37
35
|
}
|
38
|
-
// But keep it for the last one
|
39
36
|
&:last-child {
|
40
37
|
border-bottom: 0;
|
41
38
|
}
|
42
39
|
}
|
40
|
+
// Add border top radius for first one
|
41
|
+
&:first-child {
|
42
|
+
.list-group-item:first-child {
|
43
|
+
@include border-top-radius(($panel-border-radius - 1));
|
44
|
+
}
|
45
|
+
}
|
46
|
+
// Add border bottom radius for last one
|
47
|
+
&:last-child {
|
48
|
+
.list-group-item:last-child {
|
49
|
+
@include border-bottom-radius(($panel-border-radius - 1));
|
50
|
+
}
|
51
|
+
}
|
43
52
|
}
|
44
53
|
}
|
45
54
|
// Collapse space between when there's no additional content.
|
@@ -60,12 +69,46 @@
|
|
60
69
|
> .table-responsive > .table {
|
61
70
|
margin-bottom: 0;
|
62
71
|
}
|
72
|
+
// Add border top radius for first one
|
73
|
+
> .table:first-child,
|
74
|
+
> .table-responsive:first-child > .table:first-child {
|
75
|
+
> thead:first-child,
|
76
|
+
> tbody:first-child {
|
77
|
+
> tr:first-child {
|
78
|
+
td:first-child,
|
79
|
+
th:first-child {
|
80
|
+
border-top-left-radius: ($panel-border-radius - 1);
|
81
|
+
}
|
82
|
+
td:last-child,
|
83
|
+
th:last-child {
|
84
|
+
border-top-right-radius: ($panel-border-radius - 1);
|
85
|
+
}
|
86
|
+
}
|
87
|
+
}
|
88
|
+
}
|
89
|
+
// Add border bottom radius for last one
|
90
|
+
> .table:last-child,
|
91
|
+
> .table-responsive:last-child > .table:last-child {
|
92
|
+
> tbody:last-child,
|
93
|
+
> tfoot:last-child {
|
94
|
+
> tr:last-child {
|
95
|
+
td:first-child,
|
96
|
+
th:first-child {
|
97
|
+
border-bottom-left-radius: ($panel-border-radius - 1);
|
98
|
+
}
|
99
|
+
td:last-child,
|
100
|
+
th:last-child {
|
101
|
+
border-bottom-right-radius: ($panel-border-radius - 1);
|
102
|
+
}
|
103
|
+
}
|
104
|
+
}
|
105
|
+
}
|
63
106
|
> .panel-body + .table,
|
64
107
|
> .panel-body + .table-responsive {
|
65
108
|
border-top: 1px solid $table-border-color;
|
66
109
|
}
|
67
|
-
> .table > tbody:first-child th,
|
68
|
-
> .table > tbody:first-child td {
|
110
|
+
> .table > tbody:first-child > tr:first-child th,
|
111
|
+
> .table > tbody:first-child > tr:first-child td {
|
69
112
|
border-top: 0;
|
70
113
|
}
|
71
114
|
> .table-bordered,
|
@@ -83,7 +126,10 @@
|
|
83
126
|
> td:last-child {
|
84
127
|
border-right: 0;
|
85
128
|
}
|
86
|
-
|
129
|
+
&:first-child > th,
|
130
|
+
&:first-child > td {
|
131
|
+
border-top: 0;
|
132
|
+
}
|
87
133
|
&:last-child > th,
|
88
134
|
&:last-child > td {
|
89
135
|
border-bottom: 0;
|
@@ -102,14 +148,14 @@
|
|
102
148
|
.panel-heading {
|
103
149
|
padding: 10px 15px;
|
104
150
|
border-bottom: 1px solid transparent;
|
105
|
-
@include border-top-radius($panel-border-radius - 1);
|
151
|
+
@include border-top-radius(($panel-border-radius - 1));
|
106
152
|
|
107
153
|
> .dropdown .dropdown-toggle {
|
108
154
|
color: inherit;
|
109
155
|
}
|
110
156
|
}
|
111
157
|
|
112
|
-
// Within heading, strip any `h*` tag of
|
158
|
+
// Within heading, strip any `h*` tag of its default margins for spacing.
|
113
159
|
.panel-title {
|
114
160
|
margin-top: 0;
|
115
161
|
margin-bottom: 0;
|
@@ -126,7 +172,7 @@
|
|
126
172
|
padding: 10px 15px;
|
127
173
|
background-color: $panel-footer-bg;
|
128
174
|
border-top: 1px solid $panel-inner-border;
|
129
|
-
@include border-bottom-radius($panel-border-radius - 1);
|
175
|
+
@include border-bottom-radius(($panel-border-radius - 1));
|
130
176
|
}
|
131
177
|
|
132
178
|
|
@@ -136,6 +182,8 @@
|
|
136
182
|
// the help of our collapse JavaScript plugin.
|
137
183
|
|
138
184
|
.panel-group {
|
185
|
+
margin-bottom: $line-height-computed;
|
186
|
+
|
139
187
|
// Tighten up margin so it's only between panels
|
140
188
|
.panel {
|
141
189
|
margin-bottom: 0;
|
@@ -171,12 +219,12 @@
|
|
171
219
|
.panel-success {
|
172
220
|
@include panel-variant($panel-success-border, $panel-success-text, $panel-success-heading-bg, $panel-success-border);
|
173
221
|
}
|
222
|
+
.panel-info {
|
223
|
+
@include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
|
224
|
+
}
|
174
225
|
.panel-warning {
|
175
226
|
@include panel-variant($panel-warning-border, $panel-warning-text, $panel-warning-heading-bg, $panel-warning-border);
|
176
227
|
}
|
177
228
|
.panel-danger {
|
178
229
|
@include panel-variant($panel-danger-border, $panel-danger-text, $panel-danger-heading-bg, $panel-danger-border);
|
179
230
|
}
|
180
|
-
.panel-info {
|
181
|
-
@include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
|
182
|
-
}
|
@@ -25,174 +25,56 @@
|
|
25
25
|
// Visibility utilities
|
26
26
|
|
27
27
|
@include responsive-invisibility('.visible-xs');
|
28
|
+
|
28
29
|
@media (max-width: $screen-xs-max) {
|
29
30
|
@include responsive-visibility('.visible-xs');
|
30
31
|
}
|
31
32
|
|
32
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
33
|
-
@include responsive-visibility('.visible-xs.visible-sm');
|
34
|
-
}
|
35
|
-
|
36
|
-
|
37
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
38
|
-
@include responsive-visibility('.visible-xs.visible-md');
|
39
|
-
}
|
40
|
-
|
41
|
-
|
42
|
-
@media (min-width: $screen-lg-min) {
|
43
|
-
@include responsive-visibility('.visible-xs.visible-lg');
|
44
|
-
}
|
45
|
-
|
46
|
-
|
47
33
|
@include responsive-invisibility('.visible-sm');
|
48
34
|
|
49
|
-
@media (max-width: $screen-xs-max) {
|
50
|
-
@include responsive-visibility('.visible-sm.visible-xs');
|
51
|
-
}
|
52
|
-
|
53
35
|
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
54
36
|
@include responsive-visibility('.visible-sm');
|
55
37
|
}
|
56
38
|
|
57
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
58
|
-
@include responsive-visibility('.visible-sm.visible-md');
|
59
|
-
}
|
60
|
-
|
61
|
-
|
62
|
-
@media (min-width: $screen-lg-min) {
|
63
|
-
@include responsive-visibility('.visible-sm.visible-lg');
|
64
|
-
}
|
65
|
-
|
66
|
-
|
67
39
|
@include responsive-invisibility('.visible-md');
|
68
40
|
|
69
|
-
@media (max-width: $screen-xs-max) {
|
70
|
-
@include responsive-visibility('.visible-md.visible-xs');
|
71
|
-
}
|
72
|
-
|
73
|
-
|
74
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
75
|
-
@include responsive-visibility('.visible-md.visible-sm');
|
76
|
-
}
|
77
|
-
|
78
41
|
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
79
42
|
@include responsive-visibility('.visible-md');
|
80
43
|
}
|
81
44
|
|
82
|
-
@media (min-width: $screen-lg-min) {
|
83
|
-
@include responsive-visibility('.visible-md.visible-lg');
|
84
|
-
}
|
85
|
-
|
86
|
-
|
87
45
|
@include responsive-invisibility('.visible-lg');
|
88
46
|
|
89
|
-
@media (max-width: $screen-xs-max) {
|
90
|
-
@include responsive-visibility('.visible-lg.visible-xs');
|
91
|
-
}
|
92
|
-
|
93
|
-
|
94
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
95
|
-
@include responsive-visibility('.visible-lg.visible-sm');
|
96
|
-
}
|
97
|
-
|
98
|
-
|
99
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
100
|
-
@include responsive-visibility('.visible-lg.visible-md');
|
101
|
-
}
|
102
|
-
|
103
47
|
@media (min-width: $screen-lg-min) {
|
104
48
|
@include responsive-visibility('.visible-lg');
|
105
49
|
}
|
106
50
|
|
107
|
-
@include responsive-visibility('.hidden-xs');
|
108
51
|
@media (max-width: $screen-xs-max) {
|
109
52
|
@include responsive-invisibility('.hidden-xs');
|
110
53
|
}
|
111
54
|
|
112
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
113
|
-
@include responsive-invisibility('.hidden-xs.hidden-sm');
|
114
|
-
}
|
115
|
-
|
116
|
-
|
117
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
118
|
-
@include responsive-invisibility('.hidden-xs.hidden-md');
|
119
|
-
}
|
120
|
-
|
121
|
-
|
122
|
-
@media (min-width: $screen-lg-min) {
|
123
|
-
@include responsive-invisibility('.hidden-xs.hidden-lg');
|
124
|
-
}
|
125
|
-
|
126
|
-
|
127
|
-
@include responsive-visibility('.hidden-sm');
|
128
|
-
|
129
|
-
@media (max-width: $screen-xs-max) {
|
130
|
-
@include responsive-invisibility('.hidden-sm.hidden-xs');
|
131
|
-
}
|
132
|
-
|
133
55
|
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
134
56
|
@include responsive-invisibility('.hidden-sm');
|
135
57
|
}
|
136
58
|
|
137
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
138
|
-
@include responsive-invisibility('.hidden-sm.hidden-md');
|
139
|
-
}
|
140
|
-
|
141
|
-
|
142
|
-
@media (min-width: $screen-lg-min) {
|
143
|
-
@include responsive-invisibility('.hidden-sm.hidden-lg');
|
144
|
-
}
|
145
|
-
|
146
|
-
|
147
|
-
@include responsive-visibility('.hidden-md');
|
148
|
-
|
149
|
-
@media (max-width: $screen-xs-max) {
|
150
|
-
@include responsive-invisibility('.hidden-md.hidden-xs');
|
151
|
-
}
|
152
|
-
|
153
|
-
|
154
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
155
|
-
@include responsive-invisibility('.hidden-md.hidden-sm');
|
156
|
-
}
|
157
|
-
|
158
59
|
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
159
60
|
@include responsive-invisibility('.hidden-md');
|
160
61
|
}
|
161
62
|
|
162
|
-
@media (min-width: $screen-lg-min) {
|
163
|
-
@include responsive-invisibility('.hidden-md.hidden-lg');
|
164
|
-
}
|
165
|
-
|
166
|
-
|
167
|
-
@include responsive-visibility('.hidden-lg');
|
168
|
-
|
169
|
-
@media (max-width: $screen-xs-max) {
|
170
|
-
@include responsive-invisibility('.hidden-lg.hidden-xs');
|
171
|
-
}
|
172
|
-
|
173
|
-
|
174
|
-
@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
|
175
|
-
@include responsive-invisibility('.hidden-lg.hidden-sm');
|
176
|
-
}
|
177
|
-
|
178
|
-
|
179
|
-
@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
|
180
|
-
@include responsive-invisibility('.hidden-lg.hidden-md');
|
181
|
-
}
|
182
|
-
|
183
63
|
@media (min-width: $screen-lg-min) {
|
184
64
|
@include responsive-invisibility('.hidden-lg');
|
185
65
|
}
|
186
66
|
|
67
|
+
|
187
68
|
// Print utilities
|
69
|
+
//
|
70
|
+
// Media queries are placed on the inside to be mixin-friendly.
|
188
71
|
|
189
72
|
@include responsive-invisibility('.visible-print');
|
190
73
|
|
191
74
|
@media print {
|
192
|
-
|
193
75
|
@include responsive-visibility('.visible-print');
|
76
|
+
}
|
194
77
|
|
195
|
-
|
78
|
+
@media print {
|
196
79
|
@include responsive-invisibility('.hidden-print');
|
197
|
-
|
198
80
|
}
|
@@ -4,8 +4,13 @@
|
|
4
4
|
|
5
5
|
|
6
6
|
// Reset the box-sizing
|
7
|
-
|
8
|
-
|
7
|
+
//
|
8
|
+
// Heads up! This reset may cause conflicts with some third-party widgets.
|
9
|
+
// For recommendations on resolving such conflicts, see
|
10
|
+
// http://getbootstrap.com/getting-started/#third-box-sizing
|
11
|
+
* {
|
12
|
+
@include box-sizing(border-box);
|
13
|
+
}
|
9
14
|
*:before,
|
10
15
|
*:after {
|
11
16
|
@include box-sizing(border-box);
|
@@ -56,6 +61,16 @@ a {
|
|
56
61
|
}
|
57
62
|
|
58
63
|
|
64
|
+
// Figures
|
65
|
+
//
|
66
|
+
// We reset this here because previously Normalize had no `figure` margins. This
|
67
|
+
// ensures we don't break anyone's use of the element.
|
68
|
+
|
69
|
+
figure {
|
70
|
+
margin: 0;
|
71
|
+
}
|
72
|
+
|
73
|
+
|
59
74
|
// Images
|
60
75
|
|
61
76
|
img {
|
@@ -141,6 +141,7 @@ table {
|
|
141
141
|
td,
|
142
142
|
th {
|
143
143
|
&[class*="col-"] {
|
144
|
+
position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
|
144
145
|
float: none;
|
145
146
|
display: table-cell;
|
146
147
|
}
|
@@ -156,8 +157,9 @@ table {
|
|
156
157
|
// Generate the contextual variants
|
157
158
|
@include table-row-variant('active', $table-bg-active);
|
158
159
|
@include table-row-variant('success', $state-success-bg);
|
159
|
-
@include table-row-variant('
|
160
|
+
@include table-row-variant('info', $state-info-bg);
|
160
161
|
@include table-row-variant('warning', $state-warning-bg);
|
162
|
+
@include table-row-variant('danger', $state-danger-bg);
|
161
163
|
|
162
164
|
|
163
165
|
// Responsive tables
|