Merge remote-tracking branch 'origin/master'

This commit is contained in:
2021-08-20 14:48:39 -06:00
10 changed files with 27 additions and 24 deletions

View File

@@ -266,10 +266,11 @@
@define-color white #FFFFFF;
@define-color active-window-color @white;
@define-color urgent-window-color @;
@define-color font-color @base5;
@define-color urgent-window-color @blue-grey;
@define-color font-color @white;
@define-color font-shadow-color @black;
@define-color menu-background-color @white;
@define-color menu-font-color @black;
@define-color bar-background @base0;
@define-color bar-background @pink-darken-4;
@define-color accent @red;
@define-color menu-highlight @magenta;
@define-color menu-highlight @deep-orange;

View File

@@ -10,7 +10,7 @@
font-size: 10pt;
font-weight: bold;
color: @font-color;
text-shadow: 2px 2px @black;
text-shadow: 1px 1px @font-shadow-color;
}
.taffy-box {
@@ -45,11 +45,9 @@
padding-left: 2px;
padding-top: 0px;
font-size: 10pt;
color: @white;
opacity: 1;
font-weight: bold;
transition: color .5s;
text-shadow: 2px 2px @black;
}
.contents .window-icon {

View File

@@ -134,7 +134,7 @@ cssFilesByHostname =
main = do
hostName <- getHostName
homeDirectory <- getHomeDirectory
let relativeFiles = fromMaybe ["gotham.css", "taffybar.css"] $ lookup hostName cssFilesByHostname
let relativeFiles = fromMaybe ["taffybar.css"] $ lookup hostName cssFilesByHostname
cssFiles <- mapM (getUserConfigFile "taffybar") relativeFiles
let myCPU = deocrateWithSetClassAndBoxes "cpu" $