sass 3.3.0.alpha.133 → 3.3.0.alpha.134

Sign up to get free protection for your applications and to get access to all the features.
data/REVISION CHANGED
@@ -1 +1 @@
1
- a60a9187f9b56775f340e920390083771f3e5cc7
1
+ 58b580372450dfc61f106842bee0fca69bd79365
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.3.0.alpha.133
1
+ 3.3.0.alpha.134
data/VERSION_DATE CHANGED
@@ -1 +1 @@
1
- 22 April 2013 20:03:03 GMT
1
+ 24 April 2013 22:18:16 GMT
@@ -177,7 +177,7 @@ module Sass
177
177
  def with_more_sources(sources)
178
178
  sseq = dup
179
179
  sseq.members = members.dup
180
- sseq.sources.merge sources
180
+ sseq.sources = self.sources | sources
181
181
  sseq
182
182
  end
183
183
 
@@ -1116,6 +1116,20 @@ SCSS
1116
1116
 
1117
1117
  # Regression Tests
1118
1118
 
1119
+ def test_nested_extend_specificity
1120
+ assert_equal <<CSS, render(<<SCSS)
1121
+ a :b, a :b:c {
1122
+ a: b; }
1123
+ CSS
1124
+ %foo {a: b}
1125
+
1126
+ a {
1127
+ :b {@extend %foo}
1128
+ :b:c {@extend %foo}
1129
+ }
1130
+ SCSS
1131
+ end
1132
+
1119
1133
  def test_nested_double_extend_optimization
1120
1134
  assert_equal <<CSS, render(<<SCSS)
1121
1135
  .parent1 .child {
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sass
3
3
  version: !ruby/object:Gem::Version
4
- hash: 592302599
4
+ hash: 592302593
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 3
8
8
  - 3
9
9
  - 0
10
10
  - alpha
11
- - 133
12
- version: 3.3.0.alpha.133
11
+ - 134
12
+ version: 3.3.0.alpha.134
13
13
  platform: ruby
14
14
  authors:
15
15
  - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
19
19
  bindir: bin
20
20
  cert_chain: []
21
21
 
22
- date: 2013-04-22 00:00:00 -04:00
22
+ date: 2013-04-24 00:00:00 -04:00
23
23
  default_executable:
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency