bootstrap-sass 3.3.0.1 → 3.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (139) hide show
  1. checksums.yaml +5 -5
  2. data/.gitignore +1 -0
  3. data/.travis.yml +8 -14
  4. data/CHANGELOG.md +64 -0
  5. data/CONTRIBUTING.md +8 -1
  6. data/Gemfile +1 -4
  7. data/LICENSE +2 -1
  8. data/README.md +135 -114
  9. data/Rakefile +58 -12
  10. data/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  11. data/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +273 -214
  12. data/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  13. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  14. data/assets/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  15. data/assets/javascripts/bootstrap/affix.js +11 -9
  16. data/assets/javascripts/bootstrap/alert.js +6 -5
  17. data/assets/javascripts/bootstrap/button.js +25 -16
  18. data/assets/javascripts/bootstrap/carousel.js +25 -18
  19. data/assets/javascripts/bootstrap/collapse.js +13 -12
  20. data/assets/javascripts/bootstrap/dropdown.js +51 -47
  21. data/assets/javascripts/bootstrap/modal.js +112 -35
  22. data/assets/javascripts/bootstrap/popover.js +31 -27
  23. data/assets/javascripts/bootstrap/scrollspy.js +19 -22
  24. data/assets/javascripts/bootstrap/tab.js +14 -12
  25. data/assets/javascripts/bootstrap/tooltip.js +255 -56
  26. data/assets/javascripts/bootstrap/transition.js +5 -5
  27. data/assets/javascripts/bootstrap-sprockets.js +2 -2
  28. data/assets/javascripts/bootstrap.js +1282 -962
  29. data/assets/javascripts/bootstrap.min.js +6 -0
  30. data/assets/stylesheets/_bootstrap-compass.scss +2 -0
  31. data/assets/stylesheets/_bootstrap-mincer.scss +4 -2
  32. data/assets/stylesheets/_bootstrap-sprockets.scss +2 -0
  33. data/assets/stylesheets/_bootstrap.scss +6 -0
  34. data/assets/stylesheets/bootstrap/_alerts.scss +8 -3
  35. data/assets/stylesheets/bootstrap/_badges.scss +16 -5
  36. data/assets/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
  37. data/assets/stylesheets/bootstrap/_button-groups.scss +11 -14
  38. data/assets/stylesheets/bootstrap/_buttons.scss +18 -10
  39. data/assets/stylesheets/bootstrap/_carousel.scss +40 -36
  40. data/assets/stylesheets/bootstrap/_close.scss +2 -0
  41. data/assets/stylesheets/bootstrap/_code.scss +3 -3
  42. data/assets/stylesheets/bootstrap/_component-animations.scss +2 -2
  43. data/assets/stylesheets/bootstrap/_dropdowns.scss +24 -24
  44. data/assets/stylesheets/bootstrap/_forms.scss +149 -103
  45. data/assets/stylesheets/bootstrap/_glyphicons.scss +85 -12
  46. data/assets/stylesheets/bootstrap/_grid.scss +10 -0
  47. data/assets/stylesheets/bootstrap/_input-groups.scss +10 -5
  48. data/assets/stylesheets/bootstrap/_jumbotron.scss +11 -5
  49. data/assets/stylesheets/bootstrap/_labels.scss +1 -1
  50. data/assets/stylesheets/bootstrap/_list-group.scss +30 -34
  51. data/assets/stylesheets/bootstrap/_media.scss +19 -0
  52. data/assets/stylesheets/bootstrap/_mixins.scss +1 -0
  53. data/assets/stylesheets/bootstrap/_modals.scss +9 -8
  54. data/assets/stylesheets/bootstrap/_navbar.scss +77 -82
  55. data/assets/stylesheets/bootstrap/_navs.scss +4 -6
  56. data/assets/stylesheets/bootstrap/_normalize.scss +13 -13
  57. data/assets/stylesheets/bootstrap/_pager.scss +2 -2
  58. data/assets/stylesheets/bootstrap/_pagination.scss +15 -17
  59. data/assets/stylesheets/bootstrap/_panels.scss +16 -6
  60. data/assets/stylesheets/bootstrap/_popovers.scss +50 -58
  61. data/assets/stylesheets/bootstrap/_print.scss +90 -98
  62. data/assets/stylesheets/bootstrap/_progress-bars.scss +3 -3
  63. data/assets/stylesheets/bootstrap/_responsive-embed.scss +10 -10
  64. data/assets/stylesheets/bootstrap/_responsive-utilities.scss +11 -6
  65. data/assets/stylesheets/bootstrap/_scaffolding.scss +18 -7
  66. data/assets/stylesheets/bootstrap/_tables.scss +24 -24
  67. data/assets/stylesheets/bootstrap/_theme.scss +57 -22
  68. data/assets/stylesheets/bootstrap/_thumbnails.scss +1 -1
  69. data/assets/stylesheets/bootstrap/_tooltip.scss +49 -32
  70. data/assets/stylesheets/bootstrap/_type.scss +12 -12
  71. data/assets/stylesheets/bootstrap/_utilities.scss +0 -1
  72. data/assets/stylesheets/bootstrap/_variables.scss +27 -17
  73. data/assets/stylesheets/bootstrap/_wells.scss +2 -2
  74. data/assets/stylesheets/bootstrap/mixins/_alerts.scss +2 -1
  75. data/assets/stylesheets/bootstrap/mixins/_background-variant.scss +2 -1
  76. data/assets/stylesheets/bootstrap/mixins/_border-radius.scss +4 -4
  77. data/assets/stylesheets/bootstrap/mixins/_buttons.scss +20 -11
  78. data/assets/stylesheets/bootstrap/mixins/_center-block.scss +1 -1
  79. data/assets/stylesheets/bootstrap/mixins/_clearfix.scss +1 -1
  80. data/assets/stylesheets/bootstrap/mixins/_forms.scss +4 -4
  81. data/assets/stylesheets/bootstrap/mixins/_gradients.scss +6 -8
  82. data/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +2 -2
  83. data/assets/stylesheets/bootstrap/mixins/_grid.scss +8 -8
  84. data/assets/stylesheets/bootstrap/mixins/_hide-text.scss +3 -3
  85. data/assets/stylesheets/bootstrap/mixins/_image.scss +5 -10
  86. data/assets/stylesheets/bootstrap/mixins/_list-group.scss +3 -2
  87. data/assets/stylesheets/bootstrap/mixins/_opacity.scss +2 -3
  88. data/assets/stylesheets/bootstrap/mixins/_pagination.scss +2 -1
  89. data/assets/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  90. data/assets/stylesheets/bootstrap/mixins/_resize.scss +1 -1
  91. data/assets/stylesheets/bootstrap/mixins/_responsive-visibility.scss +1 -5
  92. data/assets/stylesheets/bootstrap/mixins/_tab-focus.scss +3 -3
  93. data/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss +2 -1
  94. data/assets/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +4 -4
  95. data/bootstrap-sass.gemspec +10 -9
  96. data/bower.json +6 -20
  97. data/composer.json +2 -2
  98. data/eyeglass-exports.js +7 -0
  99. data/lib/bootstrap-sass/engine.rb +6 -1
  100. data/lib/bootstrap-sass/version.rb +2 -2
  101. data/lib/bootstrap-sass.rb +32 -13
  102. data/package-lock.json +1611 -0
  103. data/package.json +21 -7
  104. data/sache.json +1 -1
  105. data/tasks/bower.rake +2 -5
  106. data/tasks/converter/fonts_conversion.rb +1 -1
  107. data/tasks/converter/js_conversion.rb +7 -5
  108. data/tasks/converter/less_conversion.rb +48 -37
  109. data/tasks/converter/network.rb +12 -7
  110. data/tasks/converter.rb +1 -1
  111. data/templates/project/_bootstrap-variables.sass +27 -18
  112. data/templates/project/styles.sass +3 -0
  113. data/test/compilation_test.rb +24 -12
  114. data/test/dummy_rails/app/assets/stylesheets/{application.css.sass → application.sass} +0 -0
  115. data/test/dummy_rails/app/views/pages/root.html.slim +43 -0
  116. data/test/dummy_rails/config/application.rb +2 -1
  117. data/test/dummy_rails/config/boot.rb +1 -1
  118. data/test/dummy_rails/config/environments/development.rb +0 -3
  119. data/test/dummy_rails/config/environments/production.rb +7 -1
  120. data/test/dummy_rails/config/environments/test.rb +9 -1
  121. data/test/dummy_sass_only/Gemfile +1 -1
  122. data/test/dummy_sass_only/compile.rb +14 -7
  123. data/test/dummy_sass_only/import_all.scss +2 -0
  124. data/test/gemfiles/default.gemfile +3 -0
  125. data/test/node_mincer_test.rb +2 -3
  126. data/test/node_sass_compile_test.sh +4 -3
  127. data/test/sass_test.rb +10 -7
  128. data/test/sprockets_rails_test.rb +12 -8
  129. data/test/support/dummy_rails_integration.rb +1 -1
  130. data/test/support/reporting.rb +10 -0
  131. data/test/test_helper.rb +3 -2
  132. metadata +56 -46
  133. data/test/compass_test.rb +0 -9
  134. data/test/dummy_rails/log/development.log +0 -0
  135. data/test/dummy_sass_only/import_all.sass +0 -2
  136. data/test/gemfiles/sass_3_2.gemfile +0 -6
  137. data/test/gemfiles/sass_3_3.gemfile +0 -6
  138. data/test/gemfiles/sass_3_4.gemfile +0 -7
  139. data/test/gemfiles/sass_head.gemfile +0 -6
@@ -8,32 +8,41 @@
8
8
  background-color: $background;
9
9
  border-color: $border;
10
10
 
11
- &:hover,
12
11
  &:focus,
13
- &.focus,
14
- &:active,
15
- &.active,
16
- .open > &.dropdown-toggle {
12
+ &.focus {
13
+ color: $color;
14
+ background-color: darken($background, 10%);
15
+ border-color: darken($border, 25%);
16
+ }
17
+ &:hover {
17
18
  color: $color;
18
19
  background-color: darken($background, 10%);
19
- border-color: darken($border, 12%);
20
+ border-color: darken($border, 12%);
20
21
  }
21
22
  &:active,
22
23
  &.active,
23
24
  .open > &.dropdown-toggle {
25
+ color: $color;
26
+ background-color: darken($background, 10%);
24
27
  background-image: none;
28
+ border-color: darken($border, 12%);
29
+
30
+ &:hover,
31
+ &:focus,
32
+ &.focus {
33
+ color: $color;
34
+ background-color: darken($background, 17%);
35
+ border-color: darken($border, 25%);
36
+ }
25
37
  }
26
38
  &.disabled,
27
39
  &[disabled],
28
40
  fieldset[disabled] & {
29
- &,
30
41
  &:hover,
31
42
  &:focus,
32
- &.focus,
33
- &:active,
34
- &.active {
43
+ &.focus {
35
44
  background-color: $background;
36
- border-color: $border;
45
+ border-color: $border;
37
46
  }
38
47
  }
39
48
 
@@ -2,6 +2,6 @@
2
2
 
3
3
  @mixin center-block() {
4
4
  display: block;
5
- margin-left: auto;
6
5
  margin-right: auto;
6
+ margin-left: auto;
7
7
  }
@@ -13,8 +13,8 @@
13
13
  @mixin clearfix() {
14
14
  &:before,
15
15
  &:after {
16
- content: " "; // 1
17
16
  display: table; // 2
17
+ content: " "; // 1
18
18
  }
19
19
  &:after {
20
20
  clear: both;
@@ -20,18 +20,18 @@
20
20
  // Set the border and box shadow on specific inputs to match
21
21
  .form-control {
22
22
  border-color: $border-color;
23
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
23
+ @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075)); // Redeclare so transitions work
24
24
  &:focus {
25
25
  border-color: darken($border-color, 10%);
26
- $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%);
26
+ $shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px lighten($border-color, 20%);
27
27
  @include box-shadow($shadow);
28
28
  }
29
29
  }
30
30
  // Set validation states also for addons
31
31
  .input-group-addon {
32
32
  color: $text-color;
33
- border-color: $border-color;
34
33
  background-color: $background-color;
34
+ border-color: $border-color;
35
35
  }
36
36
  // Optional feedback icon
37
37
  .form-control-feedback {
@@ -57,7 +57,7 @@
57
57
  &:focus {
58
58
  border-color: $color;
59
59
  outline: 0;
60
- @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba);
60
+ @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px $color-rgba);
61
61
  }
