From 5fec5c48aa5bc9726b7eee779344bda03213c2b6 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Tue, 15 May 2018 17:59:53 -0700
Subject: [PATCH] [taffybar] Bump version of taffybar

---
 dotfiles/config/taffybar/taffybar     | 2 +-
 dotfiles/config/taffybar/taffybar.css | 6 +++---
 dotfiles/config/taffybar/taffybar.hs  | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dotfiles/config/taffybar/taffybar b/dotfiles/config/taffybar/taffybar
index d1766409..6b1f3732 160000
--- a/dotfiles/config/taffybar/taffybar
+++ b/dotfiles/config/taffybar/taffybar
@@ -1 +1 @@
-Subproject commit d1766409bc4c1e9faa1d869eb928144dad443250
+Subproject commit 6b1f3732ce5af9c8383585ad277c9866d459c9f4
diff --git a/dotfiles/config/taffybar/taffybar.css b/dotfiles/config/taffybar/taffybar.css
index 06a86a7b..3fda2aa4 100644
--- a/dotfiles/config/taffybar/taffybar.css
+++ b/dotfiles/config/taffybar/taffybar.css
@@ -16,7 +16,7 @@
 	border-color: rgba(1.0, 1.0, 1.0, 0.0);
 }
 
-.Active .WorkspaceContents, .Visible .WorkspaceContents {
+.Active .Contents, .Visible .Contents {
 	background-color: rgba(0.0, 0.0, 0.0, 0.5);
 }
 
@@ -96,7 +96,7 @@
 .IconContainer {
 	border-bottom: 0px;
 	transition: opacity .5s, box-shadow 1s;
-	padding-bottom: 2px;
+	padding-bottom: 4px;
 	opacity: 1;
 }
 
@@ -105,7 +105,7 @@
 	/* background-color: rgba(255, 255, 255, 0.3); */
 	border-radius: 0px;
 	opacity: 1;
-	box-shadow: inset 0 -3px #FFFFFF;
+	box-shadow: inset 0 -2px #FFFFFF;
 }
 
 .IconContainer.Urgent {
diff --git a/dotfiles/config/taffybar/taffybar.hs b/dotfiles/config/taffybar/taffybar.hs
index 770ac8df..5e983325 100644
--- a/dotfiles/config/taffybar/taffybar.hs
+++ b/dotfiles/config/taffybar/taffybar.hs
@@ -210,8 +210,6 @@ main = do
       mpris = mpris2New
       cpu = pollingGraphNew cpuCfg 0.5 cpuCallback
       mem = pollingGraphNew memCfg 1 memCallback
-      battery = batteryBarNewWithFormat defaultBatteryConfig
-                "$percentage$% ($time$) - $status$" 1.0
       myWorkspacesConfig =
         defaultWorkspacesConfig
         { underlineHeight = 3
@@ -232,13 +230,12 @@ main = do
             , wnd >>= buildPadBox
             ]
         , endWidgets = map (>>= buildPadBoxNoShrink)
-          [ battery
-          , clock >>= setMinWidth 200
+          [ clock >>= setMinWidth 200
           , sniTrayNew
           , github
           , cpu
           , mem
-          , netMonitorGraphNew netCfg Nothing
+          , networkGraphNew netCfg Nothing
           -- , networkMonitorNew defaultNetFormat Nothing >>= setMinWidth 200
           , fsMonitorNew 60 ["/dev/sdd2"]
           , mpris