bootstrap-sass 3.1.0.0 → 3.1.0.1

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.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b33ec25bfb1e9fa8c4e1c371a263ec79c7d40baa
4
- data.tar.gz: 37ce59e8a375cf62d7f08077e8e111a60973859b
3
+ metadata.gz: db8d2f22db9726b88db9d2afdda3622f8e74b71b
4
+ data.tar.gz: 50aa39b039af948b2818c1225de73d59fcef8f73
5
5
  SHA512:
6
- metadata.gz: 8052230ccd4c3069920808bd2aee510a48be09adab836da007fd8a75e9844dd4f38166bc78055c6f0424c09ab46275b141211cfb3cce49282ea3d261de22a3c9
7
- data.tar.gz: 42ae1f9fb777f628e0a4e61cc2649c0c94d63f61897dfda22db87fb0b425b39ddea2aa39fdce62deb1cc74f8d6d2cb6b84bd739909c573249e5b2d1ff1aaecde
6
+ metadata.gz: 0184eee22fe19490d9791704521806a75c5bab053171a34e4c9a35f57199c7bf6be26d504fef7639eb7dcecff92631650a394585433b77fe908b5f44a4cc7489
7
+ data.tar.gz: 19a57f9892b9bf6544c69d6730025a761f5498bed546d5aceba73e6432e5c313f0ccd0982ee3bfd9ab8a85310fe1a70a691f8c3be9fec355c2bd362f79179024
data/README.md CHANGED
@@ -50,6 +50,8 @@ This will create a new Compass project with the following files in it:
50
50
  * [_variables.scss](/templates/project/_variables.scss.erb) - all of bootstrap variables (override them here).
51
51
  * [styles.scss](/templates/project/styles.scss) - main project SCSS file, import `variables` and `bootstrap`.
52
52
 
53
+ Some bootstrap-sass mixins may conflict with the Compass ones.
54
+ If this happens, change the import order so that Compass mixins are loaded later.
53
55
 
54
56
  ### c. Sass-only (no Compass, nor Rails)
55
57
 
@@ -65,6 +67,8 @@ Using bootstrap-sass as a Bower package is still being tested. You can install i
65
67
  bower install 'git://github.com/twbs/bootstrap-sass.git#v3.1.0'