62
62
  }
63
63
 
@@ -1,5 +1,3 @@
1
- // Gradients
2
-
3
1
 
4
2
 
5
3
  // Horizontal gradient, from left to right
@@ -10,8 +8,8 @@
10
8
  background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
11
9
  background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12
12
10
  background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
13
- background-repeat: repeat-x;
14
11
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
12
+ background-repeat: repeat-x;
15
13
  }
16
14
 
17
15
  // Vertical gradient, from top to bottom
@@ -22,36 +20,36 @@
22
20
  background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
23
21
  background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Opera 12
24
22
  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
25
- background-repeat: repeat-x;
26
23
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
24
+ background-repeat: repeat-x;
27
25
  }
28
26
 
29
27
  @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
30
- background-repeat: repeat-x;
31
28
  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
32
29
  background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12
33
30
  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
31
+ background-repeat: repeat-x;
34
32
  }
35
33
  @mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
36
34
  background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
37
35
  background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
38
36
  background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
39
- background-repeat: no-repeat;
40
37
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
38
+ background-repeat: no-repeat;
41
39
  }
42
40
  @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
43
41
  background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
44
42
  background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color);
45
43
  background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
46
- background-repeat: no-repeat;
47
44
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
45
+ background-repeat: no-repeat;
48
46
  }
