Merge branch 'upstream-main' into upstream-custom

This commit is contained in:
2024-05-05 16:40:17 -04:00
92 changed files with 1213 additions and 125 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

+2 -1
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
+2 -1
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
+14 -6
View File
@@ -184,15 +184,23 @@ window#waybar.empty #window {
}
#custom-ml4w-welcome {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
@@ -204,8 +212,8 @@ window#waybar.empty #window {
* ----------------------------------------------------- */
#idle_inhibitor {
margin-right: 15px;
font-size: 22px;
margin-right: 17px;
font-size: 20px;
font-weight: bold;
opacity: 0.8;
color: @iconcolor;
@@ -229,7 +237,7 @@ window#waybar.empty #window {
color: @textcolor1;
border-radius: 15px;
padding: 0px 10px 0px 10px;
margin: 6px 15px 6px 14px;
margin: 8px 14px 8px 14px;
opacity:0.8;
border:3px solid @bordercolor;
}
@@ -312,7 +320,7 @@ window#waybar.empty #window {
color: @textcolor1;
border-radius: 15px;
padding: 1px 10px 0px 10px;
margin: 6px 15px 6px 0px;
margin: 8px 15px 8px 0px;
opacity:0.8;
border:3px solid @bordercolor;
}
+2 -1
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window"
],
+1
View File
@@ -24,6 +24,7 @@
"modules-left": [
"custom/appmenuicon",
"hyprland/workspaces",
"group/links",
"group/settings",
"group/quicklinks"
],
+18 -2
View File
@@ -142,12 +142,19 @@ window#waybar.empty #window {
}
#custom-settings {
margin-right: 15;
margin-right: 15px;
}
#custom-browser {
margin-right: 16px;
}
#custom-wallpaper {
margin-right: 14px;
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 10px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
@@ -167,6 +174,15 @@ window#waybar.empty #window {
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon-20.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
/* -----------------------------------------------------
* Idle Inhibator
* ----------------------------------------------------- */
+2 -1
View File
@@ -24,8 +24,9 @@
// Modules Left
"modules-left": [
"custom/appmenu",
"group/links",
"group/settings",
"wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/empty"
+10 -2
View File
@@ -185,7 +185,7 @@ window#waybar.empty #window {
}
#custom-chatgpt {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ai-icon.png");
background-repeat: no-repeat;
background-position: center;
@@ -193,13 +193,21 @@ window#waybar.empty #window {
}
#custom-ml4w-welcome {
margin-right: 15px;
margin-right: 12px;
background-image: url("../assets/ml4w-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 24px;
}
#custom-ml4w-hyprland-settings {
margin-right: 12px;
background-image: url("../assets/hyprland-icon.png");
background-repeat: no-repeat;
background-position: center;
padding-right: 16px;
}
/* -----------------------------------------------------
* Idle Inhibator
* ----------------------------------------------------- */
+1 -1
View File
@@ -34,7 +34,7 @@
"custom/settings",
"custom/waybarthemes",
"custom/wallpaper",
// "wlr/taskbar",
//"wlr/taskbar",
"group/quicklinks",
"hyprland/window",
"custom/starter"