ags: sync

- workspace indicator: no more goofy notch, now cairo-drawn to ensure accuracy and maintain animations
- made notification icons a bit smaller
This commit is contained in:
end-4
2023-12-30 21:17:14 +07:00
parent 89fe9488b9
commit 7d4374d52b
17 changed files with 694 additions and 809 deletions
+48 -136
View File
@@ -1,27 +1,16 @@
// Made to be pixel-perfect with 11pt font size
// 1rem = 11pt = 14.6666666667px
// Init
$black: black;
$white: white;
$notchSecondaryContainer: $secondaryContainer;
$notchOnSecondaryContainer: $onSecondaryContainer;
$notchPrimary: $primary;
$notchOnPrimary: $onPrimary;
$bar_ws_width: 1.774rem;
// Check dark mode. Set colors accordingly for the fake snotch that's always black
@if $darkmode ==true {
$notchSecondaryContainer: $secondaryContainer;
$notchOnSecondaryContainer: $onSecondaryContainer;
$notchPrimary: $primary;
$notchOnPrimary: $onPrimary;
@mixin bar-group-rounding {
@include small-rounding;
}
@else {
$notchSecondaryContainer: $onSecondaryContainer;
$notchOnSecondaryContainer: $secondaryContainer;
$notchPrimary: $primaryContainer;
$notchOnPrimary: $onPrimaryContainer;
.bar-height {
min-height: 2.727rem;
}
.bar-bg {
@@ -34,31 +23,16 @@ $notchOnPrimary: $onPrimary;
}
.bar-group-margin {
padding: 0.2rem;
padding: 0.273rem 0rem;
}
.bar-group {
// @include elevation-border;
background-color: $t_surface;
}
.bar-group-center {
border-bottom-left-radius: 1.364rem;
border-bottom-right-radius: 1.364rem;
padding: 0.2rem;
// background-color: $t_surface;
background-color: $black; // Hard code: fake notch
}
.corner-bar-group {
border-radius: 1.364rem; // Half of bar height
border-width: 0.068rem;
// background-color: $t_surface;
background-color: $black; // Hard code: fake notch
background-color: $l_l_t_surfaceVariant;
}
.bar-group-pad {
padding: 0rem 1.023rem;
// padding: 0rem 1.023rem;
padding: 0.205rem;
}
.bar-group-pad-less {
@@ -94,7 +68,7 @@ $notchOnPrimary: $onPrimary;
}
.bar-group-standalone {
border-radius: 1.364rem;
@include bar-group-rounding;
-gtk-outline-radius: 1.364rem;
}
@@ -123,7 +97,28 @@ $notchOnPrimary: $onPrimary;
}
.bar-ws-width {
min-width: 18.614rem;
min-width: 18.341rem;
}
.bar-ws {
min-width: $bar_ws_width;
color: mix($onBackground, $background, 40%);
@if $darkmode ==true {
color: mix($onBackground, $background, 45%);
}
}
.bar-ws-active {
background-color: $secondaryContainer;
color: $onSecondaryContainer;
}
.bar-ws-occupied {
background-color: mix($surfaceVariant, $primary, 89%);
@if $darkmode ==true {
background-color: $surfaceVariant;
}
color: $onSurfaceVariant;
}
.bar-separator {
@@ -146,95 +141,12 @@ $notchOnPrimary: $onPrimary;
color: $onBackground;
}
.bar-ws {
min-height: 1.636rem;
min-width: 1.772rem;
font-size: 1.091rem;
@include mainfont;
border-top: 0.068rem solid;
border-bottom: 0.068rem solid;
border-color: transparent;
color: $white;
}
.bar-ws-active-box {
transition: 100ms cubic-bezier(0.05, 0.7, 0.1, 1);
}
.bar-ws-active {
min-height: 1.5rem;
min-width: 1.5rem;
font-size: 1.091rem;
@include mainfont;
background-color: $notchPrimary;
color: $notchOnPrimary;
border-radius: 999px;
margin: 0.068rem;
// background-color: red;
}
.bar-ws-active-middledecor {
min-width: 0.682rem;
min-height: 0.682rem;
border-radius: 9999px;
background-color: $black;
margin: 0rem 0.409rem;
}
.bar-ws-occupied {
background-color: $notchSecondaryContainer;
color: $notchOnSecondaryContainer;
min-width: 1.772rem;
border-top: 0.068rem solid $notchOnSecondaryContainer;
border-bottom: 0.068rem solid $notchOnSecondaryContainer;
}
.bar-ws-occupied-left {
background-color: $notchSecondaryContainer;
color: $notchOnSecondaryContainer;
min-width: 1.704rem;
border-top-left-radius: 999px;
border-bottom-left-radius: 999px;
border-left: 0.068rem solid $notchOnSecondaryContainer;
border-top: 0.068rem solid $notchOnSecondaryContainer;
border-bottom: 0.068rem solid $notchOnSecondaryContainer;
border-right: 0px solid transparent;
}
.bar-ws-occupied-right {
background-color: $notchSecondaryContainer;
color: $notchOnSecondaryContainer;
min-width: 1.704rem;
border-top-right-radius: 999px;
border-bottom-right-radius: 999px;
border-right: 0.068rem solid $notchOnSecondaryContainer;
border-top: 0.068rem solid $notchOnSecondaryContainer;
border-bottom: 0.068rem solid $notchOnSecondaryContainer;
border-left: 0px solid transparent;
}
.bar-ws-occupied-left-right {
@include full-rounding;
background-color: $notchSecondaryContainer;
color: $notchOnSecondaryContainer;
min-width: 1.636rem;
border: 0.068rem solid $notchOnSecondaryContainer;
}
.bar-ws-empty {
color: $onBackground;
border-color: transparent;
}
.bar-batt {
@include full-rounding;
padding: 0rem 0.341rem;
background-color: $t_secondaryContainer;
color: $t_onSecondaryContainer;
// border: 1px solid $onSecondaryContainer;
// border: 0.068rem solid $outline;
}
.bar-sidemodule {
@@ -262,8 +174,8 @@ $notchOnPrimary: $onPrimary;
}
.bar-music-playstate {
min-height: 1.770rem;
min-width: 1.770rem;
min-height: 1.77rem;
min-width: 1.77rem;
border-radius: 10rem;
background-color: $secondaryContainer;
color: $onSecondaryContainer;
@@ -272,15 +184,15 @@ $notchOnPrimary: $onPrimary;
.bar-music-circprog {
@include fluent_decel_long;
min-width: 0.068rem; // line width
min-height: 1.770rem;
min-height: 1.636rem;
padding: 0rem;
background-color: $secondaryContainer;
color: $onSecondaryContainer;
}
.bar-music-playstate-playing {
min-height: 1.770rem;
min-width: 1.770rem;
min-height: 1.77rem;
min-width: 1.77rem;
border-radius: 10rem;
background-color: $secondaryContainer;
color: $onSecondaryContainer;
@@ -363,8 +275,8 @@ $notchOnPrimary: $onPrimary;
}
progress {
min-height: 0.680rem;
min-width: 0.680rem;
min-height: 0.68rem;
min-width: 0.68rem;
margin: 0rem 0.137rem;
border-radius: 10rem;
background-color: $t_onSecondaryContainer;
@@ -424,7 +336,7 @@ $notchOnPrimary: $onPrimary;
}
.corner-black {
background-color: $black; // Hard code because fake screen corner
background-color: $black; // Hard code: fake screen corner
@include large-rounding;
}
@@ -438,17 +350,17 @@ $notchOnPrimary: $onPrimary;
padding: 0.341rem;
}
.bar-space-button>box:first-child {
.bar-space-button > box:first-child {
@include full-rounding;
padding: 0rem 0.682rem;
}
.bar-space-button:hover>box:first-child,
.bar-space-button:focus>box:first-child {
.bar-space-button:hover > box:first-child,
.bar-space-button:focus > box:first-child {
background-color: $hovercolor;
}
.bar-space-button:active>box:first-child {
.bar-space-button:active > box:first-child {
background-color: $activecolor;
}
@@ -458,7 +370,7 @@ $notchOnPrimary: $onPrimary;
}
}
.bar-space-area-rightmost>box {
.bar-space-area-rightmost > box {
padding-right: 2.386rem;
}
@@ -477,7 +389,7 @@ $notchOnPrimary: $onPrimary;
.bar-statusicons {
@include full-rounding;
@include menu_decel;
margin: 0.2rem;
margin: 0.273rem;
padding: 0rem 0.614rem;
}
@@ -487,4 +399,4 @@ $notchOnPrimary: $onPrimary;
.bar-statusicons-active {
background-color: mix($t_background, $t_onBackground, 80%);
}
}
+5 -2
View File
@@ -5,15 +5,18 @@ $transparency_enabled: false;
@if $transparency_enabled ==false {
@if $darkmode ==true {
$primary: mix($primary, white, 70%);
$primaryContainer: mix($primaryContainer, white, 90%);
$background: mix(mix($background, $primary, 94%), #000000, 50%);
$surface: mix($surface, $primaryContainer, 98%);
$surfaceVariant: mix($surfaceVariant, #000000, 55%);
$surfaceVariant: mix($surfaceVariant, #000000, 75%);
// $secondaryContainer: mix($secondaryContainer, $primaryContainer, 90%);
}
@if $darkmode ==false {
$background: mix($background, $primary, 87%);
$surface: mix($surface, $primary, 93%);
$surfaceVariant: mix($surfaceVariant, #FFFFFF, 55%);
$surfaceVariant: mix($surfaceVariant, #FFFFFF, 25%);
}
}
+8
View File
@@ -254,6 +254,14 @@
margin-bottom: 0rem;
}
.spacing-h-4>* {
margin-right: 0.273rem;
}
.spacing-h-4>*:last-child {
margin-right: 0rem;
}
.spacing-h-5>* {
margin-right: 0.341rem;
}
+23 -23
View File
@@ -1,29 +1,29 @@
$darkmode: true;
$primary: #d8baff;
$onPrimary: #3e1b6f;
$primaryContainer: #563587;
$onPrimaryContainer: #eedcff;
$secondary: #cec2da;
$onSecondary: #352d40;
$secondaryContainer: #4b4357;
$onSecondaryContainer: #eaddf7;
$tertiary: #f1b7c2;
$onTertiary: #4a252e;
$tertiaryContainer: #643b44;
$onTertiaryContainer: #ffd9e1;
$primary: #ffabf1;
$onPrimary: #551251;
$primaryContainer: #702c69;
$onPrimaryContainer: #ffd6f5;
$secondary: #dbbed2;
$onSecondary: #3d2b39;
$secondaryContainer: #554050;
$onSecondaryContainer: #f8daee;
$tertiary: #f5b9a6;
$onTertiary: #4c2619;
$tertiaryContainer: #663c2e;
$onTertiaryContainer: #ffdbcf;
$error: #ffb4a9;
$onError: #680003;
$errorContainer: #930006;
$onErrorContainer: #ffb4a9;
$colorbarbg: #111012;
$background: #111012;
$onBackground: #e7e1e6;
$surface: #1d1b1e;
$onSurface: #e7e1e6;
$surfaceVariant: #4a454e;
$onSurfaceVariant: #cbc4ce;
$outline: #958f99;
$colorbarbg: #120F11;
$background: #120F11;
$onBackground: #eae0e4;
$surface: #1f1a1d;
$onSurface: #eae0e4;
$surfaceVariant: #4e444b;
$onSurfaceVariant: #d1c2cb;
$outline: #9a8d95;
$shadow: #000000;
$inverseSurface: #e7e1e6;
$inverseOnSurface: #323033;
$inversePrimary: #6e4da1;
$inverseSurface: #eae0e4;
$inverseOnSurface: #342f32;
$inversePrimary: #8c4483;
+7 -4
View File
@@ -4,11 +4,11 @@
@import './musicwal';
@import './colors';
@import './lib_mixins';
$music_gradient1: mix($color1, $background, 30%);
$music_gradient1: mix($color1, $background, 50%);
@if $darkmode ==true {
$music_gradient1: mix($color1, $background, 30%);
}
// @if $darkmode ==true {
// $music_gradient1: mix($color1, $background, 30%);
// }
$music_gradient2: $color3;
$music_gradient3: $color5;
@@ -17,6 +17,9 @@ $music_extra_transparentize: 0.15;
$secondaryContainer: transparentize(mix(mix($background, $color2, 50%), $color6, 80%), 0.5);
$onSecondaryContainer: mix($color7, $color2, 90%);
@if $darkmode ==false {
$onSecondaryContainer: mix($onSecondaryContainer, black, 50%);
}
.osd-music {
@include menu_decel;
+1 -29
View File
@@ -1,29 +1 @@
$darkmode: true;
$primary: #c4c0ff;
$onPrimary: #251a8c;
$primaryContainer: #3c36a1;
$onPrimaryContainer: #e3dfff;
$secondary: #c7c4dd;
$onSecondary: #2f2e42;
$secondaryContainer: #464559;
$onSecondaryContainer: #e3dff9;
$tertiary: #eab9d1;
$onTertiary: #472639;
$tertiaryContainer: #603c50;
$onTertiaryContainer: #ffd8eb;
$error: #ffb4a9;
$onError: #680003;
$errorContainer: #930006;
$onErrorContainer: #ffb4a9;
$colorbarbg: #101012;
$background: #101012;
$onBackground: #e5e1e6;
$surface: #1c1b1f;
$onSurface: #e5e1e6;
$surfaceVariant: #47464f;
$onSurfaceVariant: #c8c5d0;
$outline: #928f9a;
$shadow: #000000;
$inverseSurface: #e5e1e6;
$inverseOnSurface: #313033;
$inversePrimary: #5550bb;
-25
View File
@@ -1,26 +1 @@
// SCSS Variables
// Generated by 'wal'
$wallpaper: "/home/end/.cache/ags/media/375d6eb3358763763a73710dca3bbfad1a5434d8";
// Special
$background: #0a0919;
$foreground: #bfacd9;
$cursor: #bfacd9;
// Colors
$color0: #0a0919;
$color1: #2E2693;
$color2: #382FA6;
$color3: #4C2F99;
$color4: #4839B3;
$color5: #5A49B4;
$color6: #5C4CC7;
$color7: #bfacd9;
$color8: #857897;
$color9: #2E2693;
$color10: #382FA6;
$color11: #4C2F99;
$color12: #4839B3;
$color13: #5A49B4;
$color14: #5C4CC7;
$color15: #bfacd9;
+12 -12
View File
@@ -134,7 +134,7 @@ $notif_surface: $t_background;
.notif-circprog-low {
transition: 0ms linear;
min-width: 0.136rem; // line width
min-height: 3.409rem;
min-height: 3.136rem;
padding: 0rem;
color: $onSecondaryContainer;
}
@@ -142,7 +142,7 @@ $notif_surface: $t_background;
.notif-circprog-normal {
transition: 0ms linear;
min-width: 0.136rem; // line width
min-height: 3.409rem;
min-height: 3.136rem;
padding: 0rem;
color: $onSecondaryContainer;
}
@@ -150,7 +150,7 @@ $notif_surface: $t_background;
.notif-circprog-critical {
transition: 0ms linear;
min-width: 0.136rem; // line width
min-height: 3.409rem;
min-height: 3.136rem;
padding: 0rem;
color: $secondaryContainer;
}
@@ -164,43 +164,43 @@ $notif_surface: $t_background;
}
.notif-action-low {
background-color: $l_t_surfaceVariant;
background-color: mix($t_onSurfaceVariant, $t_surface, 10%);
color: $onSurfaceVariant;
}
.notif-action-low:focus,
.notif-action-low:hover {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
background-color: mix($t_onSurfaceVariant, $t_surface, 18%);
}
.notif-action-low:active {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
background-color: mix($t_onSurfaceVariant, $t_surface, 23%);
}
.notif-action-normal {
background-color: $l_t_surfaceVariant;
background-color: mix($t_onSurfaceVariant, $t_surface, 10%);
color: $onSurfaceVariant;
}
.notif-action-normal:focus,
.notif-action-normal:hover {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
background-color: mix($t_onSurfaceVariant, $t_surface, 18%);
}
.notif-action-normal:active {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
background-color: mix($t_onSurfaceVariant, $t_surface, 23%);
}
.notif-action-critical {
background-color: $t_onSurfaceVariant;
background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 10%);
color: $onSurfaceVariant;
}
.notif-action-critical:focus,
.notif-action-critical:hover {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 10%);
background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 18%);
}
.notif-action-critical:active {
background-color: mix($t_onSurfaceVariant, $l_t_surfaceVariant, 15%);
background-color: mix($t_onSecondaryContainer, $t_secondaryContainer, 23%);
}