bootstrap-sass 3.2.0.4 → 3.3.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.

Files changed (81) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +2 -1
  3. data/.travis.yml +8 -2
  4. data/CHANGELOG.md +7 -0
  5. data/CONTRIBUTING.md +1 -1
  6. data/README.md +29 -6
  7. data/Rakefile +3 -4
  8. data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +1 -1
  9. data/assets/javascripts/bootstrap.js +329 -176
  10. data/assets/javascripts/bootstrap/affix.js +43 -23
  11. data/assets/javascripts/bootstrap/alert.js +6 -4
  12. data/assets/javascripts/bootstrap/button.js +16 -10
  13. data/assets/javascripts/bootstrap/carousel.js +26 -10
  14. data/assets/javascripts/bootstrap/collapse.js +69 -28
  15. data/assets/javascripts/bootstrap/dropdown.js +20 -10
  16. data/assets/javascripts/bootstrap/modal.js +22 -21
  17. data/assets/javascripts/bootstrap/popover.js +13 -7
  18. data/assets/javascripts/bootstrap/scrollspy.js +12 -7
  19. data/assets/javascripts/bootstrap/tab.js +41 -16
  20. data/assets/javascripts/bootstrap/tooltip.js +60 -39
  21. data/assets/javascripts/bootstrap/transition.js +1 -1
  22. data/assets/stylesheets/bootstrap/_button-groups.scss +18 -11
  23. data/assets/stylesheets/bootstrap/_buttons.scss +8 -5
  24. data/assets/stylesheets/bootstrap/_carousel.scss +25 -1
  25. data/assets/stylesheets/bootstrap/_code.scss +1 -0
  26. data/assets/stylesheets/bootstrap/_component-animations.scss +5 -2
  27. data/assets/stylesheets/bootstrap/_dropdowns.scss +4 -6
  28. data/assets/stylesheets/bootstrap/_forms.scss +51 -28
  29. data/assets/stylesheets/bootstrap/_glyphicons.scss +2 -5
  30. data/assets/stylesheets/bootstrap/_grid.scss +4 -4
  31. data/assets/stylesheets/bootstrap/_jumbotron.scss +4 -4
  32. data/assets/stylesheets/bootstrap/_list-group.scss +1 -0
  33. data/assets/stylesheets/bootstrap/_media.scss +27 -36
  34. data/assets/stylesheets/bootstrap/_modals.scss +3 -4
  35. data/assets/stylesheets/bootstrap/_navbar.scss +35 -33
  36. data/assets/stylesheets/bootstrap/_navs.scss +5 -3
  37. data/assets/stylesheets/bootstrap/_normalize.scss +5 -3
  38. data/assets/stylesheets/bootstrap/_pager.scss +2 -3
  39. data/assets/stylesheets/bootstrap/_pagination.scss +1 -1
  40. data/assets/stylesheets/bootstrap/_panels.scss +22 -4
  41. data/assets/stylesheets/bootstrap/_popovers.scss +5 -4
  42. data/assets/stylesheets/bootstrap/_print.scss +102 -96
  43. data/assets/stylesheets/bootstrap/_progress-bars.scss +2 -20
  44. data/assets/stylesheets/bootstrap/_responsive-embed.scss +2 -1
  45. data/assets/stylesheets/bootstrap/_scaffolding.scss +3 -3
  46. data/assets/stylesheets/bootstrap/_tables.scss +11 -10
  47. data/assets/stylesheets/bootstrap/_theme.scss +16 -14
  48. data/assets/stylesheets/bootstrap/_thumbnails.scss +2 -2
  49. data/assets/stylesheets/bootstrap/_type.scss +10 -16
  50. data/assets/stylesheets/bootstrap/_utilities.scss +3 -4
  51. data/assets/stylesheets/bootstrap/_variables.scss +29 -19
  52. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +2 -0
  53. data/assets/stylesheets/bootstrap/mixins/_forms.scss +5 -1
  54. data/assets/stylesheets/bootstrap/mixins/_grid.scss +2 -2
  55. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +1 -1
  56. data/assets/stylesheets/bootstrap/mixins/_image.scss +0 -1
  57. data/assets/stylesheets/bootstrap/mixins/_labels.scss +1 -1
  58. data/assets/stylesheets/bootstrap/mixins/_progress-bar.scss +1 -1
  59. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +6 -3
  60. data/lib/bootstrap-sass.rb +2 -5
  61. data/lib/bootstrap-sass/engine.rb +1 -1
  62. data/lib/bootstrap-sass/version.rb +2 -2
  63. data/package.json +3 -3
  64. data/tasks/converter/less_conversion.rb +60 -28
  65. data/tasks/converter/network.rb +12 -6
  66. data/templates/project/_bootstrap-variables.sass +866 -0
  67. data/templates/project/manifest.rb +5 -11
  68. data/test/node_sass_compile_test.sh +8 -0
  69. metadata +7 -28
  70. data/templates/project/_bootstrap-variables.sass.erb +0 -4
  71. data/test/dummy_rails/bin/bundle +0 -3
  72. data/test/dummy_rails/bin/rails +0 -4
  73. data/test/dummy_rails/bin/rake +0 -4
  74. data/test/dummy_rails/db/test.sqlite3 +0 -0
  75. data/test/dummy_rails/lib/assets/.keep +0 -0
  76. data/test/dummy_rails/public/404.html +0 -58
  77. data/test/dummy_rails/public/422.html +0 -58
  78. data/test/dummy_rails/public/500.html +0 -57
  79. data/test/dummy_rails/public/favicon.ico +0 -0
  80. data/test/node_sass_test.rb +0 -16
  81. data/test/support/integration_test.rb +0 -22
@@ -11,7 +11,11 @@
11
11
  display: none;
12
12
  max-width: $popover-max-width;
13
13
  padding: 1px;
14
- text-align: left; // Reset given new insertion method
14
+ // Reset font and text propertes given new insertion method
15
+ font-size: $font-size-base;
16
+ font-weight: normal;
17
+ line-height: $line-height-base;
18
+ text-align: left;
15
19
  background-color: $popover-bg;
16
20
  background-clip: padding-box;
17
21
  border: 1px solid $popover-fallback-border-color;
@@ -33,8 +37,6 @@
33
37
  margin: 0; // reset heading margin
34
38
  padding: 8px 14px;
35
39
  font-size: $font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
40
  background-color: $popover-title-bg;
39
41
  border-bottom: 1px solid darken($popover-title-bg, 5%);
40
42
  border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
@@ -129,5 +131,4 @@
129
131
  bottom: -$popover-arrow-width;
130
132
  }
131
133
  }
132
-
133
134
  }
@@ -1,101 +1,107 @@
1
- //
2
- // Basic print styles
3
- // --------------------------------------------------
4
- // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
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
- text-shadow: none !important;
10
- color: #000 !important; // Black prints faster: h5bp.com/s
11
- background: transparent !important;
12
- box-shadow: none !important;
13
- }
14
-
15
- a,
16
- a:visited {
17
- text-decoration: underline;
18
- }
19
-
20
- a[href]:after {
21
- content: " (" attr(href) ")";
22
- }
23
-
24
- abbr[title]:after {
25
- content: " (" attr(title) ")";
26
- }
27
-
28
- // Don't show links for images, or javascript/internal links
29
- a[href^="javascript:"]:after,
30
- a[href^="#"]:after {
31
- content: "";
32
- }
33
-
34
- pre,
35
- blockquote {
36
- border: 1px solid #999;
37
- page-break-inside: avoid;
38
- }
39
-
40
- thead {
41
- display: table-header-group; // h5bp.com/t
42
- }
43
-
44
- tr,
45
- img {
46
- page-break-inside: avoid;
47
- }
48
-
49
- img {
50
- max-width: 100% !important;
51
- }
52
-
53
- p,
54
- h2,
55
- h3 {
56
- orphans: 3;
57
- widows: 3;
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-base;
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
  // -------------------------
@@ -12,7 +12,8 @@
12
12
  .embed-responsive-item,
13
13
  iframe,
14
14
  embed,
15
- object {
15
+ object,
16
+ video {
16
17
  position: absolute;
17
18
  top: 0;
18
19
  left: 0;
@@ -52,11 +52,11 @@ a {
52
52
  &:hover,
53
53
  &:focus {
54
54
  color: $link-hover-color;
55
- text-decoration: underline;
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
- > td,
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
- > td,
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 {
@@ -7,7 +7,6 @@
7
7
  @import "mixins";
8
8
 
9
9
 
10
-
11
10
  //
12
11
  // Buttons
13
12
  // --------------------------------------------------
@@ -28,12 +27,16 @@
28
27
  &.active {
29
28
  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
30
29
  }
30
+
31
+ .badge {
32
+ text-shadow: none;
33
+ }
31
34
  }
32
35
 
33
36
  // Mixin for generating new styles
34
37
  @mixin btn-styles($btn-color: #555) {
35
38
  @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
39
+ @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners
37
40
  background-repeat: repeat-x;
38
41
  border-color: darken($btn-color, 14%);
39
42
 
@@ -74,7 +77,6 @@
74
77
  .btn-danger { @include btn-styles($btn-danger-bg); }
75
78
 
76
79
 
77
-
78
80
  //
79
81
  // Images
80
82
  // --------------------------------------------------
@@ -85,7 +87,6 @@
85
87
  }
86
88
 
87
89
 
88
-
89
90
  //
90
91
  // Dropdowns
91
92
  // --------------------------------------------------
@@ -103,7 +104,6 @@
103
104
  }
104
105
 
105
106
 
106
-
107
107
  //
108
108
  // Navbar
109
109
  // --------------------------------------------------
@@ -111,13 +111,14 @@
111
111
  // Default navbar
112
112
  .navbar-default {
113
113
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
114
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
114
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
115
115
  border-radius: $navbar-border-radius;
116
116
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
117
117
  @include box-shadow($shadow);
118
118
 
119
+ .navbar-nav > .open > a,
119
120
  .navbar-nav > .active > a {
120
- @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
121
+ @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
121
122
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
122
123
  }
123
124
  }
@@ -129,10 +130,11 @@
129
130
  // Inverted navbar
130
131
  .navbar-inverse {
131
132
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
132
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
134
 
135
+ .navbar-nav > .open > a,
134
136
  .navbar-nav > .active > a {
135
- @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
137
+ @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
136
138
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
137
139
  }
138
140
 
@@ -150,7 +152,6 @@
150
152
  }
151
153
 
152
154
 
153
-
154
155
  //
155
156
  // Alerts
156
157
  // --------------------------------------------------
@@ -175,7 +176,6 @@
175
176
  .alert-danger { @include alert-styles($alert-danger-bg); }
176
177
 
177
178
 
178
-
179
179
  //
180
180
  // Progress bars
181
181
  // --------------------------------------------------
@@ -200,7 +200,7 @@
200
200
  // Reset the striped class because our mixins don't do multiple gradients and
201
201
  // the above custom styles override the new `.progress-bar-striped` in v3.2.0.
202
202
  .progress-bar-striped {
203
- @include gradient-striped();
203
+ @include gradient-striped;
204
204
  }
205
205
 
206
206
 
@@ -218,8 +218,11 @@
218
218
  text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
219
219
  @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
220
220
  border-color: darken($list-group-active-border, 7.5%);
221
- }
222
221
 
222
+ .badge {
223
+ text-shadow: none;
224
+ }
225
+ }
223
226
 
224
227
 
225
228
  //
@@ -245,7 +248,6 @@
245
248
  .panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); }
246
249
 
247
250
 
248
-
249
251
  //
250
252
  // Wells
251
253
  // --------------------------------------------------