Skip to content

Dark mode header color #7514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bramkragten merged 25 commits into from
Nov 1, 2020
Merged

Dark mode header color #7514

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b02d3e4
Add blend function and modify expand_hex
maykar Oct 28, 2020
ba1051d
Add dark header background
maykar Oct 28, 2020
ad60fa6
Update convert-color.ts
maykar Oct 28, 2020
678b76c
Add dark header background
maykar Oct 28, 2020
13cedad
Update convert-color.ts
maykar Oct 28, 2020
10c261f
Update src/resources/styles.ts
maykar Oct 28, 2020
f86567e
Update src/common/dom/apply_themes_on_element.ts
maykar Oct 28, 2020
f8211b7
Check for primary color
maykar Oct 29, 2020
22136fd
Default dim blue
maykar Oct 29, 2020
7a048e1
Update src/common/dom/apply_themes_on_element.ts
maykar Oct 29, 2020
a494080
Create hex.ts
maykar Oct 29, 2020
03599d7
Update convert-color.ts
maykar Oct 29, 2020
4b1aa7b
Update hex.ts
maykar Oct 29, 2020
e57fdf7
Update convert-color.ts
maykar Oct 29, 2020
cd49e02
Update convert-color.ts
maykar Oct 29, 2020
4c85f1f
Update hex.ts
maykar Oct 29, 2020
7c25df7
Update apply_themes_on_element.ts
maykar Oct 29, 2020
5f1bfb3
Update convert-color.ts
maykar Oct 29, 2020
9a8f1e1
Update apply_themes_on_element.ts
maykar Oct 29, 2020
7d1fb60
Update hex.ts
maykar Oct 29, 2020
11208a1
Update convert-color.ts
maykar Oct 29, 2020
eaf1c8d
Cleanup hexBlend
maykar Oct 30, 2020
033a536
More descriptive comment
maykar Oct 30, 2020
0fc917a
Fix blend options
maykar Oct 30, 2020
68d0dde
Fix default dark header color
maykar Oct 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/common/color/convert-color.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
const expand_hex = (hex: string): string => {
hex = hex.replace("#", "");
if (hex.length === 6) return hex;
let result = "";
for (const val of hex) {
result += val + val;
Expand All @@ -14,10 +16,7 @@ const rgb_hex = (component: number): string => {
// Conversion between HEX and RGB

export const hex2rgb = (hex: string): [number, number, number] => {
hex = hex.replace("#", "");
if (hex.length === 3 || hex.length === 4) {
hex = expand_hex(hex);
}
hex = expand_hex(hex);

return [
parseInt(hex.substring(0, 2), 16),
Expand Down Expand Up @@ -111,3 +110,18 @@ export const lab2hex = (lab: [number, number, number]): string => {
const rgb = lab2rgb(lab);
return rgb2hex(rgb);
};

// Blend two colors with percentage
export const blend = (color_1: string, color_2: string, mix = 50): string => {
Comment thread
maykar marked this conversation as resolved.
Outdated
let color = "";
color_1 = expand_hex(color_1);
color_2 = expand_hex(color_2);
for (let i = 0; i <= 5; i += 2) {
const c1 = parseInt(color_1.substr(i, 2), 16);
const c2 = parseInt(color_2.substr(i, 2), 16);
let hex = Math.floor(c2 + (c1 - c2) * (mix / 100)).toString(16);
while (hex.length < 2) hex = "0" + hex;
color += hex;
}
return `#${color}`;
};
Comment thread
maykar marked this conversation as resolved.
Outdated
8 changes: 8 additions & 0 deletions src/common/dom/apply_themes_on_element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
lab2rgb,
rgb2hex,
rgb2lab,
blend,
} from "../color/convert-color";
import { labBrighten, labDarken } from "../color/lab";
import { rgbContrast } from "../color/rgb";
Expand Down Expand Up @@ -37,6 +38,13 @@ export const applyThemesOnElement = (
if (themeOptions.dark) {
cacheKey = `${cacheKey}__dark`;
themeRules = darkStyles;
if (themeOptions.primaryColor) {
themeRules["app-header-background-color"] = blend(
Comment thread
maykar marked this conversation as resolved.
Outdated
themeOptions.primaryColor,
"#111",
Comment thread
maykar marked this conversation as resolved.
Outdated
15
Comment thread
maykar marked this conversation as resolved.
Outdated
);
}
}
if (themeOptions.primaryColor) {
cacheKey = `${cacheKey}__primary_${themeOptions.primaryColor}`;
Expand Down
2 changes: 1 addition & 1 deletion src/resources/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const darkStyles = {
"secondary-text-color": "#9b9b9b",
"disabled-text-color": "#6f6f6f",
"app-header-text-color": "#e1e1e1",
"app-header-background-color": "#1c1c1c",
"app-header-background-color": "#0e2733",
"switch-unchecked-button-color": "#999999",
"switch-unchecked-track-color": "#9b9b9b",
"divider-color": "rgba(225, 225, 225, .12)",
Expand Down