zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2025-12-06 06:36:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Colors: added 2 new colors: mHover and mOnHover for more flexibility

Browse Source
This commit is contained in:
ItsLemmy
2025-11-06 17:38:17 -05:00
parent fbfdd02c9c
commit b8b917dd05
19 changed files with 122 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/ColorScheme/Ayu/Ayu.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#0B0E14",
"mOnSurfaceVariant": "#636A72",
"mOutline": "#565B66",
"mShadow": "#000000"
"mShadow": "#000000",
"mHover": "#39BAE6",
"mOnHover": "#0B0E14"
},
"light": {
"mPrimary": "#FF8F40",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#F8F9FA",
"mOnSurfaceVariant": "#ABADB1",
"mOutline": "#8A9199",
"mShadow": "#F8F9FA"
"mShadow": "#F8F9FA",
"mHover": "#55B4D4",
"mOnHover": "#F8F9FA"
}
}

8
Assets/ColorScheme/Catppuccin/Catppuccin.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#313244",
"mOnSurfaceVariant": "#a3b4eb",
"mOutline": "#4c4f69",
"mShadow": "#11111b"
"mShadow": "#11111b",
"mHover": "#94e2d5",
"mOnHover": "#11111b"
},
"light": {
"mPrimary": "#8839ef",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#ccd0da",
"mOnSurfaceVariant": "#6c6f85",
"mOutline": "#a5adcb",
"mShadow": "#dce0e8"
"mShadow": "#dce0e8",
"mHover": "#40a02b",
"mOnHover": "#eff1f5"
}
}

8
Assets/ColorScheme/Cyberpunk/Cyberpunk.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#11151D",
"mOnSurfaceVariant": "#9B6BC1",
"mOutline": "#45A0D6",
"mShadow": "#090D13"
"mShadow": "#090D13",
"mHover": "#00A66C",
"mOnHover": "#0E1015"
},
"light": {
"mPrimary": "#00B8B3",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#C8DEE6",
"mOnSurfaceVariant": "#1A1914",
"mOutline": "#7B52AB",
"mShadow": "#B8D4E6"
"mShadow": "#B8D4E6",
"mHover": "#45D395",
"mOnHover": "#1A1914"
}
}

8
Assets/ColorScheme/Dracula/Dracula.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#44475A",
"mOnSurfaceVariant": "#d6d8e0",
"mOutline": "#5a5e77",
"mShadow": "#282A36"
"mShadow": "#282A36",
"mHover": "#8be9fd",
"mOnHover": "#003543"
},
"light": {
"mPrimary": "#8332f4",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#e6e6ea",
"mOnSurfaceVariant": "#44475a",
"mOutline": "#cacad3",
"mShadow": "#d6d8e0"
"mShadow": "#d6d8e0",
"mHover": "#0398b9",
"mOnHover": "#ffffff"
}
}

8
Assets/ColorScheme/Eldritch/Eldritch.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#292e42",
"mOnSurfaceVariant": "#ABB4DA",
"mOutline": "#3b4261",
"mShadow": "#414868"
"mShadow": "#414868",
"mHover": "#a48cf2",
"mOnHover": "#171928"
},
"light": {
"mPrimary": "#37f499",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#f2f4f8",
"mOnSurfaceVariant": "#3b4261",
"mOutline": "#b0b6c3",
"mShadow": "#e0e3e8"
"mShadow": "#e0e3e8",
"mHover": "#a48cf2",
"mOnHover": "#171928"
}
}

8
Assets/ColorScheme/Everforest/Everforest.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#2D353B",
"mOnSurfaceVariant": "#D3C6AA",
"mOutline": "#D3C6AA",
"mShadow": "#475258"
"mShadow": "#475258",
"mHover": "#9DA9A0",
"mOnHover": "#232A2E"
},
"light": {
"mPrimary": "#434F55",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#BEC5B2",
"mOnSurfaceVariant": "#333C43",
"mOutline": "#232A2E",
"mShadow": "#ECF5ED"
"mShadow": "#ECF5ED",
"mHover": "#333c43",
"mOnHover": "#9DA9A0"
}
}

8
Assets/ColorScheme/Gruvbox/Gruvbox.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#3c3836",
"mOnSurfaceVariant": "#ebdbb2",
"mOutline": "#57514e",
"mShadow": "#282828"
"mShadow": "#282828",
"mHover": "#83a598",
"mOnHover": "#282828"
},
"light": {
"mPrimary": "#98971a",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#ebdbb2",
"mOnSurfaceVariant": "#7c6f64",
"mOutline": "#bdae93",
"mShadow": "#d5c4a1"
"mShadow": "#d5c4a1",
"mHover": "#458588",
"mOnHover": "#fbf1c7"
}
}

