bootstrap-sass-backport 3.2.0.2 → 3.3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.gitignore +1 -1
- data/.travis.yml +8 -2
- data/CHANGELOG.md +14 -0
- data/README.md +35 -22
- data/Rakefile +3 -4
- data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
- data/assets/javascripts/bootstrap.js +1232 -1019
- data/assets/javascripts/bootstrap/affix.js +43 -23
- data/assets/javascripts/bootstrap/alert.js +6 -4
- data/assets/javascripts/bootstrap/button.js +16 -10
- data/assets/javascripts/bootstrap/carousel.js +27 -10
- data/assets/javascripts/bootstrap/collapse.js +69 -28
- data/assets/javascripts/bootstrap/dropdown.js +20 -10
- data/assets/javascripts/bootstrap/modal.js +67 -23
- data/assets/javascripts/bootstrap/popover.js +13 -7
- data/assets/javascripts/bootstrap/scrollspy.js +12 -7
- data/assets/javascripts/bootstrap/tab.js +41 -16
- data/assets/javascripts/bootstrap/tooltip.js +60 -39
- data/assets/javascripts/bootstrap/transition.js +1 -1
- data/assets/stylesheets/bootstrap/_badges.scss +7 -1
- data/assets/stylesheets/bootstrap/_button-groups.scss +18 -15
- data/assets/stylesheets/bootstrap/_buttons.scss +8 -5
- data/assets/stylesheets/bootstrap/_carousel.scss +25 -1
- data/assets/stylesheets/bootstrap/_code.scss +1 -0
- data/assets/stylesheets/bootstrap/_component-animations.scss +5 -2
- data/assets/stylesheets/bootstrap/_dropdowns.scss +4 -6
- data/assets/stylesheets/bootstrap/_forms.scss +55 -43
- data/assets/stylesheets/bootstrap/_glyphicons.scss +2 -5
- data/assets/stylesheets/bootstrap/_grid.scss +4 -4
- data/assets/stylesheets/bootstrap/_jumbotron.scss +6 -5
- data/assets/stylesheets/bootstrap/_list-group.scss +1 -8
- data/assets/stylesheets/bootstrap/_media.scss +27 -36
- data/assets/stylesheets/bootstrap/_modals.scss +4 -6
- data/assets/stylesheets/bootstrap/_navbar.scss +36 -33
- data/assets/stylesheets/bootstrap/_navs.scss +5 -3
- data/assets/stylesheets/bootstrap/_normalize.scss +5 -3
- data/assets/stylesheets/bootstrap/_pager.scss +2 -3
- data/assets/stylesheets/bootstrap/_pagination.scss +1 -1
- data/assets/stylesheets/bootstrap/_panels.scss +22 -4
- data/assets/stylesheets/bootstrap/_popovers.scss +6 -4
- data/assets/stylesheets/bootstrap/_print.scss +102 -96
- data/assets/stylesheets/bootstrap/_progress-bars.scss +2 -20
- data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -1
- data/assets/stylesheets/bootstrap/_responsive-utilities.scss +4 -1
- data/assets/stylesheets/bootstrap/_scaffolding.scss +3 -3
- data/assets/stylesheets/bootstrap/_tables.scss +11 -10
- data/assets/stylesheets/bootstrap/_theme.scss +27 -13
- data/assets/stylesheets/bootstrap/_thumbnails.scss +2 -2
- data/assets/stylesheets/bootstrap/_tooltip.scss +12 -4
- data/assets/stylesheets/bootstrap/_type.scss +10 -16
- data/assets/stylesheets/bootstrap/_utilities.scss +3 -4
- data/assets/stylesheets/bootstrap/_variables.scss +31 -21
- data/assets/stylesheets/bootstrap/mixins/_buttons.scss +2 -0
- data/assets/stylesheets/bootstrap/mixins/_forms.scss +5 -1
- data/assets/stylesheets/bootstrap/mixins/_grid.scss +2 -2
- data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_image.scss +0 -1
- data/assets/stylesheets/bootstrap/mixins/_labels.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_progress-bar.scss +1 -1
- data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +6 -3
- data/bower.json +1 -1
- data/composer.json +1 -1
- data/lib/bootstrap-sass-backport.rb +2 -1
- data/lib/bootstrap-sass/engine.rb +1 -1
- data/lib/bootstrap-sass/version.rb +2 -2
- data/package.json +4 -4
- data/tasks/converter/js_conversion.rb +2 -3
- data/tasks/converter/less_conversion.rb +64 -30
- data/tasks/converter/network.rb +12 -6
- data/templates/project/_bootstrap-variables.sass +866 -0
- data/templates/project/manifest.rb +5 -11
- data/test/node_sass_compile_test.sh +8 -0
- metadata +6 -27
- data/templates/project/_bootstrap-variables.sass.erb +0 -4
- data/test/dummy_rails/bin/bundle +0 -3
- data/test/dummy_rails/bin/rails +0 -4
- data/test/dummy_rails/bin/rake +0 -4
- data/test/dummy_rails/db/test.sqlite3 +0 -0
- data/test/dummy_rails/lib/assets/.keep +0 -0
- data/test/dummy_rails/public/404.html +0 -58
- data/test/dummy_rails/public/422.html +0 -58
- data/test/dummy_rails/public/500.html +0 -57
- data/test/dummy_rails/public/favicon.ico +0 -0
- data/test/node_sass_test.rb +0 -16
- data/test/support/integration_test.rb +0 -22
@@ -8,7 +8,7 @@
|
|
8
8
|
margin: $line-height-computed 0;
|
9
9
|
list-style: none;
|
10
10
|
text-align: center;
|
11
|
-
@include clearfix
|
11
|
+
@include clearfix;
|
12
12
|
li {
|
13
13
|
display: inline;
|
14
14
|
> a,
|
@@ -48,8 +48,7 @@
|
|
48
48
|
> span {
|
49
49
|
color: $pager-disabled-color;
|
50
50
|
background-color: $pager-bg;
|
51
|
-
cursor:
|
51
|
+
cursor: $cursor-disabled;
|
52
52
|
}
|
53
53
|
}
|
54
|
-
|
55
54
|
}
|
@@ -15,7 +15,7 @@
|
|
15
15
|
// Panel contents
|
16
16
|
.panel-body {
|
17
17
|
padding: $panel-body-padding;
|
18
|
-
@include clearfix
|
18
|
+
@include clearfix;
|
19
19
|
}
|
20
20
|
|
21
21
|
// Optional heading
|
@@ -56,7 +56,8 @@
|
|
56
56
|
// any kind of custom content between the two.
|
57
57
|
|
58
58
|
.panel {
|
59
|
-
> .list-group
|
59
|
+
> .list-group,
|
60
|
+
> .panel-collapse > .list-group {
|
60
61
|
margin-bottom: 0;
|
61
62
|
|
62
63
|
.list-group-item {
|
@@ -100,6 +101,11 @@
|
|
100
101
|
> .table-responsive > .table,
|
101
102
|
> .panel-collapse > .table {
|
102
103
|
margin-bottom: 0;
|
104
|
+
|
105
|
+
caption {
|
106
|
+
padding-left: $panel-body-padding;
|
107
|
+
padding-right: $panel-body-padding;
|
108
|
+
}
|
103
109
|
}
|
104
110
|
// Add border top radius for first one
|
105
111
|
> .table:first-child,
|
@@ -109,6 +115,9 @@
|
|
109
115
|
> thead:first-child,
|
110
116
|
> tbody:first-child {
|
111
117
|
> tr:first-child {
|
118
|
+
border-top-left-radius: ($panel-border-radius - 1);
|
119
|
+
border-top-right-radius: ($panel-border-radius - 1);
|
120
|
+
|
112
121
|
td:first-child,
|
113
122
|
th:first-child {
|
114
123
|
border-top-left-radius: ($panel-border-radius - 1);
|
@@ -128,6 +137,9 @@
|
|
128
137
|
> tbody:last-child,
|
129
138
|
> tfoot:last-child {
|
130
139
|
> tr:last-child {
|
140
|
+
border-bottom-left-radius: ($panel-border-radius - 1);
|
141
|
+
border-bottom-right-radius: ($panel-border-radius - 1);
|
142
|
+
|
131
143
|
td:first-child,
|
132
144
|
th:first-child {
|
133
145
|
border-bottom-left-radius: ($panel-border-radius - 1);
|
@@ -140,7 +152,9 @@
|
|
140
152
|
}
|
141
153
|
}
|
142
154
|
> .panel-body + .table,
|
143
|
-
> .panel-body + .table-responsive
|
155
|
+
> .panel-body + .table-responsive,
|
156
|
+
> .table + .panel-body,
|
157
|
+
> .table-responsive + .panel-body {
|
144
158
|
border-top: 1px solid $table-border-color;
|
145
159
|
}
|
146
160
|
> .table > tbody:first-child > tr:first-child th,
|
@@ -202,6 +216,7 @@
|
|
202
216
|
.panel {
|
203
217
|
margin-bottom: 0;
|
204
218
|
border-radius: $panel-border-radius;
|
219
|
+
|
205
220
|
+ .panel {
|
206
221
|
margin-top: 5px;
|
207
222
|
}
|
@@ -209,10 +224,13 @@
|
|
209
224
|
|
210
225
|
.panel-heading {
|
211
226
|
border-bottom: 0;
|
212
|
-
|
227
|
+
|
228
|
+
+ .panel-collapse > .panel-body,
|
229
|
+
+ .panel-collapse > .list-group {
|
213
230
|
border-top: 1px solid $panel-inner-border;
|
214
231
|
}
|
215
232
|
}
|
233
|
+
|
216
234
|
.panel-footer {
|
217
235
|
border-top: 0;
|
218
236
|
+ .panel-collapse .panel-body {
|
@@ -11,7 +11,12 @@
|
|
11
11
|
display: none;
|
12
12
|
max-width: $popover-max-width;
|
13
13
|
padding: 1px;
|
14
|
-
|
14
|
+
// Reset font and text propertes given new insertion method
|
15
|
+
font-family: $font-family-base;
|
16
|
+
font-size: $font-size-base;
|
17
|
+
font-weight: normal;
|
18
|
+
line-height: $line-height-base;
|
19
|
+
text-align: left;
|
15
20
|
background-color: $popover-bg;
|
16
21
|
background-clip: padding-box;
|
17
22
|
border: 1px solid $popover-fallback-border-color;
|
@@ -33,8 +38,6 @@
|
|
33
38
|
margin: 0; // reset heading margin
|
34
39
|
padding: 8px 14px;
|
35
40
|
font-size: $font-size-base;
|
36
|
-
font-weight: normal;
|
37
|
-
line-height: 18px;
|
38
41
|
background-color: $popover-title-bg;
|
39
42
|
border-bottom: 1px solid darken($popover-title-bg, 5%);
|
40
43
|
border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
|
@@ -129,5 +132,4 @@
|
|
129
132
|
bottom: -$popover-arrow-width;
|
130
133
|
}
|
131
134
|
}
|
132
|
-
|
133
135
|
}
|
@@ -1,101 +1,107 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
//
|
4
|
-
//
|
1
|
+
/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
|
2
|
+
|
3
|
+
// ==========================================================================
|
4
|
+
// Print styles.
|
5
|
+
// Inlined to avoid the additional HTTP request: h5bp.com/r
|
6
|
+
// ==========================================================================
|
5
7
|
|
6
8
|
@media print {
|
9
|
+
*,
|
10
|
+
*:before,
|
11
|
+
*:after {
|
12
|
+
background: transparent !important;
|
13
|
+
color: #000 !important; // Black prints faster: h5bp.com/s
|
14
|
+
box-shadow: none !important;
|
15
|
+
text-shadow: none !important;
|
16
|
+
}
|
17
|
+
|
18
|
+
a,
|
19
|
+
a:visited {
|
20
|
+
text-decoration: underline;
|
21
|
+
}
|
22
|
+
|
23
|
+
a[href]:after {
|
24
|
+
content: " (" attr(href) ")";
|
25
|
+
}
|
26
|
+
|
27
|
+
abbr[title]:after {
|
28
|
+
content: " (" attr(title) ")";
|
29
|
+
}
|
30
|
+
|
31
|
+
// Don't show links that are fragment identifiers,
|
32
|
+
// or use the `javascript:` pseudo protocol
|
33
|
+
a[href^="#"]:after,
|
34
|
+
a[href^="javascript:"]:after {
|
35
|
+
content: "";
|
36
|
+
}
|
37
|
+
|
38
|
+
pre,
|
39
|
+
blockquote {
|
40
|
+
border: 1px solid #999;
|
41
|
+
page-break-inside: avoid;
|
42
|
+
}
|
43
|
+
|
44
|
+
thead {
|
45
|
+
display: table-header-group; // h5bp.com/t
|
46
|
+
}
|
47
|
+
|
48
|
+
tr,
|
49
|
+
img {
|
50
|
+
page-break-inside: avoid;
|
51
|
+
}
|
7
52
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
h2,
|
61
|
-
h3 {
|
62
|
-
page-break-after: avoid;
|
63
|
-
}
|
64
|
-
|
65
|
-
// Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
|
66
|
-
// Once fixed, we can just straight up remove this.
|
67
|
-
select {
|
68
|
-
background: #fff !important;
|
69
|
-
}
|
70
|
-
|
71
|
-
// Bootstrap components
|
72
|
-
.navbar {
|
73
|
-
display: none;
|
74
|
-
}
|
75
|
-
.table {
|
76
|
-
td,
|
77
|
-
th {
|
78
|
-
background-color: #fff !important;
|
79
|
-
}
|
80
|
-
}
|
81
|
-
.btn,
|
82
|
-
.dropup > .btn {
|
83
|
-
> .caret {
|
84
|
-
border-top-color: #000 !important;
|
85
|
-
}
|
86
|
-
}
|
87
|
-
.label {
|
88
|
-
border: 1px solid #000;
|
89
|
-
}
|
90
|
-
|
91
|
-
.table {
|
92
|
-
border-collapse: collapse !important;
|
93
|
-
}
|
94
|
-
.table-bordered {
|
95
|
-
th,
|
96
|
-
td {
|
97
|
-
border: 1px solid #ddd !important;
|
98
|
-
}
|
99
|
-
}
|
53
|
+
img {
|
54
|
+
max-width: 100% !important;
|
55
|
+
}
|
56
|
+
|
57
|
+
p,
|
58
|
+
h2,
|
59
|
+
h3 {
|
60
|
+
orphans: 3;
|
61
|
+
widows: 3;
|
62
|
+
}
|
63
|
+
|
64
|
+
h2,
|
65
|
+
h3 {
|
66
|
+
page-break-after: avoid;
|
67
|
+
}
|
68
|
+
|
69
|
+
// Bootstrap specific changes start
|
70
|
+
//
|
71
|
+
// Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
|
72
|
+
// Once fixed, we can just straight up remove this.
|
73
|
+
select {
|
74
|
+
background: #fff !important;
|
75
|
+
}
|
76
|
+
|
77
|
+
// Bootstrap components
|
78
|
+
.navbar {
|
79
|
+
display: none;
|
80
|
+
}
|
81
|
+
.btn,
|
82
|
+
.dropup > .btn {
|
83
|
+
> .caret {
|
84
|
+
border-top-color: #000 !important;
|
85
|
+
}
|
86
|
+
}
|
87
|
+
.label {
|
88
|
+
border: 1px solid #000;
|
89
|
+
}
|
90
|
+
|
91
|
+
.table {
|
92
|
+
border-collapse: collapse !important;
|
93
|
+
|
94
|
+
td,
|
95
|
+
th {
|
96
|
+
background-color: #fff !important;
|
97
|
+
}
|
98
|
+
}
|
99
|
+
.table-bordered {
|
100
|
+
th,
|
101
|
+
td {
|
102
|
+
border: 1px solid #ddd !important;
|
103
|
+
}
|
104
|
+
}
|
100
105
|
|
106
|
+
// Bootstrap specific changes end
|
101
107
|
}
|
@@ -19,7 +19,6 @@
|
|
19
19
|
}
|
20
20
|
|
21
21
|
|
22
|
-
|
23
22
|
// Bar itself
|
24
23
|
// -------------------------
|
25
24
|
|
@@ -29,7 +28,7 @@
|
|
29
28
|
height: $line-height-computed;
|
30
29
|
margin-bottom: $line-height-computed;
|
31
30
|
background-color: $progress-bg;
|
32
|
-
border-radius: $border-radius
|
31
|
+
border-radius: $progress-border-radius;
|
33
32
|
@include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
|
34
33
|
}
|
35
34
|
|
@@ -54,7 +53,7 @@
|
|
54
53
|
// `.progress-bar`.
|
55
54
|
.progress-striped .progress-bar,
|
56
55
|
.progress-bar-striped {
|
57
|
-
@include gradient-striped
|
56
|
+
@include gradient-striped;
|
58
57
|
background-size: 40px 40px;
|
59
58
|
}
|
60
59
|
|
@@ -67,23 +66,6 @@
|
|
67
66
|
@include animation(progress-bar-stripes 2s linear infinite);
|
68
67
|
}
|
69
68
|
|
70
|
-
// Account for lower percentages
|
71
|
-
.progress-bar {
|
72
|
-
&[aria-valuenow="1"],
|
73
|
-
&[aria-valuenow="2"] {
|
74
|
-
min-width: 30px;
|
75
|
-
}
|
76
|
-
|
77
|
-
&[aria-valuenow="0"] {
|
78
|
-
color: $gray-light;
|
79
|
-
min-width: 30px;
|
80
|
-
background-color: transparent;
|
81
|
-
background-image: none;
|
82
|
-
box-shadow: none;
|
83
|
-
}
|
84
|
-
}
|
85
|
-
|
86
|
-
|
87
69
|
|
88
70
|
// Variations
|
89
71
|
// -------------------------
|
@@ -26,7 +26,10 @@
|
|
26
26
|
// Visibility utilities
|
27
27
|
// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
|
28
28
|
|
29
|
-
@include responsive-invisibility('.visible-xs
|
29
|
+
@include responsive-invisibility('.visible-xs');
|
30
|
+
@include responsive-invisibility('.visible-sm');
|
31
|
+
@include responsive-invisibility('.visible-md');
|
32
|
+
@include responsive-invisibility('.visible-lg');
|
30
33
|
|
31
34
|
.visible-xs-block,
|
32
35
|
.visible-xs-inline,
|
@@ -52,11 +52,11 @@ a {
|
|
52
52
|
&:hover,
|
53
53
|
&:focus {
|
54
54
|
color: $link-hover-color;
|
55
|
-
text-decoration:
|
55
|
+
text-decoration: $link-hover-decoration;
|
56
56
|
}
|
57
57
|
|
58
58
|
&:focus {
|
59
|
-
@include tab-focus
|
59
|
+
@include tab-focus;
|
60
60
|
}
|
61
61
|
}
|
62
62
|
|
@@ -79,7 +79,7 @@ img {
|
|
79
79
|
|
80
80
|
// Responsive images (ensure images don't scale beyond their parents)
|
81
81
|
.img-responsive {
|
82
|
-
@include img-responsive
|
82
|
+
@include img-responsive;
|
83
83
|
}
|
84
84
|
|
85
85
|
// Rounded corners
|
@@ -6,6 +6,12 @@
|
|
6
6
|
table {
|
7
7
|
background-color: $table-bg;
|
8
8
|
}
|
9
|
+
caption {
|
10
|
+
padding-top: $table-cell-padding;
|
11
|
+
padding-bottom: $table-cell-padding;
|
12
|
+
color: $text-muted;
|
13
|
+
text-align: left;
|
14
|
+
}
|
9
15
|
th {
|
10
16
|
text-align: left;
|
11
17
|
}
|
@@ -106,10 +112,7 @@ th {
|
|
106
112
|
|
107
113
|
.table-striped {
|
108
114
|
> tbody > tr:nth-child(odd) {
|
109
|
-
|
110
|
-
> th {
|
111
|
-
background-color: $table-bg-accent;
|
112
|
-
}
|
115
|
+
background-color: $table-bg-accent;
|
113
116
|
}
|
114
117
|
}
|
115
118
|
|
@@ -120,10 +123,7 @@ th {
|
|
120
123
|
|
121
124
|
.table-hover {
|
122
125
|
> tbody > tr:hover {
|
123
|
-
|
124
|
-
> th {
|
125
|
-
background-color: $table-bg-hover;
|
126
|
-
}
|
126
|
+
background-color: $table-bg-hover;
|
127
127
|
}
|
128
128
|
}
|
129
129
|
|
@@ -169,14 +169,15 @@ table {
|
|
169
169
|
// will display normally.
|
170
170
|
|
171
171
|
.table-responsive {
|
172
|
+
overflow-x: auto;
|
173
|
+
min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
|
174
|
+
|
172
175
|
@media screen and (max-width: $screen-xs-max) {
|
173
176
|
width: 100%;
|
174
177
|
margin-bottom: ($line-height-computed * 0.75);
|
175
178
|
overflow-y: hidden;
|
176
|
-
overflow-x: auto;
|
177
179
|
-ms-overflow-style: -ms-autohiding-scrollbar;
|
178
180
|
border: 1px solid $table-border-color;
|
179
|
-
-webkit-overflow-scrolling: touch;
|
180
181
|
|
181
182
|
// Tighten up spacing
|
182
183
|
> .table {
|