49
47
  @mixin gradient-radial($inner-color: #555, $outer-color: #333) {
50
48
  background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
51
49
  background-image: radial-gradient(circle, $inner-color, $outer-color);
52
50
  background-repeat: no-repeat;
53
51
  }
54
- @mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
52
+ @mixin gradient-striped($color: rgba(255, 255, 255, .15), $angle: 45deg) {
55
53
  background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
56
54
  background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
57
55
  background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
@@ -13,8 +13,8 @@
13
13
  // Prevent columns from collapsing when empty
14
14
  min-height: 1px;
15
15
  // Inner gutter via padding
16
- padding-left: ($grid-gutter-width / 2);
17
- padding-right: ($grid-gutter-width / 2);
16
+ padding-right: floor(($grid-gutter-width / 2));
17
+ padding-left: ceil(($grid-gutter-width / 2));
18
18
  }
19
19
  }
20
20
 
@@ -4,17 +4,17 @@
4
4
 
5
5
  // Centered container element
6
6
  @mixin container-fixed($gutter: $grid-gutter-width) {
7
+ padding-right: ceil(($gutter / 2));
8
+ padding-left: floor(($gutter / 2));
7
9
  margin-right: auto;
8
10
  margin-left: auto;
9
- padding-left: ($gutter / 2);
10
- padding-right: ($gutter / 2);
11
11
  @include clearfix;
12
12
  }
13
13
 
14
14
  // Creates a wrapper for a series of columns
15
15
  @mixin make-row($gutter: $grid-gutter-width) {
16
- margin-left: ($gutter / -2);
17
- margin-right: ($gutter / -2);
16
+ margin-right: floor(($gutter / -2));
17
+ margin-left: ceil(($gutter / -2));
18
18
  @include clearfix;
19
19
  }
20
20
 
@@ -24,8 +24,8 @@
24
24
  float: left;
25
25
  width: percentage(($columns / $grid-columns));
26
26
  min-height: 1px;
27
- padding-left: ($gutter / 2);
28
27
  padding-right: ($gutter / 2);
28
+ padding-left: ($gutter / 2);
29
29
  }