8
Assets/ColorScheme/Kanagawa/Kanagawa.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#2a2a37",
"mOnSurfaceVariant": "#717c7c",
"mOutline": "#363646",
"mShadow": "#1f1f28"
"mShadow": "#1f1f28",
"mHover": "#7e9cd8",
"mOnHover": "#1f1f28"
},
"light": {
"mPrimary": "#6f894e",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#e5ddb0",
"mOnSurfaceVariant": "#8a8980",
"mOutline": "#cfc49c",
"mShadow": "#f2ecbc"
"mShadow": "#f2ecbc",
"mHover": "#4d699b",
"mOnHover": "#f2ecbc"
}
}

8
Assets/ColorScheme/Monochrome/Monochrome.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#191919",
"mOnSurfaceVariant": "#5d5d5d",
"mOutline": "#3c3c3c",
"mShadow": "#000000"
"mShadow": "#000000",
"mHover": "#cccccc",
"mOnHover": "#111111"
},
"light": {
"mPrimary": "#555555",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#e8e8e8",
"mOnSurfaceVariant": "#9e9e9e",
"mOutline": "#c3c3c3",
"mShadow": "#fafafa"
"mShadow": "#fafafa",
"mHover": "#333333",
"mOnHover": "#eeeeee"
}
}

8
Assets/ColorScheme/Noctalia-default/Noctalia-default.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#11112d",
"mOnSurfaceVariant": "#7c80b4",
"mOutline": "#21215F",
"mShadow": "#070722"
"mShadow": "#070722",
"mHover": "#9BFECE",
"mOnHover": "#0e0e43"
},
"light": {
"mPrimary": "#5d65f5",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#eff0ff",
"mOnSurfaceVariant": "#4b55c8",
"mOutline": "#8288fc",
"mShadow": "#f3edf7"
"mShadow": "#f3edf7",
"mHover": "#0e0e43",
"mOnHover": "#fef29a"
}
}

8
Assets/ColorScheme/Noctalia-legacy/Noctalia-legacy.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#262130",
"mOnSurfaceVariant": "#a79ab0",
"mOutline": "#3e364e",
"mShadow": "#120f18"
"mShadow": "#120f18",
"mHover": "#e0b7c9",
"mOnHover": "#20161f"
},
"light": {
"mPrimary": "#9b59ba",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#e7dfee",
"mOnSurfaceVariant": "#4a3d59",
"mOutline": "#cebedc",
"mShadow": "#ffffff"
"mShadow": "#ffffff",
"mHover": "#c17093",
"mOnHover": "#ffffff"
}
}

8
Assets/ColorScheme/Nord/Nord.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#3b4252",
"mOnSurfaceVariant": "#d8dee9",
"mOutline": "#505a70",
"mShadow": "#2e3440"
"mShadow": "#2e3440",
"mHover": "#5e81ac",
"mOnHover": "#2e3440"
},
"light": {
"mPrimary": "#5e81ac",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#e5e9f0",
"mOnSurfaceVariant": "#4c566a",
"mOutline": "#c5cedd",
"mShadow": "#d8dee9"
"mShadow": "#d8dee9",
"mHover": "#6fa9a8",
"mOnHover": "#eceff4"
}
}

8
Assets/ColorScheme/Osaka-jade/Osaka-jade.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#0F251F",
"mOnSurfaceVariant": "#99A8A4",
"mOutline": "#1B6352",
"mShadow": "#040A09"
"mShadow": "#040A09",
"mHover": "#26A589",
"mOnHover": "#B8C8C4"
},
"light": {
"mPrimary": "#3B7561",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#95AD9C",
"mOnSurfaceVariant": "#263731",
"mOutline": "#5C7A6A",
"mShadow": "#8A9E90"
"mShadow": "#8A9E90",
"mHover": "#4A8069",
"mOnHover": "#D8E5DB"
}
}

8
Assets/ColorScheme/Rosepine/Rosepine.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#26233a",
"mOnSurfaceVariant": "#908caa",
"mOutline": "#403d52",
"mShadow": "#191724"
"mShadow": "#191724",
"mHover": "#524f67",
"mOnHover": "#e0def4"
},
"light": {
"mPrimary": "#d7827e",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#f2e9e1",
"mOnSurfaceVariant": "#797593",
"mOutline": "#dfdad9",
"mShadow": "#faf4ed"
"mShadow": "#faf4ed",
"mHover": "#cecacd",
"mOnHover": "#575279"
}
}

