From 5441766c3cba46682227202e91e08c4fbb3e3ac3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 4 Oct 2018 18:27:27 +0300
Subject: [PATCH] fix

---
 .../style_switcher/style_switcher.js          | 21 ++------------
 src/services/style_setter/style_setter.js     | 28 ++++---------------
 2 files changed, 7 insertions(+), 42 deletions(-)

diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js
index 7c204bdb..a1c44be3 100644
--- a/src/components/style_switcher/style_switcher.js
+++ b/src/components/style_switcher/style_switcher.js
@@ -228,26 +228,9 @@ export default {
       const colors = input.colors || input
       const radii = input.radii || input
 
-      if (version === 0) {
-        if (input.version) version = input.version
-        // Old v1 naming: fg is text, btn is foreground
-        if (typeof input.text === 'undefined' && typeof input.fg !== 'undefined') {
-          version = 1
-        }
-        // New v2 naming: text is text, fg is foreground
-        if (typeof input.text !== 'undefined' && typeof input.fg !== 'undefined') {
-          version = 2
-        }
-      }
-
       this.bgColorLocal = rgb2hex(colors.bg)
-      if (version === 1) {
-        this.fgColorLocal = rgb2hex(colors.btn)
-        this.textColorLocal = rgb2hex(colors.fg)
-      } else {
-        this.fgColorLocal = rgb2hex(colors.fg)
-        this.textColorLocal = rgb2hex(colors.text)
-      }
+      this.fgColorLocal = rgb2hex(colors.fg)
+      this.textColorLocal = rgb2hex(colors.text)
       this.linkColorLocal = rgb2hex(colors.link)
 
       if (version === 1) {
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 54f54b4e..cfa41b11 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -110,40 +110,22 @@ const generatePreset = (input) => {
     return acc
   }, {})
 
-  let version = 0
-
-  if (input.version) {
-    version = input.version
-  }
-  // Old v1 naming: fg is text, btn is foreground
-  if (typeof col.text === 'undefined' && typeof col.fg !== 'undefined') {
-    version = 1
-  }
-  // New v2 naming: text is text, fg is foreground
-  if (typeof col.text !== 'undefined' && typeof col.fg !== 'undefined') {
-    version = 2
-  }
-
-  colors.text = version === 1 ? col.fg : col.text
+  colors.text = col.text
   colors.lightText = colors.text
 
   colors.bg = col.bg
   colors.lightBg = col.lightBg || brightness(5, colors.bg).rgb
 
-  colors.fg = version === 1 ? col.btn : col.fg
-  console.log('BENIN')
-  console.log(version)
-  console.log(col)
-  console.log(colors.text)
+  colors.fg = col.fg
   colors.fgText = getTextColor(colors.fg, colors.text)
 
-  colors.btn = col.btn || { r: 0, g: 0, b: 0 }
+  colors.btn = col.btn || col.fg
   colors.btnText = getTextColor(colors.btn, colors.text)
 
-  colors.panel = col.panel || col.btn
+  colors.panel = col.panel || col.fg
   colors.panelText = getTextColor(colors.panel, colors.text)
 
-  colors.topBar = col.topBar || col.btn
+  colors.topBar = col.topBar || col.fg
   colors.topBarText = getTextColor(colors.topBar, colors.text)
 
   colors.input = col.input || Object.assign({ a: 0.5 }, col.btn)