bootstrap-sass 3.0.2.1 → 3.0.3.0

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.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (53) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile +9 -1
  4. data/README.md +49 -3
  5. data/Rakefile +1 -3
  6. data/lib/bootstrap-sass.rb +54 -43
  7. data/lib/bootstrap-sass/sass_functions.rb +45 -10
  8. data/lib/bootstrap-sass/version.rb +2 -2
  9. data/tasks/converter/less_conversion.rb +18 -12
  10. data/templates/project/manifest.rb +11 -2
  11. data/test/dummy/app/views/pages/root.html.slim +19 -3
  12. data/test/dummy_sass_only/Gemfile +4 -0
  13. data/test/dummy_sass_only/compile.rb +13 -0
  14. data/test/dummy_sass_only/import_all.sass +2 -0
  15. data/test/gemfiles/sass_3_2.gemfile +9 -1
  16. data/test/gemfiles/sass_head.gemfile +11 -2
  17. data/test/sass_test.rb +23 -0
  18. data/test/test_helper.rb +0 -1
  19. data/vendor/assets/javascripts/bootstrap/affix.js +1 -1
  20. data/vendor/assets/javascripts/bootstrap/alert.js +1 -1
  21. data/vendor/assets/javascripts/bootstrap/button.js +11 -5
  22. data/vendor/assets/javascripts/bootstrap/carousel.js +5 -5
  23. data/vendor/assets/javascripts/bootstrap/collapse.js +1 -1
  24. data/vendor/assets/javascripts/bootstrap/dropdown.js +5 -5
  25. data/vendor/assets/javascripts/bootstrap/modal.js +1 -1
  26. data/vendor/assets/javascripts/bootstrap/popover.js +1 -1
  27. data/vendor/assets/javascripts/bootstrap/scrollspy.js +2 -2
  28. data/vendor/assets/javascripts/bootstrap/tab.js +1 -1
  29. data/vendor/assets/javascripts/bootstrap/tooltip.js +1 -1
  30. data/vendor/assets/javascripts/bootstrap/transition.js +1 -1
  31. data/vendor/assets/stylesheets/bootstrap/_badges.scss +6 -6
  32. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +7 -33
  33. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +2 -5
  34. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +1 -0
  35. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +3 -8
  36. data/vendor/assets/stylesheets/bootstrap/_forms.scss +11 -0
  37. data/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +5 -5
  38. data/vendor/assets/stylesheets/bootstrap/_grid.scss +12 -26
  39. data/vendor/assets/stylesheets/bootstrap/_input-groups.scss +1 -1
  40. data/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +8 -2
  41. data/vendor/assets/stylesheets/bootstrap/_labels.scss +6 -0
  42. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +38 -51
  43. data/vendor/assets/stylesheets/bootstrap/_modals.scss +2 -5
  44. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +41 -53
  45. data/vendor/assets/stylesheets/bootstrap/_navs.scss +0 -20
  46. data/vendor/assets/stylesheets/bootstrap/_panels.scss +11 -1
  47. data/vendor/assets/stylesheets/bootstrap/_progress-bars.scss +0 -12
  48. data/vendor/assets/stylesheets/bootstrap/_tables.scss +5 -18
  49. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +9 -3
  50. data/vendor/assets/stylesheets/bootstrap/_type.scss +54 -52
  51. data/vendor/assets/stylesheets/bootstrap/_variables.scss +17 -10
  52. metadata +10 -3
  53. data/lib/bootstrap-sass/compass_functions.rb +0 -24
@@ -48,11 +48,6 @@
48
48
  &:focus {
49
49
  background-color: $nav-link-hover-bg;
50
50
  border-color: $link-color;
51
-
52
- .caret {
53
- border-top-color: $link-hover-color;
54
- border-bottom-color: $link-hover-color;
55
- }
56
51
  }
57
52
  }
58
53
 
@@ -138,11 +133,6 @@
138
133
  &:focus {
139
134
  color: $nav-pills-active-link-hover-color;
140
135
  background-color: $nav-pills-active-link-hover-bg;
141
-
142
- .caret {
143
- border-top-color: $nav-pills-active-link-hover-color;
144
- border-bottom-color: $nav-pills-active-link-hover-color;
145
- }
146
136
  }
147
137
  }
148
138
  }
@@ -243,16 +233,6 @@
243
233
  // Dropdowns
244
234
  // -------------------------
245
235
 
246
- // Make dropdown carets use link color in navs
247
- .nav .caret {
248
- border-top-color: $link-color;
249
- border-bottom-color: $link-color;
250
- }
251
- .nav a:hover .caret {
252
- border-top-color: $link-hover-color;
253
- border-bottom-color: $link-hover-color;
254
- }
255
-
256
236
  // Specific dropdowns