8
Assets/ColorScheme/Solarized/Solarized.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#073642",
"mOnSurfaceVariant": "#657b83",
"mOutline": "#0c5c70",
"mShadow": "#002b36"
"mShadow": "#002b36",
"mHover": "#cb4b16",
"mOnHover": "#002b36"
},
"light": {
"mPrimary": "#b58900",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#eee8d5",
"mOnSurfaceVariant": "#839496",
"mOutline": "#dfd4b1",
"mShadow": "#eee8d5"
"mShadow": "#eee8d5",
"mHover": "#cb4b16",
"mOnHover": "#fdf6e3"
}
}

8
Assets/ColorScheme/Tokyo-Night/Tokyo-Night.json
View File

@@ -13,7 +13,9 @@
"mSurfaceVariant": "#24283b",
"mOnSurfaceVariant": "#9aa5ce",
"mOutline": "#565f89",
"mShadow": "#15161e"
"mShadow": "#15161e",
"mHover": "#9ece6a",
"mOnHover": "#16161e"
},
"light": {
"mPrimary": "#2e7de9",
@@ -29,6 +31,8 @@
"mSurfaceVariant": "#d0d5e3",
"mOnSurfaceVariant": "#6172b0",
"mOutline": "#b4b5b9",
"mShadow": "#a8aecb"
"mShadow": "#a8aecb",
"mHover": "#587539",
"mOnHover": "#e1e2e7"
}
}

5
Assets/MatugenTemplates/noctalia.json
View File

@@ -18,5 +18,8 @@
"mOnSurfaceVariant": "{{colors.on_surface_variant.default.hex}}",
"mOutline": "{{colors.outline_variant.default.hex}}",
"mShadow": "{{colors.shadow.default.hex}}"
"mShadow": "{{colors.shadow.default.hex}}",
"mHover": "{{colors.tertiary.default.hex}}",
"mOnHover": "{{colors.on_tertiary.default.hex}}"
}

17
Commons/Color.qml
View File

@@ -42,14 +42,14 @@ Singleton {
property color mOutline: customColors.mOutline
property color mShadow: customColors.mShadow
property color mHover: customColors.mHover
property color mOnHover: customColors.mOnHover
// --- Absolute Colors
property color transparent: "transparent"
property color black: "#000000"
property color white: "#ffffff"
// Extra colors that are auto generated
readonly property color mHover: Settings.data.colorSchemes.darkMode ? Qt.darker(mOnSurface, 1.25) : Qt.lighter(mOnSurface, 1.25)
readonly property color mOnHover: Settings.data.colorSchemes.darkMode ? Qt.darker(mSurface, 1.25) : Qt.lighter(mSurface, 1.25)
// --------------------------------
// Default colors: RosePine
QtObject {
@@ -75,6 +75,9 @@ Singleton {
property color mOutline: "#342c42"
property color mShadow: "#120f18"
property color mHover: "#e0b7c9"
property color mOnHover: "#20161f"
}
// ----------------------------------------------------------------
@@ -103,6 +106,9 @@ Singleton {
property color mOutline: customColorsData.mOutline
property color mShadow: customColorsData.mShadow
property color mHover: customColorsData.mHover
property color mOnHover: customColorsData.mOnHover
}
// FileView to load custom colors data from colors.json
@@ -155,6 +161,9 @@ Singleton {
property color mOutline: defaultColors.mOutline
property color mShadow: defaultColors.mShadow
property color mHover: defaultColors.mHover
property color mOnHover: defaultColors.mOnHover
}
}
}

14
Services/ColorSchemeService.qml
View File

@@ -211,14 +211,16 @@ Singleton {
property color mOnSecondary: "#000000"
property color mTertiary: "#000000"
property color mOnTertiary: "#000000"
property color mError: "#ff0000"
property color mError: "#000000"
property color mOnError: "#000000"
property color mSurface: "#ffffff"
property color mSurface: "#000000"
property color mOnSurface: "#000000"
property color mSurfaceVariant: "#cccccc"
property color mOnSurfaceVariant: "#333333"
property color mOutline: "#444444"
property color mSurfaceVariant: "#000000"
property color mOnSurfaceVariant: "#000000"
property color mOutline: "#000000"
property color mShadow: "#000000"
property color mHover: "#000000"
property color mOnHover: "#000000"
}
}
@@ -240,6 +242,8 @@ Singleton {
out.mOnSurfaceVariant = pick(obj, "mOnSurfaceVariant", "onSurfaceVariant", out.mOnSurfaceVariant)
out.mOutline = pick(obj, "mOutline", "outline", out.mOutline)
out.mShadow = pick(obj, "mShadow", "shadow", out.mShadow)
out.mHover = pick(obj, "mHover", "hover", out.mHover)
out.mOnHover = pick(obj, "mOnHover", "onHover", out.mOnHover)
// Force a rewrite by updating the path
colorsWriter.path = ""