66
68
  ```
67
69
 
70
+ The files are located at [vendor/assets](/vendor/assets).
71
+
68
72
  #### JS and fonts
69
73
 
70
74
  If you are using Rails or Sprockets, see Usage.
@@ -2,7 +2,7 @@
2
2
  "name": "twbs/bootstrap-sass",
3
3
  "description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
4
4
  "keywords": ["bootstrap", "css", "sass"],
5
- "homepage": "http://github.com/twbs/bootstrap",
5
+ "homepage": "http://github.com/twbs/bootstrap-sass",
6
6
  "authors": [
7
7
  {
8
8
  "name": "Thomas McDonald"
@@ -1,4 +1,4 @@
1
1
  module Bootstrap
2
- VERSION = '3.1.0.0'
3
- BOOTSTRAP_SHA = '1409cde7e800ca83fd761f87e5ad8f0d259e38d1'
2
+ VERSION = '3.1.0.1'
3
+ BOOTSTRAP_SHA = '9c054fd4c0db89cbbb1df3c868bafc4f2c17c3e3'
4
4
  end
@@ -67,7 +67,7 @@ class Converter
67
67
  end
68
68
  file = varargify_mixin_definitions(file, *VARARG_MIXINS)
69
69
  file = deinterpolate_vararg_mixins(file)
70
- %w(responsive-(in)?visibility input-size).each do |mixin|
70
+ %w(responsive-(in)?visibility input-size text-emphasis-variant bg-variant).each do |mixin|
71
71
  file = parameterize_mixin_parent_selector file, mixin
72
72
  end
73
73
  file = replace_ms_filters(file)
@@ -75,6 +75,11 @@ class Converter
75
75
  file = replace_rules(file, ' .list-group-item-') { |rule| extract_nested_rule rule, 'a&' }
76
76
  file = replace_all file, /,\s*\.open \.dropdown-toggle& \{(.*?)\}/m,
77
77
  " {\\1}\n .open & { &.dropdown-toggle {\\1} }"
78
+
79
+ # make +scale(one_argument) compatible with Sass list handling
80
+ # see https://github.com/twbs/bootstrap-sass/issues/518
81
+ file = replace_all file, '$ratio, $ratio-y', '$scale-args'
82
+
78
83
  file = convert_grid_mixins file
79
84
  when 'responsive-utilities.less'
80
85
  file = apply_mixin_parent_selector(file, '&\.(visible|hidden)')
@@ -110,6 +115,10 @@ class Converter
110
115
  rule = replace_all rule, /(\$icon-font(?:-\w+)+)/, '#{\1}'
111
116
  replace_asset_url rule, :font
112
117
  }
118
+ when 'type.less'
119
+ file = apply_mixin_parent_selector(file, '\.(text|bg)-(success|primary|info|warning|danger)')
120
+ # .bg-primary will not get patched automatically as it includes an additional rule. fudge for now
121
+ file = replace_all(file, " @include bg-variant($brand-primary);\n}", "}\n@include bg-variant('.bg-primary', $brand-primary);")
113
122
  end
114
123
 
115
124
  name = name.sub(/\.less$/, '.scss')
@@ -138,15 +147,9 @@ class Converter
138
147
  file = convert_less_ampersand(file)
139
148
  file = deinterpolate_vararg_mixins(file)
140
149
  file = replace_calculation_semantics(file)
141
- file = replace_redundant_ampersands(file)
142
150
  file
143
151
  end
144
152
 
145
- # a&:hover => a:hover
146
- def replace_redundant_ampersands(file)
147
- file.gsub /([\w+])&([:\w]+)/, '\1\2'
148
- end
149
-
150
153
  def replace_asset_url(rule, type)
151
154
  replace_all rule, /url\((.*?)\)/, "url(if($bootstrap-sass-asset-helper, twbs-#{type}-path(\\1), \\1))"
152
155
  end
@@ -297,7 +300,7 @@ class Converter
297
300
  # wrap properties in #{$parent} { ... }
298
301
  replace_properties(mxn_css) { |props| props.strip.empty? ? props : " \#{#{param}} { #{props.strip} }\n " }
299
302
  # change nested& rules to nested#{$parent}
300
- replace_rules(mxn_css, /.*&[ ,]/) { |rule| replace_in_selector rule, /&/, "\#{#{param}}" }
303
+ replace_rules(mxn_css, /.*&[ ,:]/) { |rule| replace_in_selector rule, /&/, "\#{#{param}}" }
301
304
  end
302
305
  end
303
306
 
@@ -154,10 +154,10 @@
154
154
  -ms-transform: rotate($degrees); // IE9 only
155
155
  transform: rotate($degrees);
156
156
  }
157
- @mixin scale($ratio, $ratio-y...) {
158
- -webkit-transform: scale($ratio, $ratio-y);
159
- -ms-transform: scale($ratio, $ratio-y); // IE9 only
160
- transform: scale($ratio, $ratio-y);
157
+ @mixin scale($scale-args...) {
158
+ -webkit-transform: scale($scale-args);
159
+ -ms-transform: scale($scale-args); // IE9 only
160
+ transform: scale($scale-args);
161
161
  }
162
162
  @mixin translate($x, $y) {
163
163
  -webkit-transform: translate($x, $y);
@@ -590,18 +590,20 @@
590
590
 
591
591
  // Contextual backgrounds
592
592
  // -------------------------
593
- @mixin bg-variant($color) {
594
- background-color: $color;
595
- a:hover {
593
+ // [converter] $parent hack
594
+ @mixin bg-variant($parent, $color) {
595
+ #{$parent} { background-color: $color; }
596
+ a#{$parent}:hover {
596
597
  background-color: darken($color, 10%);
597
598
  }
598
599
  }
599
600
 
600
601
  // Typography
601
602
  // -------------------------
602
- @mixin text-emphasis-variant($color) {
603
- color: $color;
604
- a:hover {
603
+ // [converter] $parent hack
604
+ @mixin text-emphasis-variant($parent, $color) {
605
+ #{$parent} { color: $color; }
606
+ a#{$parent}:hover {
605
607
  color: darken($color, 10%);
606
608
  }
607
609
  }
@@ -155,7 +155,7 @@
155
155
  padding: $navbar-padding-vertical $navbar-padding-horizontal;
156
156
  font-size: $font-size-large;
157
157
  line-height: $line-height-computed;
158
- height: $line-height-computed;
158
+ height: $navbar-height;
159
159
 
160
160
  &:hover,
161
161
  &:focus {
@@ -21,10 +21,7 @@
21
21
  margin-right: auto;
22
22
  }
23
23
 
24
- // Add a hover state for linked versions only
25
- a:hover,
26
- a:focus,
27
- // [converter] extracted a&.active to a.thumbnail.active
24
+ // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
28
25
 
29
26
  // Image captions
30
27
  .caption {
@@ -33,6 +30,9 @@
33
30
  }
34
31
  }
35
32
 
33
+ // Add a hover state for linked versions only
34
+ a.thumbnail:hover,
35
+ a.thumbnail:focus,
36
36
  a.thumbnail.active {
37
37
  border-color: $link-color;
38
38
  }
@@ -91,21 +91,16 @@ cite { font-style: normal; }
91
91
  .text-muted {
92
92
  color: $text-muted;
93
93
  }
94
- .text-primary {
95
- @include text-emphasis-variant($brand-primary);
96
- }
97
- .text-success {
98
- @include text-emphasis-variant($state-success-text);
99
- }
100
- .text-info {
101
- @include text-emphasis-variant($state-info-text);
102
- }
103
- .text-warning {
104
- @include text-emphasis-variant($state-warning-text);
105
- }
106
- .text-danger {
107
- @include text-emphasis-variant($state-danger-text);
108
- }
94
+
95
+ @include text-emphasis-variant('.text-primary', $brand-primary);
96
+
97
+ @include text-emphasis-variant('.text-success', $state-success-text);
98
+
99
+ @include text-emphasis-variant('.text-info', $state-info-text);
100
+
101
+ @include text-emphasis-variant('.text-warning', $state-warning-text);
102
+
103
+ @include text-emphasis-variant('.text-danger', $state-danger-text);
109
104
 
110
105
  // Contextual backgrounds
111
106
  // For now we'll leave these alongside the text classes until v4 when we can
@@ -114,20 +109,16 @@ cite { font-style: normal; }
114
109
  // Given the contrast here, this is the only class to have its color inverted
115
110
  // automatically.
116
111
  color: #fff;
117
- @include bg-variant($brand-primary);
118
- }
119
- .bg-success {
120
- @include bg-variant($state-success-bg);
121
- }
122
- .bg-info {
123
- @include bg-variant($state-info-bg);
124
- }
125
- .bg-warning {
126
- @include bg-variant($state-warning-bg);
127
- }
128
- .bg-danger {
129
- @include bg-variant($state-danger-bg);
130
112
  }
113
+ @include bg-variant('.bg-primary', $brand-primary);
114
+
115
+ @include bg-variant('.bg-success', $state-success-bg);
116
+
117
+ @include bg-variant('.bg-info', $state-info-bg);
118
+
119
+ @include bg-variant('.bg-warning', $state-warning-bg);
120
+
121
+ @include bg-variant('.bg-danger', $state-danger-bg);
131
122
 
132
123
 
133
124
  // Page header
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.1.0.0
4
+ version: 3.1.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Thomas McDonald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-30 00:00:00.000000000 Z
11
+ date: 2014-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: compass