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

Merge with latest upstream

Browse Source
This commit is contained in:
midn8hustlr
2024-03-17 16:55:38 +05:30
parent 7198aa7265 5d51ed6861
commit 2c70652ea7
19 changed files with 246 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/ags/scss/_colors.scss
+16 -2
View File
@@ -68,8 +68,10 @@ $onLayer1Inactive: mix($onLayer1, $layer1, 45%);
$onLayer1: $onSurfaceVariant;
$layer2: $secondaryContainer;
$onLayer2: $onSecondaryContainer;
$layer2Hover: mix($layer2, $onSurfaceVariant, 90%);
$layer2Active: mix($layer2, $onSurfaceVariant, 80%);
$layer1Hover: mix($layer1, $onLayer1, 85%);
$layer1Active: mix($layer1, $onLayer1, 70%);
$layer2Hover: mix($layer2, $onLayer2, 90%);
$layer2Active: mix($layer2, $onLayer2, 80%);
// Elements
$windowtitleOnLayer0Inactive: $onLayer0Inactive;
$windowtitleOnLayer0: $onLayer0;
@@ -110,3 +112,15 @@ $cheatsheetColors: (
$onSecondaryContainer
);
$sessionColors: (
$onLayer1,
$onLayer1,
$onLayer1,
$onLayer1,
$onLayer1,
$onLayer1,
$onLayer1
);
$brightnessOnLayer0: $onLayer0;
$volumeOnLayer0: $onLayer0;
.config/ags/scss/_common.scss
+6 -6
View File
@@ -13,7 +13,7 @@
color: $onSecondary;
}
caret-color: $primary;
caret-color: $onLayer2;
}
@keyframes appear {
@@ -29,8 +29,8 @@
menu {
@include elevation-border-softer;
padding: 0.681rem;
background: $surfaceVariant;
color: $onSurfaceVariant;
background: $layer2;
color: $onLayer2;
border-radius: 1.159rem;
-gtk-outline-radius: 1.159rem;
@@ -50,18 +50,18 @@ menubar>menuitem {
menu>menuitem {
padding: 0.4em 1.5rem;
background: transparent;
transition: 0.2s ease background;
transition: 0.2s ease background-color;
border-radius: 0.545rem;
-gtk-outline-radius: 0.545rem;
}
menu>menuitem:hover,
menu>menuitem:focus {
background-color: mix($surfaceVariant, $onSurfaceVariant, 90%);
background-color: $layer2Hover;
}
menu>menuitem:active {
background-color: mix($surfaceVariant, $onSurfaceVariant, 80%);
background-color: $layer2Active;
}
radio {
.config/ags/scss/_material.scss
+46 -46
View File
@@ -1,56 +1,56 @@
$darkmode: True;
$transparent: False;
$primary_paletteKeyColor: #427DA3;
$secondary_paletteKeyColor: #687987;
$tertiary_paletteKeyColor: #7D7195;
$neutral_paletteKeyColor: #73777B;
$neutral_variant_paletteKeyColor: #71787E;
$background: #101417;
$onBackground: #DFE3E8;
$surface: #101417;
$surfaceDim: #101417;
$surfaceBright: #353A3E;
$primary_paletteKeyColor: #A76837;
$secondary_paletteKeyColor: #8F715C;
$tertiary_paletteKeyColor: #777A4B;
$neutral_paletteKeyColor: #81756D;
$neutral_variant_paletteKeyColor: #84746A;
$background: #19120D;
$onBackground: #F0DFD6;
$surface: #19120D;
$surfaceDim: #19120D;
$surfaceBright: #413731;
$surfaceContainerLowest: #FFFFFF;
$surfaceContainerLow: #181C20;
$surfaceContainer: #1C2024;
$surfaceContainerHigh: #262A2E;
$surfaceContainerHighest: #313539;
$onSurface: #DFE3E8;
$surfaceVariant: #41484D;
$onSurfaceVariant: #C1C7CE;
$inverseSurface: #DFE3E8;
$inverseOnSurface: #2D3135;
$outline: #8B9198;
$outlineVariant: #41484D;
$surfaceContainerLow: #221A15;
$surfaceContainer: #261E18;
$surfaceContainerHigh: #312822;
$surfaceContainerHighest: #3C332D;
$onSurface: #F0DFD6;
$surfaceVariant: #52443B;
$onSurfaceVariant: #D6C3B7;
$inverseSurface: #F0DFD6;
$inverseOnSurface: #382F29;
$outline: #9F8D83;
$outlineVariant: #52443B;
$shadow: #000000;
$scrim: #000000;
$surfaceTint: #94CDF7;
$primary: #94CDF7;
$onPrimary: #00344D;
$primaryContainer: #004C6D;
$onPrimaryContainer: #C8E6FF;
$inversePrimary: #246488;
$secondary: #B7C9D8;
$onSecondary: #21323F;
$secondaryContainer: #384956;
$onSecondaryContainer: #D3E5F5;
$tertiary: #CEC0E8;
$onTertiary: #352B4B;
$tertiaryContainer: #978BB0;
$surfaceTint: #FFB783;
$primary: #FFB783;
$onPrimary: #4F2500;
$primaryContainer: #6D390B;
$onPrimaryContainer: #FFDCC5;
$inversePrimary: #8A5021;
$secondary: #E4BFA7;
$onSecondary: #422B1B;
$secondaryContainer: #5B412F;
$onSecondaryContainer: #FFDCC5;
$tertiary: #C8CA94;
$onTertiary: #30330B;
$tertiaryContainer: #919463;
$onTertiaryContainer: #000000;
$error: #FFB4AB;
$onError: #690005;
$errorContainer: #93000A;
$onErrorContainer: #FFDAD6;
$primaryFixed: #C8E6FF;
$primaryFixedDim: #94CDF7;
$onPrimaryFixed: #001E2E;
$onPrimaryFixedVariant: #004C6D;
$secondaryFixed: #D3E5F5;
$secondaryFixedDim: #B7C9D8;
$onSecondaryFixed: #0B1D29;
$onSecondaryFixedVariant: #384956;
$tertiaryFixed: #E9DDFF;
$tertiaryFixedDim: #CEC0E8;
$onTertiaryFixed: #1F1635;
$onTertiaryFixedVariant: #4B4163;
$primaryFixed: #FFDCC5;
$primaryFixedDim: #FFB783;
$onPrimaryFixed: #301400;
$onPrimaryFixedVariant: #6D390B;
$secondaryFixed: #FFDCC5;
$secondaryFixedDim: #E4BFA7;
$onSecondaryFixed: #2A1708;
$onSecondaryFixedVariant: #5B412F;
$tertiaryFixed: #E4E6AE;
$tertiaryFixedDim: #C8CA94;
$onTertiaryFixed: #1B1D00;
$onTertiaryFixedVariant: #474920;
.config/ags/scss/_osd.scss
+31 -14
View File
@@ -10,7 +10,7 @@
.osd-value {
@include elevation-border;
@include elevation2;
background-color: $background;
background-color: $layer0;
border-radius: 1.023rem;
padding: 0.625rem 1.023rem;
padding-top: 0.313rem;
@@ -27,7 +27,7 @@
min-height: 0.954rem;
min-width: 0.068rem;
border-radius: 10rem;
background-color: $secondaryContainer;
background-color: $layer2;
// border: 0.068rem solid $onSecondaryContainer;
}
@@ -37,18 +37,13 @@
min-width: 0.680rem;
margin: 0rem 0.137rem;
border-radius: 10rem;
background-color: $onSecondaryContainer;
background-color: $onLayer2;
}
}
.osd-icon {
color: $onPrimaryContainer;
}
.osd-label {
font-size: 1.023rem;
font-weight: 500;
color: $onBackground;
margin-top: 0.341rem;
}
@@ -56,7 +51,24 @@
@include titlefont;
font-size: 1.688rem;
font-weight: 500;
color: $onBackground;
color: $onLayer0;
}
.osd-brightness {
color: $brightnessOnLayer0;
}
.osd-brightness-progress {
progress {
background-color: $brightnessOnLayer0;
}
}
.osd-volume {
color: $volumeOnLayer0;
}
.osd-volume-progress {
progress {
background-color: $volumeOnLayer0;
}
}
.osd-notifs {
@@ -65,7 +77,7 @@
.osd-colorscheme {
border-radius: 1.023rem;
background-color: $background;
background-color: $layer0;
padding: 0.313rem 0.626rem;
@include elevation2;
}
@@ -157,11 +169,16 @@
color: $onSurfaceVariant;
box { background-color: $onSurfaceVariant; }
}
.osd-color-L1 {
background-color: $layer1;
color: $onLayer1;
box { background-color: $onLayer1; }
}
.osd-color-background {
background-color: $background;
color: $onBackground;
box { background-color: $onBackground; }
.osd-color-layer0 {
background-color: $layer0;
color: $onLayer0;
box { background-color: $onLayer0; }
}
.osd-settings-btn-arrow {
.config/ags/scss/_osk.scss
+13 -13
View File
@@ -1,7 +1,7 @@
$osk_key_height: 2.5rem;
$osk_key_width: 2.5rem;
$osk_key_padding: 0.188rem;
$osk_key_rounding: 0.682rem;
$osk_key_rounding: 0.545rem;
$osk_key_fontsize: 1.091rem;
.osk-window {
@@ -11,12 +11,12 @@ $osk_key_fontsize: 1.091rem;
@include elevation2;
// min-height: 29.591rem;
// min-width: 50rem;
background-color: $t_background;
background-color: $layer0;
}
.osk-body {
padding: 1.023rem;
padding-top: 0px;
padding-top: 0rem;
}
.osk-show {
@@ -32,7 +32,7 @@ $osk_key_fontsize: 1.091rem;
.osk-dragline {
@include full-rounding;
background-color: $surfaceVariant;
background-color: $onLayer0Inactive;
min-height: 0.273rem;
min-width: 10.227rem;
margin-top: 0.545rem;
@@ -41,8 +41,8 @@ $osk_key_fontsize: 1.091rem;
.osk-key {
border-radius: $osk_key_rounding;
background-color: $t_surfaceVariant;
color: $onSurfaceVariant;
background-color: $layer1;
color: $onLayer1;
padding: $osk_key_padding;
font-weight: 500;
font-size: $osk_key_fontsize;
@@ -50,16 +50,16 @@ $osk_key_fontsize: 1.091rem;
.osk-key:hover,
.osk-key:focus {
background-color: $hovercolor;
background-color: $layer1Hover;
}
.osk-key:active {
background-color: $activecolor;
background-color: $layer1Active;
font-size: $osk_key_fontsize;
}
.osk-key-active {
background-color: $activecolor;
background-color: $layer1Active;
}
.osk-key-normal {
@@ -95,8 +95,8 @@ $osk_key_fontsize: 1.091rem;
.osk-control-button {
border-radius: $osk_key_rounding;
background-color: $t_surfaceVariant;
color: $onSurfaceVariant;
background-color: $layer1;
color: $onLayer1;
font-weight: 500;
font-size: $osk_key_fontsize;
padding: 0.682rem;
@@ -104,11 +104,11 @@ $osk_key_fontsize: 1.091rem;
.osk-control-button:hover,
.osk-control-button:focus {
background-color: mix($t_surfaceVariant, $onSurfaceVariant, 90%);
background-color: $layer1Hover;
}
.osk-control-button:active {
background-color: mix($t_surfaceVariant, $onSurfaceVariant, 70%);
background-color: $layer1Active;
font-size: $osk_key_fontsize;
}
.config/ags/scss/_session.scss
+14 -9
View File
@@ -1,24 +1,23 @@
.session-bg {
background-color: $t_surface;
background-color: transparentize($color: $layer0, $amount: 0.4);
}
.session-button {
@include large-rounding;
min-width: 8.182rem;
min-height: 8.182rem;
background-color: $surfaceVariant;
color: $onSurfaceVariant;
background-color: $layer1;
color: $onLayer1;
font-size: 3rem;
}
.session-button-focused {
background-color: $secondaryContainer;
color: $onSecondaryContainer;
background-color: $layer1Hover;
}
.session-button-desc {
background-color: mix($surface, $surfaceVariant, 50%);
color: mix($onSurface, $onSurfaceVariant, 50%);
background-color: $layer2;
color: $onLayer2;
border-bottom-left-radius: $rounding_large;
border-bottom-right-radius: $rounding_large;
padding: 0.205rem 0.341rem;
@@ -29,7 +28,13 @@
@include large-rounding;
min-width: 8.182rem;
min-height: 5.455rem;
background-color: $surfaceVariant;
color: $onSurfaceVariant;
background-color: $layer1;
color: $onLayer1;
font-size: 3rem;
}
@for $i from 1 through 7 {
.session-color-#{$i} {
color: nth($sessionColors, $i);
}
}
.config/ags/scss/_sidebars.scss
+34 -23
View File
@@ -2,8 +2,6 @@ $sidebar_chat_textboxareaColor: mix($onSurfaceVariant, $surfaceVariant, 40%);
$textboxColor: $surfaceContainerHigh;
$system: $secondary;
$onSystem: $onSecondary;
$chatgpt: $primary;
$onChatgpt: $onPrimary;
@mixin group-padding {
padding: 0.341rem;
@@ -588,32 +586,47 @@ $colorpicker_rounding: 0.341rem;
.sidebar-chat-message {
margin: 0.682rem;
@include normal-rounding;
@include group-padding;
background-color: $layer1;
}
.sidebar-chat-indicator {
@include element_decel;
@include full-rounding;
min-width: 0.136rem;
}
.sidebar-chat-indicator-waifu {
@include element_decel;
@include full-rounding;
min-width: 0.136rem;
background-color: $onBackground;
}
.sidebar-chat-indicator-user {
background-color: $onBackground;
}
.sidebar-chat-indicator-bot {
background-color: $chatgpt;
}
.sidebar-chat-indicator-System {
background-color: $system;
}
.sidebar-chat-name {
@include titlefont;
padding: 0.341rem;
margin-left: -0.136rem;
padding-left: 0.818rem;
@include small-rounding;
padding: 0.341rem 0.818rem;
margin: 0.341rem;
// margin-left: 0rem;
background-color: $layer2;
color: $onLayer2;
}
.sidebar-chat-name-user {
background-color: $layer2;
color: $onLayer2;
}
.sidebar-chat-name-bot {
background-color: $secondary;
color: $onSecondary;
}
.sidebar-chat-name-system {
background-color: $secondaryContainer;
color: $onSecondaryContainer;
}
.sidebar-chat-txtblock {
@@ -800,17 +813,11 @@ $colorpicker_rounding: 0.341rem;
padding-left: 0.818rem;
}
.sidebar-waifu-content {
margin-left: 0.682rem;
}
.sidebar-waifu-txt {
@include readingfont;
margin-left: 0.682rem;
}
.sidebar-waifu-image {
margin-left: 0.682rem;
@include normal-rounding;
background-size: cover;
background-repeat: no-repeat;
@@ -842,6 +849,10 @@ $waifu_image_overlay_transparency: 0.7;
background-color: rgba(60, 60, 60, $waifu_image_overlay_transparency);
}
.sidebar-booru-imagegrid {
@include normal-rounding;
}
.sidebar-booru-image {
@include small-rounding;
margin: 0.273rem;