Merge branch 'upstream-custom' into dev

This commit is contained in:
Yingjie Wang 2024-05-27 03:37:54 -04:00
commit b6507b5b36

View File

@ -54,7 +54,7 @@ window#waybar {
#workspaces button { #workspaces button {
padding: 0px 5px; padding: 0px 5px;
margin: 3px; margin: 3px;
border-radius: 10px; border-radius: 15px;
border: 0px; border: 0px;
color: @textcolor1; color: @textcolor1;
background: @workspacesbackground2; background: @workspacesbackground2;
@ -62,17 +62,8 @@ window#waybar {
opacity: 0.4; opacity: 0.4;
} }
#workspaces button.active {
color: @textcolor1;
background: @workspacesbackground2;
border-radius: 10px;
min-width: 30px;
transition: all 0.3s ease-in-out;
opacity:1.0;
}
#workspaces button.empty { #workspaces button.empty {
border-radius: 10px; border-radius: 15px;
border: 0px; border: 0px;
color: @textcolor1; color: @textcolor1;
background: transparent; background: transparent;
@ -87,6 +78,15 @@ window#waybar {
opacity:0.7; opacity:0.7;
} }
#workspaces button.active {
color: @textcolor1;
background: @workspacesbackground2;
border-radius: 15px;
min-width: 30px;
transition: all 0.3s ease-in-out;
opacity:1.0;
}
/* ----------------------------------------------------- /* -----------------------------------------------------
* Tooltips * Tooltips
* ----------------------------------------------------- */ * ----------------------------------------------------- */