reverted back to sass; resorted colors

Gruntfile.js

@@ -134,12 +134,14 @@ module.exports = function(grunt) {
             },
             all: ['app/scripts/**/*.js']
         },
-        compass: {
+        sass: {
+            options: {
+                sourceMap: false,
+                includePaths: ['./bower_components']
+            },
             dist: {
-                options: {
-                    sassDir: 'app/styles',
-                    cssDir: 'tmp/css',
-                    importPath: ['./bower_components']
+                files: {
+                    'tmp/css/main.css': 'app/styles/main.scss'
                 }
             }
         },
@@ -288,7 +290,7 @@ module.exports = function(grunt) {
             },
             styles: {
                 files: 'app/styles/**/*.scss',
-                tasks: ['compass']
+                tasks: ['sass']
             },
             indexhtml: {
                 files: 'app/index.html',
@@ -449,7 +451,7 @@ module.exports = function(grunt) {
         'copy:fonts',
         'webpack',
         'uglify',
-        'compass',
+        'sass',
         'postcss',
         'inline',
         'htmlmin',

app/scripts/views/settings/settings-general-view.js

@@ -46,12 +46,12 @@ var SettingsGeneralView = Backbone.View.extend({
     views: null,
 
     allThemes: {
-        db: Locale.setGenThemeDb,
         fb: Locale.setGenThemeFb,
-        hc: Locale.setGenThemeHc,
+        db: Locale.setGenThemeDb,
         sd: Locale.setGenThemeSd,
         sl: Locale.setGenThemeSl,
-        wh: Locale.setGenThemeWh
+        wh: Locale.setGenThemeWh,
+        hc: Locale.setGenThemeHc,
     },
 
     initialize: function() {

app/styles/base/_colors.scss

@@ -1,5 +1,3 @@
-@import "compass/utilities/color/contrast";
-
 // Named colors
 $black: #111;
 $white: #d8e5f1;
@@ -22,7 +20,11 @@ $violet: #d946db;
 @function muted-color-border() { @return mix(medium-color(), background-color(), th(mute-percent) / 2); }
 @function text-selection-bg-color() { @return rgba(action-color(), .3); }
 @function text-selection-bg-color-error() { @return rgba(error-color(), .8); }
-@function text-contrast-color($bg) { @return contrast-color($bg, text-color(), background-color()); }
+@function text-contrast-color($bg) {
+  @if ($bg == background-color()) { @return text-color(); }
+  @if (lightness($bg) - th(color-lightness-shift) >= lightness(background-color())) { @return text-color(); }
+  @else { @return background-color(); }
+}
 
 // Borders, shadows
 @function base-border-color() { @return mix(medium-color(), background-color(), 50%); }

app/styles/main.scss

@@ -1,4 +1,4 @@
-@import "../bower_components/normalize.css/normalize.css";
+@import "../bower_components/normalize.css/normalize";
 @import "../bower_components/font-awesome/scss/font-awesome";
 @import "../bower_components/pikaday/scss/pikaday";
 @import "../bower_components/bourbon/app/assets/stylesheets/bourbon";

app/styles/themes/_solarized-dark.scss

@@ -6,6 +6,6 @@ $themes: map-merge($themes, (
     action-color: #859900,
     error-color: #DC322F,
     mute-percent: 60%,
-    light-border-percent: 10%,
+    color-lightness-shift: 50%,
   ))
 ));

app/styles/themes/_solarized-light.scss

@@ -6,6 +6,5 @@ $themes: map-merge($themes, (
     action-color: #859900,
     error-color: #DC322F,
     mute-percent: 60%,
-    light-border-percent: 10%,
   ))
 ));

app/styles/themes/_theme-defaults.scss

@@ -2,4 +2,5 @@ $theme-defaults: (
   mute-percent: 30%,
   light-border-percent: 10%,
   modal-opacity: .9,
+  color-lightness-shift: 0,
 )

package.json

@@ -19,7 +19,6 @@
     "grunt": "1.0.1",
     "grunt-bower-install-simple": "1.2.3",
     "grunt-contrib-clean": "1.0.0",
-    "grunt-contrib-compass": "1.1.1",
     "grunt-contrib-compress": "1.3.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-deb": "github:keeweb/grunt-contrib-deb#ddb2ef4",
@@ -31,6 +30,7 @@
     "grunt-gitinfo": "0.1.8",
     "grunt-inline-alt": "0.3.10",
     "grunt-postcss": "0.8.0",
+    "grunt-sass": "1.2.0",
     "grunt-string-replace": "1.2.1",
     "grunt-webpack": "1.0.11",
     "handlebars": "4.0.5",