257
237
  .nav-tabs .dropdown-menu {
258
238
  // make dropdown border overlap tab border
@@ -57,13 +57,17 @@
57
57
 
58
58
  .panel {
59
59
  > .table,
60
- > .table-responsive {
60
+ > .table-responsive > .table {
61
61
  margin-bottom: 0;
62
62
  }
63
63
  > .panel-body + .table,
64
64
  > .panel-body + .table-responsive {
65
65
  border-top: 1px solid $table-border-color;
66
66
  }
67
+ > .table > tbody:first-child th,
68
+ > .table > tbody:first-child td {
69
+ border-top: 0;
70
+ }
67
71
  > .table-bordered,
68
72
  > .table-responsive > .table-bordered {
69
73
  border: 0;
@@ -87,6 +91,10 @@
87
91
  }
88
92
  }
89
93
  }
94
+ > .table-responsive {
95
+ border: 0;
96
+ margin-bottom: 0;
97
+ }
90
98
  }
91
99
 
92
100
 
@@ -106,6 +114,8 @@
106
114
  margin-top: 0;
107
115
  margin-bottom: 0;
108
116
  font-size: ceil(($font-size-base * 1.125));
117
+ color: inherit;
118
+
109
119
  > a {
110
120
  color: inherit;
111
121
  }
@@ -12,18 +12,6 @@
12
12
  to { background-position: 0 0; }
13
13
  }
14
14
 
15
- // Firefox
16
- @-moz-keyframes progress-bar-stripes {
17
- from { background-position: 40px 0; }
18
- to { background-position: 0 0; }
19
- }
20
-
21
- // Opera
22
- @-o-keyframes progress-bar-stripes {
23
- from { background-position: 0 0; }
24
- to { background-position: 40px 0; }
25
- }
26
-
27
15
  // Spec and IE10+
28
16
  @keyframes progress-bar-stripes {
29
17
  from { background-position: 40px 0; }
@@ -133,6 +133,7 @@ th {
133
133
  // Reset default table behavior
134
134
 
135
135
  table col[class*="col-"] {
136
+ position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
136
137
  float: none;
137
138
  display: table-column;
138
139
  }
@@ -152,25 +153,11 @@ table {
152
153
  // Exact selectors below required to override `.table-striped` and prevent
153
154
  // inheritance to nested tables.
154
155
 
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
- }
167
- }
168
- }
169
-
170
156
  // Generate the contextual variants
171
- @include table-row-variant('success', $state-success-bg, $state-success-border);
172
- @include table-row-variant('danger', $state-danger-bg, $state-danger-border);
173
- @include table-row-variant('warning', $state-warning-bg, $state-warning-border);
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);
174
161
 
175
162
 
176
163
  // Responsive tables
@@ -5,11 +5,17 @@
5
5
 
6
6
  // Mixin and adjust the regular image class
7
7
  .thumbnail {
8
- @extend .img-thumbnail;
9
- display: block; // Override the inline-block from `.img-thumbnail`
8
+ display: block;
9
+ padding: $thumbnail-padding;
10
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);
11
16
 
12
- > img {
17
+ > img,
18
+ a > img {
13
19
  @include img-responsive();
14
20
  margin-left: auto;
15
21
  margin-right: auto;
@@ -3,12 +3,62 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
+ // Headings
7
+ // -------------------------
8
+
9
+ h1, h2, h3, h4, h5, h6,
10
+ .h1, .h2, .h3, .h4, .h5, .h6 {
11
+ font-family: $headings-font-family;
12
+ font-weight: $headings-font-weight;
13
+ line-height: $headings-line-height;
14
+ color: $headings-color;
15
+
16
+ small,
17
+ .small {
18
+ font-weight: normal;
19
+ line-height: 1;
20
+ color: $headings-small-color;
21
+ }
22
+ }
23
+
24
+ h1,
25
+ h2,
26
+ h3 {
27
+ margin-top: $line-height-computed;
28
+ margin-bottom: ($line-height-computed / 2);
29
+
30
+ small,
31
+ .small {
32
+ font-size: 65%;
33
+ }
34
+ }
35
+ h4,
36
+ h5,
37
+ h6 {
38
+ margin-top: ($line-height-computed / 2);
39
+ margin-bottom: ($line-height-computed / 2);
40
+
41
+ small,
42
+ .small {
43
+ font-size: 75%;
44
+ }
45
+ }
46
+
47
+ h1, .h1 { font-size: $font-size-h1; }
48
+ h2, .h2 { font-size: $font-size-h2; }
49
+ h3, .h3 { font-size: $font-size-h3; }
50
+ h4, .h4 { font-size: $font-size-h4; }
51
+ h5, .h5 { font-size: $font-size-h5; }
52
+ h6, .h6 { font-size: $font-size-h6; }
53
+
54
+
6
55
  // Body text
7
56
  // -------------------------
8
57
 
9
58
  p {
10
59
  margin: 0 0 ($line-height-computed / 2);
11
60
  }
61
+
12
62
  .lead {
13
63
  margin-bottom: $line-height-computed;
14
64
  font-size: floor($font-size-base * 1.15);
@@ -72,55 +122,6 @@ cite { font-style: normal; }
72
122
  .text-center { text-align: center; }
73
123
 
74
124
 
75
- // Headings
76
- // -------------------------
77
-
78
- h1, h2, h3, h4, h5, h6,
79
- .h1, .h2, .h3, .h4, .h5, .h6 {
80
- font-family: $headings-font-family;
81
- font-weight: $headings-font-weight;
82
- line-height: $headings-line-height;
83
- color: $headings-color;
84
-
85
- small,
86
- .small {
87
- font-weight: normal;
88
- line-height: 1;
89
- color: $headings-small-color;
90
- }
91
- }
92
-
93
- h1,
94
- h2,
95
- h3 {
96
- margin-top: $line-height-computed;
97
- margin-bottom: ($line-height-computed / 2);
98
-
99
- small,
100
- .small {
101
- font-size: 65%;
102
- }
103
- }
104
- h4,
105
- h5,
106
- h6 {
107
- margin-top: ($line-height-computed / 2);
108
- margin-bottom: ($line-height-computed / 2);
109
-
110
- small,
111
- .small {
112
- font-size: 75%;
113
- }
114
- }
115
-
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; }
122
-
123
-
124
125
  // Page header
125
126
  // -------------------------
126
127
 
@@ -131,7 +132,6 @@ h6, .h6 { font-size: $font-size-h6; }
131
132
  }
132
133
 
133
134
 
134
-
135
135
  // Lists
136
136
  // --------------------------------------------------
137
137
 
@@ -171,6 +171,7 @@ ol {
171
171
 
172
172
  // Description Lists
173
173
  dl {
174
+ margin-top: 0; // Remove browser default
174
175
  margin-bottom: $line-height-computed;
175
176
  }
176
177
  dt,
@@ -215,7 +216,7 @@ abbr[data-original-title] {
215
216
  cursor: help;
216
217
  border-bottom: 1px dotted $abbr-border-color;
217
218
  }
218
- abbr.initialism {
219
+ .initialism {
219
220
  font-size: 90%;
220
221
  text-transform: uppercase;
221
222
  }
@@ -233,7 +234,8 @@ blockquote {
233
234
  p:last-child {
234
235
  margin-bottom: 0;
235
236
  }
236
- small {
237
+ small,
238
+ .small {
237
239
  display: block;
238
240
  line-height: $line-height-base;
239
241
  color: $blockquote-small-color;
@@ -1,3 +1,5 @@
1
+ // bootstrap specific variable. set to false if not using ruby + asset pipeline / compass.
2
+ $bootstrap-sass-asset-helper: true !default;
1
3
  //
2
4
  // Variables
3
5
  // --------------------------------------------------
@@ -41,7 +43,7 @@ $link-hover-color: darken($link-color, 15%) !default;
41
43
 
42
44
  $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
43
45
  $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
44
- $font-family-monospace: Monaco, Menlo, Consolas, "Courier New", monospace !default;
46
+ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
45
47
  $font-family-base: $font-family-sans-serif !default;
46
48
 
47
49
  $font-size-base: 14px !default;
@@ -84,6 +86,9 @@ $padding-large-horizontal: 16px !default;
84
86
  $padding-small-vertical: 5px !default;
85
87
  $padding-small-horizontal: 10px !default;
86
88
 
89
+ $padding-xs-vertical: 1px !default;
90
+ $padding-xs-horizontal: 5px !default;
91
+
87
92
  $line-height-large: 1.33 !default;
88
93
  $line-height-small: 1.5 !default;
89
94
 
@@ -157,7 +162,7 @@ $input-border-focus: #66afe9 !default;
157
162
  $input-color-placeholder: $gray-light !default;
158
163
 
159
164
  $input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
160
- $input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
165
+ $input-height-large: (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
161
166
  $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
162
167
 
163
168
  $legend-color: $gray-dark !default;
@@ -186,8 +191,6 @@ $dropdown-link-disabled-color: $gray-light !default;
186
191
 
187
192
  $dropdown-header-color: $gray-light !default;
188
193
 
189
- $dropdown-caret-color: #000 !default;
190
-
191
194
 
192
195
  // COMPONENT VARIABLES
193
196
  // --------------------------------------------------
@@ -246,8 +249,13 @@ $screen-md-max: ($screen-lg-min - 1) !default;
246
249
  $grid-columns: 12 !default;
247
250
  // Padding, to be divided by two and applied to the left and right of all columns
248
251
  $grid-gutter-width: 30px !default;
249
- // Point at which the navbar stops collapsing
252
+
253
+ // Navbar collapse
254
+
255
+ // Point at which the navbar becomes uncollapsed
250
256
  $grid-float-breakpoint: $screen-sm-min !default;
257
+ // Point at which the navbar begins collapsing
258
+ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
251
259
 
252
260
 
253
261
  // Navbar
@@ -321,7 +329,6 @@ $nav-disabled-link-color: $gray-light !default;
321
329
  $nav-disabled-link-hover-color: $gray-light !default;
322
330
 
323
331
  $nav-open-link-hover-color: #fff !default;
324
- $nav-open-caret-border-color: #fff !default;
325
332
 
326
333
  // Tabs
327
334
  $nav-tabs-border-color: #ddd !default;
@@ -375,19 +382,19 @@ $jumbotron-font-size: ceil($font-size-base * 1.5) !default;
375
382
  // Form states and alerts
376
383
  // -------------------------
377
384
 
378
- $state-success-text: #468847 !default;
385
+ $state-success-text: #3c763d !default;
379
386
  $state-success-bg: #dff0d8 !default;
380
387
  $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%) !default;
381
388
 
382
- $state-info-text: #3a87ad !default;
389
+ $state-info-text: #31708f !default;
383
390
  $state-info-bg: #d9edf7 !default;
384
391
  $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%) !default;
385
392
 
386
- $state-warning-text: #c09853 !default;
393
+ $state-warning-text: #8a6d3b !default;
387
394
  $state-warning-bg: #fcf8e3 !default;
388
395
  $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%) !default;
389
396
 
390
- $state-danger-text: #b94a48 !default;
397
+ $state-danger-text: #a94442 !default;
391
398
  $state-danger-bg: #f2dede !default;
392
399
  $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) !default;
393
400
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.2.1
4
+ version: 3.0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-10 00:00:00.000000000 Z
11
+ date: 2013-12-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: compass
@@ -152,7 +152,6 @@ files:
152
152
  - Rakefile
153
153
  - bootstrap-sass.gemspec
154
154
  - lib/bootstrap-sass.rb
155
- - lib/bootstrap-sass/compass_functions.rb
156
155
  - lib/bootstrap-sass/engine.rb
157
156
  - lib/bootstrap-sass/sass_functions.rb
158
157
  - lib/bootstrap-sass/version.rb
@@ -206,9 +205,13 @@ files:
206
205
  - test/dummy/public/422.html
207
206
  - test/dummy/public/500.html
208
207
  - test/dummy/public/favicon.ico
208
+ - test/dummy_sass_only/Gemfile
209
+ - test/dummy_sass_only/compile.rb
210
+ - test/dummy_sass_only/import_all.sass
209
211
  - test/gemfiles/sass_3_2.gemfile
210
212
  - test/gemfiles/sass_head.gemfile
211
213
  - test/pages_test.rb
214
+ - test/sass_test.rb
212
215
  - test/support/integration_test.rb
213
216
  - test/test_helper.rb
214
217
  - vendor/assets/fonts/bootstrap/glyphicons-halflings-regular.eot
@@ -334,8 +337,12 @@ test_files:
334
337
  - test/dummy/public/422.html
335
338
  - test/dummy/public/500.html
336
339
  - test/dummy/public/favicon.ico
340
+ - test/dummy_sass_only/Gemfile
341
+ - test/dummy_sass_only/compile.rb
342
+ - test/dummy_sass_only/import_all.sass
337
343
  - test/gemfiles/sass_3_2.gemfile
338
344
  - test/gemfiles/sass_head.gemfile
339
345
  - test/pages_test.rb
346
+ - test/sass_test.rb
340
347
  - test/support/integration_test.rb
341
348
  - test/test_helper.rb
@@ -1,24 +0,0 @@
1
- # This contains functions for use with a project *only* using Compass.
2
- module Sass::Script::Functions
3
- def image_path(source, options = {})
4
- if defined?(::Sprockets)
5
- ::Sass::Script::String.new sprockets_context.image_path(source.value).to_s, :string
6
- elsif defined?(::Compass)
7
- image_url(source, Sass::Script::Bool.new(true))
8
- else
9
- # Revert to the old compass-agnostic path determination
10
- asset_sans_quotes = source.value.gsub('"', '')
11
- Sass::Script::String.new("/images/#{asset_sans_quotes}", :string)
12
- end
13
- end
14
-
15
- protected
16
- def sprockets_context # :nodoc:
17
- if options.key?(:sprockets)
18
- options[:sprockets][:context]
19
- else
20
- # Compatibility with sprockets pre 2.10.0
21
- options[:importer].context
22
- end
23
- end
24
- end