30
30
  @mixin make-xs-column-offset($columns) {
31
31
  margin-left: percentage(($columns / $grid-columns));
@@ -41,8 +41,8 @@
41
41
  @mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
42
42
  position: relative;
43
43
  min-height: 1px;
44
- padding-left: ($gutter / 2);
45
44
  padding-right: ($gutter / 2);
45
+ padding-left: ($gutter / 2);
46
46
 
47
47
  @media (min-width: $screen-sm-min) {
48
48
  float: left;
@@ -69,8 +69,8 @@
69
69
  @mixin make-md-column($columns, $gutter: $grid-gutter-width) {
70
70
  position: relative;
71
71
  min-height: 1px;
72
- padding-left: ($gutter / 2);
73
72
  padding-right: ($gutter / 2);
73
+ padding-left: ($gutter / 2);
74
74
 
75
75
  @media (min-width: $screen-md-min) {
76
76
  float: left;
@@ -97,8 +97,8 @@
97
97
  @mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
98
98
  position: relative;
99
99
  min-height: 1px;
100
- padding-left: ($gutter / 2);
101
100
  padding-right: ($gutter / 2);
101
+ padding-left: ($gutter / 2);
102
102
 
103
103
  @media (min-width: $screen-lg-min) {
104
104
  float: left;
@@ -1,14 +1,14 @@
1
1
  // CSS image replacement
2
2
  //
3
- // Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
3
+ // Heads up! v3 launched with only `.hide-text()`, but per our pattern for
4
4
  // mixins being reused as classes with the same name, this doesn't hold up. As
5
5
  // of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
6
6
  //
7
7
  // Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
8
8
 
9
- // Deprecated as of v3.0.1 (will be removed in v4)
9
+ // Deprecated as of v3.0.1 (has been removed in v4)
10
10
  @mixin hide-text() {
11
- font: #{0/0} a;
11
+ font: 0/0 a;
12
12
  color: transparent;
13
13
  text-shadow: none;
14
14
  background-color: transparent;
@@ -1,8 +1,3 @@
1
- // Image Mixins
2
- // - Responsive image
3
- // - Retina image
4
-
5
-
6
1
  // Responsive image
7
2
  //
8
3
  // Keep images from scaling beyond the width of their parents.
@@ -22,11 +17,11 @@
22
17
 
23
18
  @media
24
19
  only screen and (-webkit-min-device-pixel-ratio: 2),
25
- only screen and ( min--moz-device-pixel-ratio: 2),
26
- only screen and ( -o-min-device-pixel-ratio: 2/1),
27
- only screen and ( min-device-pixel-ratio: 2),
28
- only screen and ( min-resolution: 192dpi),
29
- only screen and ( min-resolution: 2dppx) {
20
+ only screen and ( min--moz-device-pixel-ratio: 2),
21
+ only screen and ( -o-min-device-pixel-ratio: 2/1),
22
+ only screen and ( min-device-pixel-ratio: 2),
23
+ only screen and ( min-resolution: 192dpi),
24
+ only screen and ( min-resolution: 2dppx) {
30
25
  background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}"));
31
26
  background-size: $width-1x $height-1x;
32
27
  }
@@ -5,10 +5,11 @@
5
5
  color: $color;
6
6
  background-color: $background;
7
7
 
8
- // [converter] extracted a& to a.list-group-item-#{$state}
8
+ // [converter] extracted a&, button& to a.list-group-item-#{$state}, button.list-group-item-#{$state}
9
9
  }
10
10
 
11
- a.list-group-item-#{$state} {
11
+ a.list-group-item-#{$state},
12
+ button.list-group-item-#{$state} {
12
13
  color: $color;
13
14
 
14
15
  .list-group-item-heading {
@@ -1,8 +1,7 @@
1
1
  // Opacity
2
2
 
3
3
  @mixin opacity($opacity) {
4
+ $opacity-ie: ($opacity * 100); // IE8 filter
5
+ filter: alpha(opacity=$opacity-ie);
4
6
  opacity: $opacity;
5
- // IE8 filter
6
- $opacity-ie: ($opacity * 100);
7
- filter: #{alpha(opacity=$opacity-ie)};
8
7
  }
@@ -1,11 +1,12 @@
1
1
  // Pagination
2
2
 
3
- @mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
3
+ @mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
4
4
  > li {
5
5
  > a,
6
6
  > span {
7
7
  padding: $padding-vertical $padding-horizontal;
8
8
  font-size: $font-size;
9
+ line-height: $line-height;
9
10
  }
10
11
  &:first-child {
11
12
  > a,
@@ -0,0 +1,18 @@
1
+ @mixin reset-text() {
2
+ font-family: $font-family-base;
3
+ // We deliberately do NOT reset font-size.
4
+ font-style: normal;
5
+ font-weight: 400;
6
+ line-height: $line-height-base;
7
+ line-break: auto;
8
+ text-align: left; // Fallback for where `start` is not supported
9
+ text-align: start;
10
+ text-decoration: none;
11
+ text-shadow: none;
12
+ text-transform: none;
13
+ letter-spacing: normal;
14
+ word-break: normal;
15
+ word-spacing: normal;
16
+ word-wrap: normal;
17
+ white-space: normal;
18
+ }
@@ -1,6 +1,6 @@
1
1
  // Resize anything
2
2
 
3
3
  @mixin resizable($direction) {
4
- resize: $direction; // Options: horizontal, vertical, both
5
4
  overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
5
+ resize: $direction; // Options: horizontal, vertical, both
6
6
  }
@@ -1,13 +1,9 @@
1
- // Responsive utilities
2
-
3
- //
4
- // More easily include all the states for responsive-utilities.less.
5
1
  // [converter] $parent hack
6
2
  @mixin responsive-visibility($parent) {
7
3
  #{$parent} {
8
4
  display: block !important;
9
5
  }
10
- table#{$parent} { display: table; }
6
+ table#{$parent} { display: table !important; }
11
7
  tr#{$parent} { display: table-row !important; }
12
8
  th#{$parent},
13
9
  td#{$parent} { display: table-cell !important; }
@@ -1,9 +1,9 @@
1
1
  // WebKit-style focus
2
2
 
3
3
  @mixin tab-focus() {
4
- // Default
5
- outline: thin dotted;
6
- // WebKit
4
+ // WebKit-specific. Other browsers will keep their default outline style.
5
+ // (Initially tried to also force default via `outline: initial`,
6
+ // but that seems to erroneously remove the outline in Firefox altogether.)
7
7
  outline: 5px auto -webkit-focus-ring-color;
8
8
  outline-offset: -2px;
9
9
  }
@@ -5,7 +5,8 @@
5
5
  #{$parent} {
6
6
  color: $color;
7
7
  }
8
- a#{$parent}:hover {
8
+ a#{$parent}:hover,
9
+ a#{$parent}:focus {
9
10
  color: darken($color, 10%);
10
11
  }
11
12
  }
@@ -1,7 +1,7 @@
1
1
  // Vendor Prefixes
2
2
  //
3
3
  // All vendor mixins are deprecated as of v3.2.0 due to the introduction of
4
- // Autoprefixer in our Gruntfile. They will be removed in v4.
4
+ // Autoprefixer in our Gruntfile. They have been removed in v4.
5
5
 
6
6
  // - Animations
7
7
  // - Backface visibility
@@ -54,7 +54,7 @@
54
54
  // Prevent browsers from flickering when using CSS 3D transforms.
55
55
  // Default value is `visible`, but can be changed to `hidden`
56
56
 
57
- @mixin backface-visibility($visibility){
57
+ @mixin backface-visibility($visibility) {
58
58
  -webkit-backface-visibility: $visibility;
59
59
  -moz-backface-visibility: $visibility;
60
60
  backface-visibility: $visibility;
@@ -89,12 +89,12 @@
89
89
 
90
90
  // Optional hyphenation
91
91
  @mixin hyphens($mode: auto) {
92
- word-wrap: break-word;
93
92
  -webkit-hyphens: $mode;
94
93
  -moz-hyphens: $mode;
95
94
  -ms-hyphens: $mode; // IE10+
96
95
  -o-hyphens: $mode;
97
96
  hyphens: $mode;
97
+ word-wrap: break-word;
98
98
  }
99
99
 
100
100
  // Placeholder text
@@ -102,7 +102,7 @@
102
102
  // Firefox
103
103
  &::-moz-placeholder {
104
104
  color: $color;
105
- opacity: 1; // See https://github.com/twbs/bootstrap/pull/11526
105
+ opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526
106
106
  }
107
107
  &:-ms-input-placeholder { color: $color; } // Internet Explorer 10+
108
108
  &::-webkit-input-placeholder { color: $color; } // Safari and Chrome
@@ -3,28 +3,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
3
3
  require 'bootstrap-sass/version'
4
4
 
5
5
  Gem::Specification.new do |s|
6
- s.name = "bootstrap-sass"
6
+ s.name = 'bootstrap-sass'
7
7
  s.version = Bootstrap::VERSION
8
- s.authors = ["Thomas McDonald"]
8
+ s.authors = ['Thomas McDonald']
9
9
  s.email = 'tom@conceptcoding.co.uk'
10
- s.summary = "Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass"
11
- s.homepage = "https://github.com/twbs/bootstrap-sass"
10
+ s.summary = 'bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.'
11
+ s.homepage = 'https://github.com/twbs/bootstrap-sass'
12
12
  s.license = 'MIT'
13
13
 
14
- s.add_runtime_dependency 'sass', '~> 3.2'
14
+ s.add_runtime_dependency 'sassc', '>= 2.0.0'
15
+ s.add_runtime_dependency 'autoprefixer-rails', '>= 5.2.1'
15
16
 
16
17
  # Testing dependencies
17
- s.add_development_dependency 'minitest', '~> 5.4.0'
18
- s.add_development_dependency 'minitest-reporters', '~> 1.0.5'
18
+ s.add_development_dependency 'minitest', '~> 5.11'
19
+ s.add_development_dependency 'minitest-reporters', '~> 1.3'
19
20
  # Integration testing
20
- s.add_development_dependency 'capybara'
21
+ s.add_development_dependency 'capybara', '~> 3.6'
21
22
  s.add_development_dependency 'poltergeist'
22
23
  # Dummy Rails app dependencies
24
+ s.add_development_dependency 'sassc-rails', '>= 2.0.0'
23
25
  s.add_development_dependency 'actionpack', '>= 4.1.5'
24
26
  s.add_development_dependency 'activesupport', '>= 4.1.5'
25
27
  s.add_development_dependency 'json', '>= 1.8.1'
26
28
  s.add_development_dependency 'sprockets-rails', '>= 2.1.3'
27
- s.add_development_dependency 'autoprefixer-rails', '~> 1.1'
28
29
  s.add_development_dependency 'jquery-rails', '>= 3.1.0'
29
30
  s.add_development_dependency 'slim-rails'
30
31
  s.add_development_dependency 'uglifier'
data/bower.json CHANGED
@@ -1,6 +1,5 @@
1
1
  {
2
2
  "name": "bootstrap-sass",
3
- "version": "3.3.0",
4
3
  "homepage": "https://github.com/twbs/bootstrap-sass",
5
4
  "authors": [
6
5
  "Thomas McDonald",
@@ -8,25 +7,11 @@
8
7
  "Peter Gumeson",
9
8
  "Gleb Mazovetskiy"
10
9
  ],
11
- "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
10
+ "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
11
+ "moduleType": "globals",
12
12
  "main": [
13
13
  "assets/stylesheets/_bootstrap.scss",
14
- "assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
15
- "assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
16
- "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
17
- "assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
18
- "assets/javascripts/bootstrap/affix.js",
19
- "assets/javascripts/bootstrap/alert.js",
20
- "assets/javascripts/bootstrap/button.js",
21
- "assets/javascripts/bootstrap/carousel.js",
22
- "assets/javascripts/bootstrap/collapse.js",
23
- "assets/javascripts/bootstrap/dropdown.js",
24
- "assets/javascripts/bootstrap/tab.js",
25
- "assets/javascripts/bootstrap/transition.js",
26
- "assets/javascripts/bootstrap/scrollspy.js",
27
- "assets/javascripts/bootstrap/modal.js",
28
- "assets/javascripts/bootstrap/tooltip.js",
29
- "assets/javascripts/bootstrap/popover.js"
14
+ "assets/javascripts/bootstrap.js"
30
15
  ],
31
16
  "keywords": [
32
17
  "twbs",
@@ -45,6 +30,7 @@
45
30
  "Gemfile"
46
31
  ],
47
32
  "dependencies": {
48
- "jquery": ">= 1.9.0"
49
- }
33
+ "jquery": "1.9.1 - 3"
34
+ },
35
+ "version": "3.4.1"
50
36
  }
data/composer.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "twbs/bootstrap-sass",
3
- "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
3
+ "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
4
4
  "keywords": ["bootstrap", "css", "sass"],
5
5
  "homepage": "http://github.com/twbs/bootstrap-sass",
6
6
  "authors": [
@@ -29,7 +29,7 @@
29
29
  "license": "MIT",
30
30
  "extra": {
31
31
  "branch-alias": {
32
- "dev-master": "3.3.x-dev"
32
+ "dev-master": "3.4.x-dev"
33
33
  }
34
34
  }
35
35
  }
@@ -0,0 +1,7 @@
1
+ var path = require('path');
2
+
3
+ module.exports = function(eyeglass, sass) {
4
+ return {
5
+ sassDir: path.join(__dirname, 'assets/stylesheets')
6
+ }
7
+ };
@@ -5,7 +5,12 @@ module Bootstrap
5
5
  %w(stylesheets javascripts fonts images).each do |sub|
6
6
  app.config.assets.paths << root.join('assets', sub).to_s
7
7
  end
8
- app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff)$)
8
+
9
+ # sprockets-rails 3 tracks down the calls to `font_path` and `image_path`
10
+ # and automatically precompiles the referenced assets.
11
+ unless Sprockets::Rails::VERSION.split('.', 2)[0].to_i >= 3
12
+ app.config.assets.precompile << %r(bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff2?)$)
13
+ end
9
14
  end
10
15
  end
11
16
  end
@@ -1,4 +1,4 @@
1
1
  module Bootstrap
2
- VERSION = '3.3.0.1'
3
- BOOTSTRAP_SHA = '16dbdbd7a2c6cfa3be4e5dcc52249e577c02c84a'
2
+ VERSION = '3.4.1'
3
+ BOOTSTRAP_SHA = '68b0d231a13201eb14acd3dc84e51543d16e5f7e'
4
4
  end
@@ -4,8 +4,22 @@ module Bootstrap
4
4
  # Inspired by Kaminari
5
5
  def load!
6
6
  register_compass_extension if compass?
7
- register_rails_engine if rails?
8
- configure_sass
7
+
8
+ if rails?
9
+ register_rails_engine
10
+ elsif hanami?
11
+ register_hanami
12
+ elsif sprockets?
13
+ register_sprockets
14
+ elsif defined?(::Sass) && ::Sass.respond_to?(:load_paths)
15
+ # The deprecated `sass` gem:
16
+ ::Sass.load_paths << stylesheets_path
17
+ end
18
+
19
+ if defined?(::Sass::Script::Value::Number)
20
+ # bootstrap requires minimum precision of 8, see https://github.com/twbs/bootstrap-sass/issues/409
21
+ ::Sass::Script::Value::Number.precision = [8, ::Sass::Script::Value::Number.precision].max
22
+ end
9
23
  end
10
24
 
11
25
  # Paths
@@ -30,29 +44,24 @@ module Bootstrap
30
44
  end
31
45
 
32
46
  # Environment detection helpers
33
- def asset_pipeline?
47
+ def sprockets?
34
48
  defined?(::Sprockets)
35
49
  end
36
50
 
37
51
  def compass?
38
- defined?(::Compass)
52
+ defined?(::Compass::Frameworks)
39
53
  end
40
54
 
41
55
  def rails?
42
56
  defined?(::Rails)
43
57
  end
44
58
 
45
- private
46
-
47
- def configure_sass
48
- require 'sass'
49
-
50
- ::Sass.load_paths << stylesheets_path
51
-
52
- # bootstrap requires minimum precision of 10, see https://github.com/twbs/bootstrap-sass/issues/409
53
- ::Sass::Script::Number.precision = [10, ::Sass::Script::Number.precision].max
59
+ def hanami?
60
+ defined?(::Hanami)
54
61
  end
55
62
 
63
+ private
64
+
56
65
  def register_compass_extension
57
66
  ::Compass::Frameworks.register(
58
67
  'bootstrap',
@@ -66,6 +75,16 @@ module Bootstrap
66
75
  def register_rails_engine
67
76
  require 'bootstrap-sass/engine'
68
77
  end
78
+
79
+ def register_hanami
80
+ Hanami::Assets.sources << assets_path
81
+ end
82
+
83
+ def register_sprockets
84
+ Sprockets.append_path(stylesheets_path)
85
+ Sprockets.append_path(fonts_path)
86
+ Sprockets.append_path(javascripts_path)
87
+ end
69
88
  end
70
89
  end
71
90