toolkit 2.0.0.alpha.7 → 2.0.0.alpha.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0f70813b98ac50ccc010d27edb252293f537c38b
4
- data.tar.gz: 6b6614ea726b941a77854e19f5d3c1cac4c77ba9
3
+ metadata.gz: 5505918394736ce9fa000c1fdbd0a68fd0bcf181
4
+ data.tar.gz: e3a047b92920b2bca2ba54041c92826e29d43899
5
5
  SHA512:
6
- metadata.gz: cdad416de492adb7637e43eb67e76b204683fe45cd2e45d65fac4c5e037a1ac3607f7103d0437a7146419ab7da41cb7eb5cc6d523c66114ad400087fa059be92
7
- data.tar.gz: d66888767606a9afbfa544fd4cceef2148952eb3280aa85f520dab1e62d6d767860fe082206d6e6b9b67e4666828b5c59e5a12d61207a27eb8a8dbb520df02fc
6
+ metadata.gz: 425ebc656b869e115d34ad29e0a2da038309e8d4aa317224e65549d535b4440feca987785b679cea1e3044f0bf08a762971fe20c85b5ee086e809485c699b6aa
7
+ data.tar.gz: ac4c3093b00fb2db1c52a1f553afc1ff7a3f80269d5910add0c862b419cbcc80a36c801396aba48d6f397323587fcbf00fa46ee5dbf7ec612ad8e301a476bef3
@@ -24,24 +24,13 @@
24
24
  //////////////////////////////
25
25
  // Font Fade In
26
26
  //////////////////////////////
27
- @mixin content-fade-in($duration: null, $loading: null) {
28
-
27
+ @mixin content-fade-in($duration: null, $loading: null, $extend: null) {
29
28
  $duration: if($duration != null, $duration, toolkit-get('fade in duration'));
30
29
  $loading: if($loading != null, $loading, toolkit-get('fade in loading class'));
31
- $selector: if('#{&}' != '', true, false);
32
-
33
- @if $selector != false {
34
- #{$selector} {
35
- opacity: 1;
36
- @if not mixin-exists('single-transition') {
37
- -webkit-transition: opacity $duration;
38
- transition: opacity $duration;
39
- }
30
+ $extend: if($extend != null, $extend, toolkit-get('fade in extend'));
40
31
 
41
- #{$loading} & {
42
- opacity: 0;
43
- }
44
- }
32
+ @if $extend == true and $duration == toolkit-get('fade in duration') and $loading == toolkit-get('fade in loading class') {
33
+ @extend %content-fade-in;
45
34
  }
46
35
  @else {
47
36
  opacity: 1;
@@ -49,9 +38,16 @@
49
38
  -webkit-transition: opacity $duration;
50
39
  transition: opacity $duration;
51
40
  }
41
+ @else {
42
+ @include single-transition(opacity $duration);
43
+ }
52
44
 
53
45
  #{$loading} & {
54
46
  opacity: 0;
55
47
  }
56
48
  }
49
+ }
50
+
51
+ %content-fade-in {
52
+ @include content-fade-in($extend: false);
57
53
  }
@@ -11,6 +11,7 @@ $Toolkit-Settings: (
11
11
  'extend ligatures': false,
12
12
  'fade in duration': 1s,
13
13
  'fade in loading class': '.wf-loading',
14
+ 'fade in extend': false,
14
15
  'intrinsic ratio': 16/9,
15
16
  'intrinsic ratio width': 100%,
16
17
  'intrinsic ratio elements': '> *',
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: toolkit
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.alpha.7
4
+ version: 2.0.0.alpha.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sam Richard
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-01-29 00:00:00.000000000 Z
13
+ date: 2014-02-08 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: sass
@@ -18,14 +18,14 @@ dependencies:
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 3.3.0.rc.2
21
+ version: 3.3.0.rc.3
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - ~>
27
27
  - !ruby/object:Gem::Version
28
- version: 3.3.0.rc.2
28
+ version: 3.3.0.rc.3
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: compass
31
31
  requirement: !ruby/object:Gem::Requirement