From 653e9bc8dcb61f1f2c42a0bec33f609a113b4ff7 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 27 Oct 2017 13:42:21 -0700
Subject: [PATCH] [taffybar] Update looks

---
 dotfiles/config/taffybar/taffybar     |   2 +-
 dotfiles/config/taffybar/taffybar.css | 101 ++++++++++++++------------
 dotfiles/config/taffybar/taffybar.hs  |   4 +-
 3 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index 103897e8..eedefa10 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit 103897e89fb76147b04d7c8d9bce321ea8882d79
+Subproject commit eedefa10c8bf35a1f31602b49f3cb6456035693c
diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css
index 6e70409c..85f04985 100644
--- a/dotfiles/config/taffybar/taffybar.css
+++ b/dotfiles/config/taffybar/taffybar.css
@@ -1,68 +1,73 @@
-@define-color taffybar_bg_color #000000;
-@define-color taffybar_bg_tone #212121;
-@define-color taffybar_active_window_color rgba(255, 255, 255, .5);
-
-.IconContainer {
-	border-radius: 5px;
-}
-
-.IconImage {
-	padding: 2px;
-}
-
-.IconContainer {
-	transition: background-color .5s, opacity.5s;
-	opacity: 1;
-	background-color: @taffybar-bg-tone;
-}
-
-.IconContainer.Urgent {
-	transition: background-color .5s;
-	background-color: #ff0000;
-}
-
-.IconContainer.Active {
-	transition: background-color .5s;
-	background-color: @taffybar_active_window_color;
-}
-
-.IconContainer.Minimized .IconImage {
-	transition: opacity .5s;
-	opacity: .3;
-}
+@define-color bg-color #000000;
+@define-color bg-tone #1E1E20;
+@define-color active-window-color #374140;
+@define-color urgent-window-color #D9CB9E;
+@define-color font-color #D9CB9E;
 
 .Contents {
 	border-radius: 5px;
 	padding: 3px;
 }
 
-.Contents.Cpu {
-}
-
 .Active .Contents, .Visible .Contents {
-	background-color: @taffybar_bg_tone;
+	background-color: @bg-tone;
 }
 
 .InnerPad {
 	padding: 4px;
 }
 
-.Taffybar {
-	background-color: @taffybar_bg_color;
-	border-radius: 5px;
-}
-
-.Taffybar * {
-	font-family: "Fira Sans", sans-serif;
-	font-size: 10pt;
-}
-
 .WorkspaceLabel {
 	padding-right: 3px;
 	padding-left: 2px;
 	font-size: 12pt;
 }
 
-#WindowSwitcher {
-	background-color: @taffybar_bg_color;
+.IconContainer {
+	transition: background-color .5s;
+	border-radius: 5px;
+}
+
+@keyframes spin {
+  to { -gtk-icon-transform: rotate(1turn); }
+}
+
+.IconContainer.Active {
+	transition: background-color .5s;
+	background-color: @active-window-color;
+}
+
+.IconContainer.Urgent {
+	transition: background-color .5s;
+	background-color: @urgent-window-color;
+	animation-name: spin;
+	animation-duration: 1s;
+	animation-timing-function: linear;
+	animation-iteration-count: infinite;
+}
+
+.IconContainer.Minimized .IconImage {
+	transition: opacity .5s;
+	opacity: .3;
+}
+
+.IconImage {
+	transition: opacity .5s;
+	padding: 2px;
+	opacity: 1;
+}
+
+#WindowSwitcher, #Taffybar_WindowSwitcher {
+	background-color: @bg-color;
+}
+
+.Taffybar {
+	background-color: @bg-color;
+	border-radius: 5px;
+}
+
+.Taffybar * {
+	font-family: "Fira Sans", sans-serif;
+	font-size: 10pt;
+	color: @font-color;
 }
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index bc2476b3..7ee106fe 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -211,7 +211,7 @@ main = do
         , showWorkspaceFn = hideEmpty
         , updateRateLimitMicroseconds = 100000
         , updateOnWMIconChange = True
-        , debugMode = False
+        , debugMode = True
         , labelSetter = workspaceNamesLabelSetter
         }
       netMonitor = netMonitorMultiNew 1.5 interfaceNames
@@ -230,7 +230,7 @@ main = do
         , endWidgets =
             [ batteryBarNew defaultBatteryConfig 1.0
             , makeContents clock "Cpu"
-            -- , systrayNew
+            , makeContents systrayNew "Cpu"
             , makeContents cpu "Cpu"
             , makeContents mem "Cpu"
             , makeContents netMonitor "Cpu"