From be491aee5273e22db046acce24f17d31a2b39f20 Mon Sep 17 00:00:00 2001
From: Antelle <dmitryvit@gmail.com>
Date: Sat, 31 Oct 2015 09:15:17 +0300
Subject: [PATCH] contrast text color on buttons

---
 app/scripts/app.js            | 7 ++++++-
 app/styles/base/_buttons.scss | 4 ++--
 app/styles/base/_colors.scss  | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/scripts/app.js b/app/scripts/app.js
index d013e834..dc79afd4 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -14,6 +14,12 @@ $(function() {
         return;
     }
     KeyHandler.init();
+
+    var appModel = new AppModel();
+    if (appModel.settings.get('theme')) {
+        document.body.setAttribute('class', 'th-' + appModel.settings.get('theme'));
+    }
+
     if (['https:', 'file:', 'app:'].indexOf(location.protocol) < 0) {
         Alerts.error({ header: 'Not Secure!', icon: 'user-secret', esc: false, enter: false, click: false,
             body: 'You have loaded this app with insecure connection. ' +
@@ -31,7 +37,6 @@ $(function() {
     }
 
     function showApp() {
-        var appModel = new AppModel();
         new AppView({ model: appModel }).render().showOpenFile(appModel.settings.get('lastOpenFile'));
     }
 });
diff --git a/app/styles/base/_buttons.scss b/app/styles/base/_buttons.scss
index 1f93a135..4365a515 100644
--- a/app/styles/base/_buttons.scss
+++ b/app/styles/base/_buttons.scss
@@ -20,11 +20,12 @@
   @include th {
     border: 1px solid action-color();
     background-color: action-color();
-    color: text-color();
+    color: text-contrast-color(action-color());
 
     &.btn-error, &.btn-silent {
       border-color: base-border-color();
       background-color: transparent;
+      color: text-contrast-color(background-color());
     }
 
     &:hover {
@@ -38,7 +39,6 @@
         border-color: action-background-color-focus();
         background-color: rgba(action-background-color-focus(), .1);
       }
-      color: text-color();
     }
 
     &:active {
diff --git a/app/styles/base/_colors.scss b/app/styles/base/_colors.scss
index 71e95939..b0bb17b4 100644
--- a/app/styles/base/_colors.scss
+++ b/app/styles/base/_colors.scss
@@ -20,6 +20,7 @@ $violet: #d946db;
 @function muted-color-border() { @return mix(medium-color(), background-color(), 15%); }
 @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) { @if (lightness($bg) >= lightness(background-color())) { @return text-color(); } @else { @return background-color(); } }
 
 // Borders, shadows