oulu 0.12.7 → 0.12.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/settings/functions/_color.sass +16 -27
  3. data/app/assets/stylesheets/settings/variables/_default.sass +2 -10
  4. data/app/assets/stylesheets/settings/variables/_modules.sass +2 -0
  5. data/bower.json +1 -1
  6. data/lib/oulu/version.rb +1 -1
  7. data/package.json +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8a2088fa78975db2099d0e0eade8fc5b9dfd5226
4
- data.tar.gz: 24be2e27d6518b844a8af4f9e70f4e451a0dccbc
3
+ metadata.gz: e16e11583b21790a4e4a3b0583a45071b4b8d1f0
4
+ data.tar.gz: 32490a6ecc7cff24b958a22d652a59bb1f6d9761
5
5
  SHA512:
6
- metadata.gz: 3629b9013ef0418a17f19d1f0f6ecb03d0f1cd4a28df15b0b06e38ad1b4fce11a4728ed32dbb1f6bee5857799138132d93b3a4210ac0a26122c54c9c64554b51
7
- data.tar.gz: edd4564b3fdc3ba28269a78a5df8d610465e122de7137f542deeb06b97a84f11015f5c5f72a4f87422141fcbdc3ed724a193bce9ca50e100e55da30b3cdeaea5
6
+ metadata.gz: 6772dacad21dd649fd8033f28fbd5f2d4afcf72828f4a97069195ff2f8bd7be9195952c1b80756350a9776bac6848233f9a0792f0061f4582bf627f37a665a83
7
+ data.tar.gz: 9da724b8f2ed46a2a760576eb1ec66f157cf4e6aac000bf058c89462373d1566e1b692d59740ebf7fba258bfa7acb9b72265bddb41ed2bbb8c84c237494101b6
data/app/assets/stylesheets/settings/functions/_color.sass CHANGED
@@ -33,23 +33,18 @@
33
33
 
34
34
  // Adapted from: https://gist.github.com/voxpelli/6304812
35
35
  @function luma($color)
36
- $rgba: red($color), green($color), blue($color)
37
- $rgba2: ()
38
- @for $i from 1 through 3
39
- $rgb: nth($rgba, $i)
40
- $rgb: $rgb / 255
41
- $rgb: if($rgb < .03928, $rgb / 12.92, pow(($rgb + .055) / 1.055, 2.4))
42
- $rgba2: append($rgba2, $rgb)
43
- @return (.2126 * nth($rgba2, 1) + .7152 * nth($rgba2, 2) + .0722 * nth($rgba2, 3))*100
44
-
45
- @function luma_contrast($color-1, $color-2: null)
46
- @if $color-2
47
- @if abs(luma($color-1) - luma($color-2)) > $luma-threshold
48
- @return true
49
- @else
50
- @return null
36
+ @if color($color)
37
+ $rgba: red($color), green($color), blue($color)
38
+ $rgba2: ()
39
+ @for $i from 1 through 3
40
+ $rgb: nth($rgba, $i)
41
+ $rgb: $rgb / 255
42
+ $rgb: if($rgb < .03928, $rgb / 12.92, pow(($rgb + .055) / 1.055, 2.4))
43
+ $rgba2: append($rgba2, $rgb)
44
+ @return (.2126 * nth($rgba2, 1) + .7152 * nth($rgba2, 2) + .0722 * nth($rgba2, 3))*100
51
45
  @else
52
- @return if(luma($color-1) < 51, dark, bright)
46
+ @return $color
47
+
53
48
 
54
49
  @function luma_value($color-1, $color-2: null)
55
50
  @if $color-2
@@ -72,17 +67,11 @@
72
67
  @else
73
68
  @return null
74
69
 
70
+ $luma-contrast-bright-color: $dark-text !default
71
+ $luma-contrast-dark-color: $bright-text !default
72
+
75
73
  @function luma_contrast_color($color)
76
74
  @if luma_bright($color)
77
- @return $luma-contrast-bright-color
78
- @else
79
- @return $luma-contrast-dark-color
80
-
81
- @function luma_add_contrast($background-color, $candidate-color)
82
- @if luma_contrast($background-color, $candidate-color)
83
- @return $candidate-color
75
+ @return if($luma-contrast-bright-color, $luma-contrast-bright-color, white)
84
76
  @else
85
- @if luma_dark($background-color)
86
- @return tint($candidate-color, reverse(percentage(luma_value($background-color, $candidate-color)*0.01))/1.618)
87
- @else
88
- @return shade($candidate-color, reverse(percentage(luma_value($background-color, $candidate-color)*0.01))/1.618)
77
+ @return if($luma-contrast-dark-color, $luma-contrast-dark-color, black)
data/app/assets/stylesheets/settings/variables/_default.sass CHANGED
@@ -53,14 +53,6 @@ $basic-fonts: $basic-sans-serif !default
53
53
 
54
54
  $default-text: #444444 !default
55
55
  $reversal-text: white !default
56
- $bright-text-color: $reversal-text !default
57
- $dark-text-color: $default-text !default
56
+ $bright-text: $reversal-text !default
57
+ $dark-text: $default-text !default
58
58
  $text-input-color: $default-text !default
59
-
60
- /////////////////
61
- // luma contrast color
62
- ////////////////
63
-
64
- $luma-threshold: 13 !default
65
- $luma-contrast-bright-color: $default-text !default
66
- $luma-contrast-dark-color: $reversal-text !default
data/app/assets/stylesheets/settings/variables/_modules.sass CHANGED
@@ -34,6 +34,8 @@ $twitter: #55acee !default
34
34
  $facebook: #3b5998 !default
35
35
  $hatena: #008FDE !default
36
36
  $pocket: #f23c53 !default
37
+ $line: #2cbf20 !default
38
+ $google-plus: #f14c2a !default
37
39
 
38
40
  /////////////////
39
41
  // tab navs
data/bower.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.7",
3
+ "version": "0.12.8",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
data/lib/oulu/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oulu
2
- VERSION = "0.12.7"
2
+ VERSION = "0.12.8"
3
3
  end
data/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "oulu",
3
- "version": "0.12.7",
3
+ "version": "0.12.8",
4
4
  "main": "index.js",
5
5
  "repository": {
6
6
  "type": "git",
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.12.7
4
+ version: 0.12.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - machida
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-04 00:00:00.000000000 Z
11
+ date: 2016-07-12 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor