kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

update colors

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
.config/ags/modules/bar/normal/spaceleft.js
+2 -2
View File
@@ -16,7 +16,7 @@ const WindowTitle = async () => {
xalign: 0, xalign: 0,
truncate: 'end', truncate: 'end',
maxWidthChars: 10, // Doesn't matter, just needs to be non negative 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 setup: (self) => self.hook(Hyprland.active.client, label => { // Hyprland.active.client
label.label = Hyprland.active.client.class.length === 0 ? 'Desktop' : Hyprland.active.client.class; label.label = Hyprland.active.client.class.length === 0 ? 'Desktop' : Hyprland.active.client.class;
}), }),
@@ -25,7 +25,7 @@ const WindowTitle = async () => {
xalign: 0, xalign: 0,
truncate: 'end', truncate: 'end',
maxWidthChars: 10, // Doesn't matter, just needs to be non negative 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 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; label.label = Hyprland.active.client.title.length === 0 ? `Workspace ${Hyprland.active.workspace.id}` : Hyprland.active.client.title;
}), }),
.config/ags/modules/bar/normal/spaceright.js
+5 -11
View File
@@ -71,18 +71,12 @@ export default () => {
})); }));
const actualContent = Widget.Box({ const actualContent = Widget.Box({
hexpand: true, hexpand: true,
className: 'spacing-h-5 txt', className: 'spacing-h-5 bar-spaceright',
children: [ children: [
Widget.Box({ emptyArea,
hexpand: true, barTray,
className: 'spacing-h-5 txt', indicatorArea
children: [ ],
emptyArea,
barTray,
indicatorArea
],
}),
]
}); });
return Widget.Box({ return Widget.Box({
.config/ags/modules/bar/normal/system.js
+3 -3
View File
@@ -63,7 +63,7 @@ const UtilButton = ({ name, icon, onClicked }) => Button({
const Utilities = () => Box({ const Utilities = () => Box({
hpack: 'center', hpack: 'center',
className: 'spacing-h-4 txt-onSurfaceVariant', className: 'spacing-h-4',
children: [ children: [
UtilButton({ UtilButton({
name: 'Screen snip', icon: 'screenshot_region', onClicked: () => { name: 'Screen snip', icon: 'screenshot_region', onClicked: () => {
@@ -85,7 +85,7 @@ const Utilities = () => Box({
}) })
const BarBattery = () => Box({ const BarBattery = () => Box({
className: 'spacing-h-4 txt-onSurfaceVariant', className: 'spacing-h-4 bar-batt-txt',
children: [ children: [
Revealer({ Revealer({
transitionDuration: userOptions.animations.durationSmall, transitionDuration: userOptions.animations.durationSmall,
@@ -97,7 +97,7 @@ const BarBattery = () => Box({
}), }),
}), }),
Label({ Label({
className: 'txt-smallie bar-batt-txt', className: 'txt-smallie',
setup: (self) => self.hook(Battery, label => { setup: (self) => self.hook(Battery, label => {
label.label = `${Battery.percent}%`; label.label = `${Battery.percent}%`;
}), }),
.config/ags/scss/_bar.scss
+14 -5
View File
@@ -308,10 +308,14 @@ $bar_ws_width_focus_active: 2.045rem;
@include large-rounding; @include large-rounding;
} }
.bar-topdesc { .bar-wintitle-topdesc {
margin-top: -0.136rem; margin-top: -0.136rem;
margin-bottom: -0.341rem; margin-bottom: -0.341rem;
color: $windowtitleOnLayer1Inactive; color: $windowtitleOnLayer0Inactive;
}
.bar-wintitle-txt {
color: $windowtitleOnLayer0;
} }
.bar-space-button { .bar-space-button {
@@ -345,6 +349,7 @@ $bar_ws_width_focus_active: 2.045rem;
min-height: 1.032rem; min-height: 1.032rem;
min-width: 1.032rem; min-width: 1.032rem;
font-size: 1.032rem; font-size: 1.032rem;
color: $trayOnLayer0;
} }
.bar-statusicons { .bar-statusicons {
@@ -363,8 +368,8 @@ $bar_ws_width_focus_active: 2.045rem;
@include element_decel; @include element_decel;
min-height: 1.77rem; min-height: 1.77rem;
min-width: 1.77rem; min-width: 1.77rem;
background-color: $layer2; background-color: $utilsLayer2;
color: $onLayer2; color: $utilsOnLayer2;
} }
.bar-util-btn:hover, .bar-util-btn:hover,
@@ -376,12 +381,16 @@ $bar_ws_width_focus_active: 2.045rem;
background-color: $layer2Active; background-color: $layer2Active;
} }
.bar-spaceright {
color: $barspacerightOnLayer0;
}
.bar-bluetooth-device { .bar-bluetooth-device {
@include full-rounding; @include full-rounding;
@include element_decel; @include element_decel;
min-height: 1.032rem; min-height: 1.032rem;
min-width: 1.032rem; min-width: 1.032rem;
font-size: 1.032rem; font-size: 1.032rem;
color: $onLayer0; color: $barspacerightOnLayer0;
padding: 0.205rem 0.341rem; padding: 0.205rem 0.341rem;
} }
.config/ags/scss/_colors.scss
+25 -16
View File
@@ -135,6 +135,7 @@ $term7: $onSurfaceVariant;
// General // General
$layer0: $t_background; $layer0: $t_background;
$onLayer0: $onBackground; $onLayer0: $onBackground;
$onLayer0Inactive: mix($onBackground, $background, 70%);
$layer0Active: mix($t_background, $t_onBackground, 80%); $layer0Active: mix($t_background, $t_onBackground, 80%);
$layer1: $surface; $layer1: $surface;
$onLayer1Inactive: mix($onBackground, $background, 45%); $onLayer1Inactive: mix($onBackground, $background, 45%);
@@ -144,7 +145,9 @@ $onLayer2: $onSurfaceVariant;
$layer2Hover: mix($layer2, $onSurfaceVariant, 90%); $layer2Hover: mix($layer2, $onSurfaceVariant, 90%);
$layer2Active: mix($layer2, $onSurfaceVariant, 80%); $layer2Active: mix($layer2, $onSurfaceVariant, 80%);
// Elements // Elements
$windowtitleOnLayer1Inactive: $onLayer1; $windowtitleOnLayer0Inactive: $onLayer0Inactive;
$windowtitleOnLayer0: $onLayer0;
$barspacerightOnLayer0: $onLayer0;
$timeOnLayer1: $onLayer1; $timeOnLayer1: $onLayer1;
$dateOnLayer1: $onLayer1; $dateOnLayer1: $onLayer1;
$ramOnLayer1: $onLayer1; $ramOnLayer1: $onLayer1;
@@ -159,14 +162,16 @@ $cpuOnLayer2: $onSecondaryContainer;
$musicOnLayer1: $onLayer1; $musicOnLayer1: $onLayer1;
$musicLayer2: $secondaryContainer; $musicLayer2: $secondaryContainer;
$musicOnLayer2: $onSecondaryContainer; $musicOnLayer2: $onSecondaryContainer;
$utilsLayer2: $layer2;
$utilsOnLayer2: $onLayer2;
$battOnLayer1: $onLayer1; $battOnLayer1: $onLayer1;
$battLayer2: $secondaryContainer; $battLayer2: $secondaryContainer;
$battOnLayer2: $onSecondaryContainer; $battOnLayer2: $onSecondaryContainer;
$workspaceOnLayer1Inactive: $onLayer1Inactive; $workspaceOnLayer1Inactive: $onLayer1Inactive;
$workspaceLayer3: $secondaryContainer; $workspaceLayer3: $secondaryContainer;
$workspaceOnLayer3: $onSecondaryContainer; $workspaceOnLayer3: $onSecondaryContainer;
$workspaceOnLayer2: $onSurfaceVariant; $workspaceOnLayer2: $onSurfaceVariant;
$trayOnLayer0: $onLayer0;
///////////////////// test theme: amarena (kind of) ///////////////////////// ///////////////////// test theme: amarena (kind of) /////////////////////////
// $layer0: #0e1116; // $layer0: #0e1116;
@@ -180,27 +185,31 @@ $workspaceOnLayer2: $onSurfaceVariant;
// $layer2Hover: mix($layer2, $onSurfaceVariant, 90%); // $layer2Hover: mix($layer2, $onSurfaceVariant, 90%);
// $layer2Active: mix($layer2, $onSurfaceVariant, 80%); // $layer2Active: mix($layer2, $onSurfaceVariant, 80%);
// $layer3: #1C232A; // $layer3: #1C232A;
// $windowtitleOnLayer1Inactive: $onLayer1; // $windowtitleOnLayer0Inactive: #70afa4;
// $windowtitleOnLayer0: #7FE3D1;
// $barspacerightOnLayer0: #7FE3D1;
// $timeOnLayer1: #cc7691; // $timeOnLayer1: #cc7691;
// $dateOnLayer1: #cc7691; // $dateOnLayer1: #cc7691;
// $ramOnLayer1: #61adc0; // $ramOnLayer1: #6DC0D5;
// $ramLayer2: $layer2; // $ramLayer2: $layer2;
// $ramOnLayer2: #61adc0; // $ramOnLayer2: #6DC0D5;
// $swapOnLayer1: #b371ad; // $swapOnLayer1: #CC83C7;
// $swapLayer2: $layer2; // $swapLayer2: $layer2;
// $swapOnLayer2: #b371ad; // $swapOnLayer2: #CC83C7;
// $cpuOnLayer1: #7db17d; // $cpuOnLayer1: #FA6295;
// $cpuLayer2: $layer2; // $cpuLayer2: $layer2;
// $cpuOnLayer2: #7db17d; // $cpuOnLayer2: #FA6295;
// $musicOnLayer1: #b64a6e; // $musicOnLayer1: #94CF95;
// $musicLayer2: $layer2; // $musicLayer2: $layer2;
// $musicOnLayer2: #b64a6e; // $musicOnLayer2: #94CF95;
// $battOnLayer1: #7db17d; // $utilsLayer2: $layer2;
// $utilsOnLayer2: #CC83C7;
// $battOnLayer1: #94CF95;
// $battLayer2: $layer2; // $battLayer2: $layer2;
// $battOnLayer2: #7db17d; // $battOnLayer2: #94CF95;
// $workspaceOnLayer1Inactive: $onLayer1Inactive; // $workspaceOnLayer1Inactive: $onLayer1Inactive;
// $workspaceLayer3: #33554f; // $workspaceLayer3: #33554f;
// $workspaceOnLayer3: #84EFDB; // $workspaceOnLayer3: #7FE3D1;
// $workspaceOnLayer2: #84EFDB; // $workspaceOnLayer2: #7FE3D1;
// $trayOnLayer0: #6DC0D5;