update colors

This commit is contained in:
end-4 2024-03-16 21:50:18 +07:00
parent f6e9f4b6dc
commit d59142fa6d
5 changed files with 49 additions and 37 deletions

View file

@ -16,7 +16,7 @@ const WindowTitle = async () => {
xalign: 0,
truncate: 'end',
maxWidthChars: 10, // Doesn't matter, just needs to be non negative
className: 'txt-smaller bar-topdesc txt',
className: 'txt-smaller bar-wintitle-topdesc txt',
setup: (self) => self.hook(Hyprland.active.client, label => { // Hyprland.active.client
label.label = Hyprland.active.client.class.length === 0 ? 'Desktop' : Hyprland.active.client.class;
}),
@ -25,7 +25,7 @@ const WindowTitle = async () => {
xalign: 0,
truncate: 'end',
maxWidthChars: 10, // Doesn't matter, just needs to be non negative
className: 'txt txt-smallie',
className: 'txt-smallie bar-wintitle-txt',
setup: (self) => self.hook(Hyprland.active.client, label => { // Hyprland.active.client
label.label = Hyprland.active.client.title.length === 0 ? `Workspace ${Hyprland.active.workspace.id}` : Hyprland.active.client.title;
}),

View file

@ -71,18 +71,12 @@ export default () => {
}));
const actualContent = Widget.Box({
hexpand: true,
className: 'spacing-h-5 txt',
className: 'spacing-h-5 bar-spaceright',
children: [
Widget.Box({
hexpand: true,
className: 'spacing-h-5 txt',
children: [
emptyArea,
barTray,
indicatorArea
],
}),
]
emptyArea,
barTray,
indicatorArea
],
});
return Widget.Box({

View file

@ -63,7 +63,7 @@ const UtilButton = ({ name, icon, onClicked }) => Button({
const Utilities = () => Box({
hpack: 'center',
className: 'spacing-h-4 txt-onSurfaceVariant',
className: 'spacing-h-4',
children: [
UtilButton({
name: 'Screen snip', icon: 'screenshot_region', onClicked: () => {
@ -85,7 +85,7 @@ const Utilities = () => Box({
})
const BarBattery = () => Box({
className: 'spacing-h-4 txt-onSurfaceVariant',
className: 'spacing-h-4 bar-batt-txt',
children: [
Revealer({
transitionDuration: userOptions.animations.durationSmall,
@ -97,7 +97,7 @@ const BarBattery = () => Box({
}),
}),
Label({
className: 'txt-smallie bar-batt-txt',
className: 'txt-smallie',
setup: (self) => self.hook(Battery, label => {
label.label = `${Battery.percent}%`;
}),

View file

@ -308,10 +308,14 @@ $bar_ws_width_focus_active: 2.045rem;
@include large-rounding;
}
.bar-topdesc {
.bar-wintitle-topdesc {
margin-top: -0.136rem;
margin-bottom: -0.341rem;
color: $windowtitleOnLayer1Inactive;
color: $windowtitleOnLayer0Inactive;
}
.bar-wintitle-txt {
color: $windowtitleOnLayer0;
}
.bar-space-button {
@ -345,6 +349,7 @@ $bar_ws_width_focus_active: 2.045rem;
min-height: 1.032rem;
min-width: 1.032rem;
font-size: 1.032rem;
color: $trayOnLayer0;
}
.bar-statusicons {
@ -363,8 +368,8 @@ $bar_ws_width_focus_active: 2.045rem;
@include element_decel;
min-height: 1.77rem;
min-width: 1.77rem;
background-color: $layer2;
color: $onLayer2;
background-color: $utilsLayer2;
color: $utilsOnLayer2;
}
.bar-util-btn:hover,
@ -376,12 +381,16 @@ $bar_ws_width_focus_active: 2.045rem;
background-color: $layer2Active;
}
.bar-spaceright {
color: $barspacerightOnLayer0;
}
.bar-bluetooth-device {
@include full-rounding;
@include element_decel;
min-height: 1.032rem;
min-width: 1.032rem;
font-size: 1.032rem;
color: $onLayer0;
color: $barspacerightOnLayer0;
padding: 0.205rem 0.341rem;
}

View file

@ -135,6 +135,7 @@ $term7: $onSurfaceVariant;
// General
$layer0: $t_background;
$onLayer0: $onBackground;
$onLayer0Inactive: mix($onBackground, $background, 70%);
$layer0Active: mix($t_background, $t_onBackground, 80%);
$layer1: $surface;
$onLayer1Inactive: mix($onBackground, $background, 45%);
@ -144,7 +145,9 @@ $onLayer2: $onSurfaceVariant;
$layer2Hover: mix($layer2, $onSurfaceVariant, 90%);
$layer2Active: mix($layer2, $onSurfaceVariant, 80%);
// Elements
$windowtitleOnLayer1Inactive: $onLayer1;
$windowtitleOnLayer0Inactive: $onLayer0Inactive;
$windowtitleOnLayer0: $onLayer0;
$barspacerightOnLayer0: $onLayer0;
$timeOnLayer1: $onLayer1;
$dateOnLayer1: $onLayer1;
$ramOnLayer1: $onLayer1;
@ -159,14 +162,16 @@ $cpuOnLayer2: $onSecondaryContainer;
$musicOnLayer1: $onLayer1;
$musicLayer2: $secondaryContainer;
$musicOnLayer2: $onSecondaryContainer;
$utilsLayer2: $layer2;
$utilsOnLayer2: $onLayer2;
$battOnLayer1: $onLayer1;
$battLayer2: $secondaryContainer;
$battOnLayer2: $onSecondaryContainer;
$workspaceOnLayer1Inactive: $onLayer1Inactive;
$workspaceLayer3: $secondaryContainer;
$workspaceOnLayer3: $onSecondaryContainer;
$workspaceOnLayer2: $onSurfaceVariant;
$trayOnLayer0: $onLayer0;
///////////////////// test theme: amarena (kind of) /////////////////////////
// $layer0: #0e1116;
@ -180,27 +185,31 @@ $workspaceOnLayer2: $onSurfaceVariant;
// $layer2Hover: mix($layer2, $onSurfaceVariant, 90%);
// $layer2Active: mix($layer2, $onSurfaceVariant, 80%);
// $layer3: #1C232A;
// $windowtitleOnLayer1Inactive: $onLayer1;
// $windowtitleOnLayer0Inactive: #70afa4;
// $windowtitleOnLayer0: #7FE3D1;
// $barspacerightOnLayer0: #7FE3D1;
// $timeOnLayer1: #cc7691;
// $dateOnLayer1: #cc7691;
// $ramOnLayer1: #61adc0;
// $ramOnLayer1: #6DC0D5;
// $ramLayer2: $layer2;
// $ramOnLayer2: #61adc0;
// $swapOnLayer1: #b371ad;
// $ramOnLayer2: #6DC0D5;
// $swapOnLayer1: #CC83C7;
// $swapLayer2: $layer2;
// $swapOnLayer2: #b371ad;
// $cpuOnLayer1: #7db17d;
// $swapOnLayer2: #CC83C7;
// $cpuOnLayer1: #FA6295;
// $cpuLayer2: $layer2;
// $cpuOnLayer2: #7db17d;
// $musicOnLayer1: #b64a6e;
// $cpuOnLayer2: #FA6295;
// $musicOnLayer1: #94CF95;
// $musicLayer2: $layer2;
// $musicOnLayer2: #b64a6e;
// $battOnLayer1: #7db17d;
// $musicOnLayer2: #94CF95;
// $utilsLayer2: $layer2;
// $utilsOnLayer2: #CC83C7;
// $battOnLayer1: #94CF95;
// $battLayer2: $layer2;
// $battOnLayer2: #7db17d;
// $battOnLayer2: #94CF95;
// $workspaceOnLayer1Inactive: $onLayer1Inactive;
// $workspaceLayer3: #33554f;
// $workspaceOnLayer3: #84EFDB;
// $workspaceOnLayer2: #84EFDB;
// $workspaceOnLayer3: #7FE3D1;
// $workspaceOnLayer2: #7FE3D1;
// $trayOnLayer0: #6DC0D5;