ustyle 1.5.8 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
data/lib/ustyle/engine.rb CHANGED
@@ -17,8 +17,16 @@ module Ustyle
17
17
  end
18
18
 
19
19
  class Railtie < ::Rails::Railtie
20
- initializer :setup_autoprefixer, group: :all do |app|
21
- AutoprefixerRails.install(app.assets, *Ustyle.autoprefixer_config(app))
20
+ if config.respond_to?(:assets) and not config.assets.nil?
21
+ config.assets.configure do |env|
22
+ AutoprefixerRails.install(env, Ustyle.autoprefixer_config)
23
+ end
24
+ else
25
+ initializer :setup_autoprefixer, group: :all do |app|
26
+ if defined? app.assets and not app.assets.nil?
27
+ AutoprefixerRails.install(app.assets, Ustyle.autoprefixer_config)
28
+ end
29
+ end
22
30
  end
23
31
  end
24
32
  end
@@ -24,11 +24,11 @@ if defined?(::Sinatra)
24
24
  end
25
25
 
26
26
  require 'autoprefixer-rails'
27
- AutoprefixerRails.install(app.sprockets, *::Ustyle.autoprefixer_config(app))
27
+ AutoprefixerRails.install(app.sprockets, ::Ustyle.autoprefixer_config)
28
28
 
29
29
  app.helpers Sprockets::Helpers
30
30
  end
31
31
  end
32
32
  register Ustyle
33
33
  end
34
- end
34
+ end
@@ -1,4 +1,4 @@
1
1
  module Ustyle
2
- version = "1.5.8"
2
+ version = "1.6.1"
3
3
  VERSION = version
4
4
  end
data/lib/ustyle.rb CHANGED
@@ -41,12 +41,10 @@ module Ustyle
41
41
  @sprockets_env ||= ::Sprockets::Environment.new
42
42
  end
43
43
 
44
- def autoprefixer_config app
44
+ def autoprefixer_config
45
45
  file = File.join Ustyle.gem_path, 'config/autoprefixer.yml'
46
46
  params = YAML.load_file(file).symbolize_keys
47
- opts = { }
48
- opts[:safe] = true if params.delete(:safe)
49
- [params, opts]
47
+ params
50
48
  end
51
49
  end
52
50
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ustyle",
3
- "version": "1.5.8",
3
+ "version": "1.6.1",
4
4
  "description": "A living styleguide and pattern library by uSwitch.",
5
5
  "keywords": [
6
6
  "css",
data/ustyle.gemspec CHANGED
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
21
21
  spec.require_paths = ["lib"]
22
22
 
23
23
  spec.add_dependency "sass"
24
- spec.add_dependency "autoprefixer-rails", "~> 4.0"
24
+ spec.add_dependency "autoprefixer-rails"
25
25
  spec.add_dependency "mime-types"
26
26
  spec.add_dependency "chunky_png", ">= 0.8.0"
27
27
 
@@ -2,11 +2,12 @@
2
2
  // @name Numbered list
3
3
  //
4
4
  // @description
5
- // Our default numbered list styling
6
- // `.us-custom-list-alt` allows us to use the lists on hero/blue backgrounds.
5
+ // Our default numbered list styling.
6
+ //
7
+ // @state .us-custom-list-alt - allows us to use the lists on hero/blue backgrounds.
7
8
  //
8
9
  // @markup
9
- // <ul class='us-numbered-list'>
10
+ // <ul class='us-numbered-list {$modifiers}'>
10
11
  // <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sollicitudin iaculis bibendum.</li>
11
12
  // <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sollicitudin iaculis bibendum.</li>
12
13
  // </ul>
@@ -47,13 +48,13 @@
47
48
  content: counter(number-counter);
48
49
  box-sizing: border-box;
49
50
  }
51
+ }
50
52
 
51
- .us-hero &:before,
52
- .us-custom-list-alt &:before {
53
- color: $c-navy;
54
- background: #fff;
55
- background: rgba(255, 255, 255, .7);
56
- }
53
+ .us-hero & li:before,
54
+ &.us-custom-list-alt li:before {
55
+ color: $c-navy;
56
+ background: #fff;
57
+ background: rgba(255, 255, 255, .7);
57
58
  }
58
59
  }
59
60
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ustyle
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.8
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - uSwitch Limited
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2016-06-28 00:00:00.000000000 Z
16
+ date: 2016-09-09 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: sass
@@ -33,16 +33,16 @@ dependencies:
33
33
  name: autoprefixer-rails
34
34
  requirement: !ruby/object:Gem::Requirement
35
35
  requirements:
36
- - - "~>"
36
+ - - ">="
37
37
  - !ruby/object:Gem::Version
38
- version: '4.0'
38
+ version: '0'
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  requirements:
43
- - - "~>"
43
+ - - ">="
44
44
  - !ruby/object:Gem::Version
45
- version: '4.0'
45
+ version: '0'
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: mime-types
48
48
  requirement: !ruby/object:Gem::Requirement