color-schemer 0.2.2 → 0.2.3

data/lib/color-schemer.rb

@@ -4,7 +4,7 @@ Compass::Frameworks.register("color-schemer", :path => "#{File.dirname(__FILE__)
 
 module ColorSchemer
   
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
   DATE = "2011-09-15"
 
 end

data/stylesheets/color-schemer/_colorblind.scss

@@ -1,45 +1,20 @@
 @function cs-colorblind($color, $mode: $cs-colorblind) {
 
-  $severity: 66%;
+  // Refrence: http://www.w3.org/TR/AERT#color-contrast
 
-  // Protanopia - no red
-  @if $mode == protanopia {
-    @return $color - #f00;
-  }
-
-  // Deuteranopia - no green
+  // Deuteranopia
   @if $mode == deuteranopia {
-    @return $color - #0f0;
-  }
-
-  // Tritanopia - no blue
-  @if $mode == tritanopia {
-    @return $color - #00f;
-  }
-
-  // Protanomaly - low red
-  @if $mode == protanomaly {
-    @return $color - shade(#f00, 100% - $severity);
-  }
-
-  // Deuteranomaly - low green
-  @if $mode == deuteranomaly {
-    @return $color - shade(#0f0, 100% - $severity);
-  }
-
-  // Tritanomaly - low blue
-  @if $mode == tritanomaly {
-    @return $color - shade(#00f, 100% - $severity);
+    @return $color;
   }
 
-  // Typical Monochromacy
-  @if $mode == monochromacy {
-    @return desaturate($color, 100%);
+  // Protanopia
+  @if $mode == protanopia {
+    @return $color;
   }
 
-  // Atypical Monochromacy
-  @if $mode == amonochromacy {
-    @return desaturate($color, $severity);
+  // Tritanopia
+  @if $mode == tritanopia {
+    @return $color;
   }
 
 

data/stylesheets/color-schemer/_ryb.scss

@@ -11,24 +11,17 @@ $ryb-interpolation: #FF0000 #FF4900 #FF7400 #FF9200 #FFAA00 #FFBF00 #FFD300 #FFE
 }
 
 // Find the RYB hue instead of RGB hue of a color.
-// slow dumb loop at the moment.
-@function ryb-hue($color) {
-
-  // find offset
-  $hue: find-ryb(hue($color)) - hue($color);
 
-  // apply the offset difference
-  $hue: hue($color) - $hue;
+// map of the RYB offset
+$ryb-offset: 0 1 2 3 5 6 7 8 9 10 11 13 14 15 16 17 18 19 19 20 21 21 22 23 23 24 25 25 26 27 27 28 28 29 29 30 30 31 31 32 32 32 33 33 34 34 35 35 35 36 36 37 37 37 38 38 38 39 39 40 40 40 41 41 41 42 42 42 43 43 43 44 44 44 45 45 45 46 46 46 47 47 47 47 48 48 48 49 49 49 50 50 50 51 51 51 52 52 52 53 53 53 54 54 54 55 55 55 56 56 56 57 57 57 58 58 59 59 59 60 60 61 61 62 63 63 64 65 65 66 67 68 68 69 70 70 71 72 72 73 73 74 75 75 76 77 77 78 79 79 80 81 82 82 83 84 85 86 87 88 88 89 90 91 92 93 95 96 98 100 102 104 105 107 109 111 113 115 116 118 120 122 125 127 129 131 134 136 138 141 143 145 147 150 152 154 156 158 159 161 163 165 166 168 170 171 173 175 177 178 180 182 184 185 187 189 191 192 194 196 198 199 201 203 205 206 207 208 209 210 212 213 214 215 216 217 218 219 220 221 222 223 224 226 227 228 229 230 232 233 234 235 236 238 239 240 241 242 243 244 245 246 247 248 249 250 251 251 252 253 254 255 256 257 257 258 259 260 260 261 262 263 264 264 265 266 267 268 268 269 270 271 272 273 274 274 275 276 277 278 279 280 282 283 284 286 287 289 290 292 293 294 296 297 299 300 302 303 305 307 309 310 312 314 316 317 319 321 323 324 326 327 328 329 330 331 332 333 334 336 337 338 339 340 341 342 343 344 345 347 348 349 350 352 353 354 355 356 358 359 360;
 
-  // Make within the range of 360 if not already.
-  @while $hue >= 360deg {
-    $hue: $hue - 360;
-  }
-  @while $hue < 0deg {
-    $hue: $hue + 360;
+// loop through the map to find the matching hue.
+@function ryb-hue($color) {
+  @for $i from 1 through length($ryb-offset) {
+    @if nth($ryb-offset, $i) > hue($color) {
+      @return $i - 2deg;
+    }
   }
-
-  @return $hue;
 }
 
 // Changes the hue of a color.
@@ -42,19 +35,7 @@ $ryb-interpolation: #FF0000 #FF4900 #FF7400 #FF9200 #FFAA00 #FFBF00 #FFD300 #FFE
   // Start at the current hue and loop in the adjustment.
   $hue-adjust: (ryb-hue($color) + $degrees) / 1deg;
 
-  $lightness: lightness($color);
-  $saturation: saturation($color);
-
-  // Set hue of new color
-  $new-color: set-hue(red, hue(cs-interpolate($hue-adjust)));
-
-  // Add back lightness
-  $new-color: set-lightness($new-color, $lightness);
-
-  // Add back saturation
-  $new-color: set-saturation($new-color, $saturation);
-
-  @return $new-color;
+  @return hsl(hue(cs-interpolate($hue-adjust)), saturation($color), lightness($color));
 }
 
 @function ryba($red, $yellow, $blue, $alpha) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: color-schemer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors: