oulu 0.17.9 → 0.18.0

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
  SHA256:
3
- metadata.gz: 4961891099a2abc659d7c15bfb67fda41b96e5297d6c1ec0539a0bc2561f8647
4
- data.tar.gz: 7e52e5db5ac1d1bb35a34b3120f4fc051269b57543c3928f9910d16bba8b2638
3
+ metadata.gz: fd620633fb9ac0f13e106d6c2b82ab6caae854b256258da46d0d4b01da189ce6
4
+ data.tar.gz: 3357de28daf8039ea2ece5a8e6678df9aadcfcf456910afd734bf87f3bc76c62
5
5
  SHA512:
6
- metadata.gz: 383c9f8531d57733cbb197ea157c89ad47d2e59f06e3deef579dfa7a678a1d78f9797c59ea6551dc7ff51bdf004d9730c2541e36182d95bc58b77927aeedf47f
7
- data.tar.gz: f363a850d0ca96ece4714983877ec88514a94c91bf7ea73b5cba9d09abc83a61cd4e18115a422c5d21f474a508394feff5597731b51e820e243ea79ad5f22e3e
6
+ metadata.gz: b0be05f4560a3e313c003a396923b15350f82cb0953beea138f4d342cde33b5a815bcb5ca4df03a5bc69436efed0200a20665232a7327ab4b3ab3a556c19e65f
7
+ data.tar.gz: 489ef93ce3540cfe1ef2fc76667d85c61285c9e091f41298fb30a30398682c74b071af1cf67b936507feb4a6c0d7c956049b4cea98b4aae8b102ee7a6cc7af2b
@@ -44,7 +44,6 @@
44
44
  @import settings/mixins/border
45
45
  @import settings/mixins/border-radius
46
46
  @import settings/mixins/table
47
- @import settings/mixins/list
48
47
  @import settings/mixins/overlay
49
48
  @import settings/mixins/balloon-tail
50
49
  @import settings/mixins/margin-padding
@@ -12,7 +12,6 @@
12
12
  @import settings/mixins/border
13
13
  @import settings/mixins/border-radius
14
14
  @import settings/mixins/table
15
- @import settings/mixins/list
16
15
  @import settings/mixins/overlay
17
16
  @import settings/mixins/balloon-tail
18
17
  @import settings/mixins/margin-padding
@@ -87,7 +87,7 @@
87
87
  $button-height: $button-height
88
88
  padding-left: $icon-width
89
89
  &:before
90
- +fa("\f0d7")
90
+ +fa(fas "\f0d7")
91
91
  +position(absolute, left 0, top 0)
92
92
  border-right: .0625rem solid shade($secondary, 15%)
93
93
  +text-block($icon-size ($button-height - $border-width * 2), center shade($secondary, 55%))
@@ -100,7 +100,7 @@
100
100
  position: relative
101
101
  overflow: hidden
102
102
  &:after
103
- +fa("\f0d7")
103
+ +fa(fas "\f0d7")
104
104
  +position(absolute, right 0, top 0, bottom 0, 0)
105
105
  +text-block($icon-size 1, center flex)
106
106
  align-items: center
@@ -127,7 +127,7 @@
127
127
  margin-top: $check-base-size / -2
128
128
  &:after
129
129
  $check-icon-size: $font-size * 1.4
130
- +fa("\f00c")
130
+ +fa(fas "\f00c")
131
131
  opacity: 0
132
132
  +size($check-icon-size)
133
133
  +text-block($check-icon-size 1, $button-checked-icon-color)
@@ -62,7 +62,7 @@
62
62
  &::before
63
63
  border-color: $admin-form-check
64
64
  &::after
65
- +fa("\f00c")
65
+ +fa(fas "\f00c")
66
66
  +text-block(.75rem 1, $admin-form-check flex)
67
67
  align-items: center
68
68
  justify-content: center
@@ -1,15 +1,35 @@
1
- =fa($icon: null)
1
+ =font-awsome-4-core
2
2
  display: inline-block
3
3
  font-family: FontAwesome
4
4
  font-style: normal
5
5
  font-weight: normal
6
6
  line-height: 1
7
- content: "#{$icon}"
8
7
 
9
- =fa-icon($icon: '\f105', $size: 16px 12px, $options: null, $position1:null, $position2: null)
10
- &:before
11
- +fa($icon)
12
- @if $position1
13
- +position(absolute, if($position1, $position1, null), if($position2, $position2, null))
14
- @if $size
15
- +text-block($size, $options)
8
+ =font-awsome-5-core
9
+ -moz-osx-font-smoothing: grayscale
10
+ -webkit-font-smoothing: antialiased
11
+ display: inline-block
12
+ font-style: normal
13
+ font-variant: normal
14
+ text-rendering: auto
15
+ line-height: 1
16
+
17
+ =fa($value)
18
+ @if equal_nth($value, 1)
19
+ +font-awsome-4-core
20
+ content: "#{$value}"
21
+ @else if equal_nth($value, 2)
22
+ +font-awsome-5-core
23
+ content: "#{nth($value, 2)}"
24
+ @if nth($value, 1) == fa or nth($value, 1) == fas
25
+ font-family: 'Font Awesome 5 Free'
26
+ font-style: normal
27
+ font-weight: 900
28
+ @else if nth($value, 1) == far
29
+ font-family: 'Font Awesome 5 Free'
30
+ font-style: normal
31
+ font-weight: 400
32
+ @else if nth($value, 1) == fab
33
+ font-family: 'Font Awesome 5 Brands'
34
+ font-style: normal
35
+ font-weight: normal
data/lib/oulu/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oulu
2
- VERSION = "0.17.9"
2
+ VERSION = "0.18.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oulu
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.17.9
4
+ version: 0.18.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-08-09 00:00:00.000000000 Z
11
+ date: 2018-09-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor
@@ -179,7 +179,6 @@ files:
179
179
  - app/assets/stylesheets/settings/mixins/_image.sass
180
180
  - app/assets/stylesheets/settings/mixins/_line.sass
181
181
  - app/assets/stylesheets/settings/mixins/_link.sass
182
- - app/assets/stylesheets/settings/mixins/_list.sass
183
182
  - app/assets/stylesheets/settings/mixins/_margin-padding.sass
184
183
  - app/assets/stylesheets/settings/mixins/_overlay.sass
185
184
  - app/assets/stylesheets/settings/mixins/_positions.sass
@@ -1,20 +0,0 @@
1
- // +list(12px 24px, fa '\f192', 12px 3px 8px)
2
- // +list(margin-left margin-bottom, fa '\f192', icon-size top left)
3
- =list($margins: null, $list-style: null, $icon-position: null)
4
- margin-left: optional_nth($margins, 1)
5
- margin-bottom: optional_nth($margins, 2)
6
- @for $i from 1 through length($list-style)
7
- @if nth($list-style, $i) == "fa"
8
- list-style-type: none
9
- >li
10
- position: relative
11
- display: block
12
- padding-left: optional_nth($icon-position, 1) + optional_nth($icon-position, 3)
13
- &:before
14
- +fa(optional_nth($list-style, $i + 1))
15
- +text-block(optional_nth($icon-position, 1) optional_nth($icon-position, 1))
16
- +position(absolute, left 0, top optional_nth($icon-position, 2))
17
- @else if list_style_type(nth($list-style, $i))
18
- list-style-type: nth($list-style, $i)
19
- @else if list_style_position(nth($list-style, $i))
20
- list-style-position: nth($list-style, $i)