treewide: update styles

Stop using restricted license Product Sans in favor of similar-looking Lexend.
fufexan · Aug 16, 2023 · 28af8b3 · 28af8b3
1 parent 7527f87
commit 28af8b3
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/home/programs/eww/README.md b/home/programs/eww/README.md
@@ -60,7 +60,7 @@ them in `~/.config/eww`. Then run `eww daemon` and `eww open bar`. Enjoy!
 Dependencies:
 - Icon fonts: [Material Symbols Outlined](https://github.com/google/material-design-icons/tree/master/variablefont)
 (any variation can be used as long as you change the `font-family` property of `.icon`)
-- Text font: [Product Sans](https://befonts.com/product-sans-font.html)
+- Text font: Lexend
 - Script deps: everything in `default.nix`'s `dependencies` list.
 - [gross](https://github.com/fufexan/gross)
 

diff --git a/home/programs/eww/css/general.scss b/home/programs/eww/css/general.scss
@@ -10,7 +10,7 @@
 }
 
 @mixin border {
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 0 1px rgba(0, 0, 0, .4);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 0 1px rgba(0, 0, 0, .5);
 }
 
 @mixin window-box {

diff --git a/home/programs/files/default.nix b/home/programs/files/default.nix
@@ -1,9 +1,4 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}:
+{pkgs, ...}:
 # manage files in ~
 {
   imports = [
@@ -21,14 +16,4 @@
       hash = "sha256-KnXUnp2sAolP7XOpNhX2g8m26josrqfTycPIBifS90Y=";
     };
   };
-
-  # Product Sans font
-  home.file."${config.xdg.dataHome}/fonts/ProductSans".source = lib.cleanSourceWith {
-    filter = name: _: (lib.hasSuffix ".ttf" (baseNameOf (toString name)));
-    src = pkgs.fetchzip {
-      url = "https://befonts.com/wp-content/uploads/2018/08/product-sans.zip";
-      sha256 = "sha256-PF2n4d9+t1vscpCRWZ0CR3X0XBefzL9BAkLHoqWFZR4=";
-      stripRoot = false;
-    };
-  };
 }
diff --git a/home/programs/files/wlogout.nix b/home/programs/files/wlogout.nix
@@ -11,18 +11,18 @@
 in {
   xdg.configFile."wlogout/style.css".text = ''
     * {
-      background-image: none;
-      font-family: "Product Sans", Roboto, sans-serif;
+      background: none;
+      font-family: Lexend, sans-serif;
     }
 
     window {
     	background-color: rgba(0, 0, 0, .5);
     }
 
     button {
-      background: unset;
+      background: rgba(0, 0, 0, .05);
       border-radius: 8px;
-      box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 rgba(0, 0, 0, .4);
+      box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 rgba(0, 0, 0, .5);
       margin: 1rem;
       background-repeat: no-repeat;
       background-position: center;

diff --git a/home/wayland/anyrun.nix b/home/wayland/anyrun.nix
@@ -26,41 +26,57 @@
 
     extraCss = ''
       * {
-        font-family: Product Sans;
+        all: unset;
+        font-family: Lexend;
         font-size: 1.3rem;
       }
 
       #window,
       #match,
       #entry,
       #plugin,
-      #main {
-        background: transparent;
-      }
+      #main { background: transparent; }
 
-      .vertical > list > row:first-child {
-        margin-top: 5px;
+      #match.activatable {
+        border-radius: 16px;
+        padding: .3rem .9rem;
+        margin-top: .01rem;
       }
+      #match.activatable:first-child { margin-top: .7rem; }
+      #match.activatable:last-child { margin-bottom: .6rem; }
 
-      #match {
-        margin: 1px;
-        padding: 2px;
-        border-radius: 14px;
+      #plugin:hover #match.activatable {
+        border-radius: 10px;
+        padding: .3rem;
+        margin-top: .01rem;
+        margin-bottom: 0;
       }
 
       #match:selected, #match:hover, #plugin:hover {
         background: rgba(255, 255, 255, .1);
       }
 
-      #entry, #plugin:hover {
+      #entry {
+        background: rgba(255,255,255,.05);
+        border: 1px solid rgba(255,255,255,.1);
+        border-radius: 16px;
+        margin: .3rem;
+        padding: .3rem 1rem;
+      }
+
+      list > #plugin {
         border-radius: 16px;
+        margin: 0 .3rem;
       }
+      list > #plugin:first-child { margin-top: .3rem; }
+      list > #plugin:last-child { margin-bottom: .3rem; }
+      list > #plugin:hover { padding: .6rem; }
 
       box#main {
-        background: rgba(0, 0, 0, .3);
-        box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 0 1px rgba(0, 0, 0, .4);
+        background: rgba(0, 0, 0, .5);
+        box-shadow: inset 0 0 0 1px rgba(255, 255, 255, .1), 0 0 0 1px rgba(0, 0, 0, .5);
         border-radius: 24px;
-        padding: 8px;
+        padding: .3rem;
       }
     '';
 

diff --git a/home/wayland/gtklock.nix b/home/wayland/gtklock.nix
@@ -3,8 +3,8 @@
 
   xdg.configFile."gtklock/style.css".text = ''
     window {
-      background: rgba(0,0,0,.5);
-      font-family: Product Sans;
+      background: rgba(0, 0, 0, .5);
+      font-family: Lexend;
     }
 
     grid > label {
@@ -21,13 +21,13 @@
     #clock-label {
       font-size: 6rem;
       margin-bottom: 4rem;
-      text-shadow: 0px 2px 10px rgba(0,0,0,.1);
+      text-shadow: 0px 2px 10px rgba(0, 0, 0, .1);
     }
 
     entry {
       border-radius: 16px;
       margin: 6rem;
-      box-shadow: 0 1px 3px rgba(0,0,0,.1);
+      box-shadow: 0 1px 3px rgba(0, 0, 0, .1);
     }
   '';
 }
diff --git a/home/wayland/hyprland/config.nix b/home/wayland/hyprland/config.nix
@@ -84,7 +84,7 @@ in {
     }
 
     decoration {
-      rounding = 8
+      rounding = 16
       blur {
         enabled = true
         size = 10
@@ -148,9 +148,8 @@ in {
 
     $layers = ^(eww-.+|bar|system-menu|anyrun|gtk-layer-shell)$
     layerrule = blur, $layers
-    layerrule = ignorealpha 0.2, $layers
-    layerrule = ignorealpha 0.5, ^(eww-music)$
-    layerrule = ignorealpha 0.1, ^(bar)$
+    layerrule = ignorealpha 0, $layers
+    layerrule = ignorealpha 0.5, ^(eww-(music|calendar)|system-menu)$
     layerrule = xray 1, ^(bar|gtk-layer-shell)$
 
     # mouse movements