From cab151807d90c45af1a18732df1c62a124dbf769 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Mon, 6 May 2024 23:11:03 +0000 Subject: [PATCH 01/16] add iceshrimp light theme --- data/iceshrimp-light/Custom.css | 29 ++++++++++++++++++++ data/iceshrimp-light/Preset.toml | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 data/iceshrimp-light/Custom.css create mode 100644 data/iceshrimp-light/Preset.toml diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css new file mode 100644 index 0000000..7e8867f --- /dev/null +++ b/data/iceshrimp-light/Custom.css @@ -0,0 +1,29 @@ +/* + This is the default CSS for the IceShrimp Light theme. + + This applies small fixes that makes Revolt more in place with the + theme, it is entirely optional to have this CSS as-is, but + things may feel slightly off. +*/ + +:root { + font-feature-settings: "liga" 1, "calt" 1; +} + +.name { + font-size: larger; + font-weight: 900; +} + +a[href^="/server/"] svg>circle { + fill: #303446 !important; +} + +[class^="UserShort__Name"] { + filter: contrast(75%); +} + +[class^="MessageReply__ReplyBase-sc-"]::before { + border-inline-start: 2px solid #a5adce; + border-top: 2px solid #a5adce; +} \ No newline at end of file diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml new file mode 100644 index 0000000..8467a2c --- /dev/null +++ b/data/iceshrimp-light/Preset.toml @@ -0,0 +1,46 @@ +slug = "iceshrimp-light" +name = "IceShrimp Light" +creator = "theycallhermax" +description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" +tags = ["light", "iceshrimp"] +version = "1.0.0" + +[variables] +light = true +accent = "#9A92FF" +background = "#f1f5ff" +foreground = "#3B364C" + +block = "#414141" +message-box = "#f1f5ff" +mention = "rgb(229, 200, 144, 0.40)" + +success = "#a6d189" +warning = "#ef9f76" +error = "#e78284" +hover = "rgba(0, 0, 0, 0.1)" + +[variables.scrollbar] +thumb = "#9A92FF" +track = "transparent" + +[variables.primary] +background = "#E7EDFF" +header = "#f1f5ff" + +[variables.secondary] +background = "#f1f5ff" +foreground = "#3B364C" +header = "#c6d0f5" + +[variables.tertiary] +background = "#9A92FF" +foreground = "#3B364C" + +[variables.status] +online = "#a6da95" +away = "#e5c890" +busy = "#e78284" + +streaming = "#8caaee" +invisible = "#c6d0f5" From a01a38a99539ac8500a1bf4537684907cc30c065 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Tue, 7 May 2024 10:20:40 -0400 Subject: [PATCH 02/16] fix status colours in iceshrimp light --- data/iceshrimp-light/Preset.toml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 8467a2c..6ebea1d 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -38,9 +38,8 @@ background = "#9A92FF" foreground = "#3B364C" [variables.status] -online = "#a6da95" -away = "#e5c890" -busy = "#e78284" - -streaming = "#8caaee" +online = "#40a02b" +away = "#df8e1d" +busy = "#e64553" +streaming = "#7287fd" invisible = "#c6d0f5" From 058716e8a75aca90de51a267dfa726168e23e557 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Tue, 7 May 2024 10:28:47 -0400 Subject: [PATCH 03/16] fix error colour in iceshrimp light --- data/iceshrimp-light/Preset.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 6ebea1d..4a5ddbd 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -17,7 +17,7 @@ mention = "rgb(229, 200, 144, 0.40)" success = "#a6d189" warning = "#ef9f76" -error = "#e78284" +error = "#e64553" hover = "rgba(0, 0, 0, 0.1)" [variables.scrollbar] From ea562e2e8bf8a7574e2f9ee371d8009eadb572e2 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 01:50:18 -0400 Subject: [PATCH 04/16] update `Custom.css` in iceshrimp light --- data/iceshrimp-light/Custom.css | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index 7e8867f..8e78493 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -6,24 +6,22 @@ things may feel slightly off. */ +@import url("https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap"); + :root { font-feature-settings: "liga" 1, "calt" 1; } -.name { - font-size: larger; - font-weight: 900; -} - a[href^="/server/"] svg>circle { fill: #303446 !important; } [class^="UserShort__Name"] { - filter: contrast(75%); + filter: contrast(70%); + font-family: "DM Sans", sans-serif; } [class^="MessageReply__ReplyBase-sc-"]::before { border-inline-start: 2px solid #a5adce; border-top: 2px solid #a5adce; -} \ No newline at end of file +} From 19bffb809436a58178f21eeb256708f95bfea9fe Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 01:51:02 -0400 Subject: [PATCH 05/16] fix formatting in iceshrimp light --- data/iceshrimp-light/Custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index 8e78493..3568071 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -12,7 +12,7 @@ font-feature-settings: "liga" 1, "calt" 1; } -a[href^="/server/"] svg>circle { +a[href^="/server/"] svg > circle { fill: #303446 !important; } From 618b89f930002922020bf198105c6ac61b177429 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 01:54:55 -0400 Subject: [PATCH 06/16] add `blue` tag to iceshrimp light --- data/iceshrimp-light/Preset.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 4a5ddbd..0ad3d74 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -2,7 +2,7 @@ slug = "iceshrimp-light" name = "IceShrimp Light" creator = "theycallhermax" description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" -tags = ["light", "iceshrimp"] +tags = ["light", "blue", "iceshrimp"] version = "1.0.0" [variables] From d43e7374589a7547cf90e23f8d2f5c27f1a2824f Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 02:06:37 -0400 Subject: [PATCH 07/16] add square profile pictures to iceshrimp light --- data/iceshrimp-light/Custom.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index 3568071..5bfcdca 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -9,6 +9,8 @@ @import url("https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap"); :root { + --border-radius-user-icon: 8px; + font-feature-settings: "liga" 1, "calt" 1; } @@ -25,3 +27,11 @@ a[href^="/server/"] svg > circle { border-inline-start: 2px solid #a5adce; border-top: 2px solid #a5adce; } + +[class^="TypingIndicator__Base-sc-"] > div > [class^="avatars"] > img { + border-radius: var(--border-radius-user-icon); +} + +[data-item-index="0"] [class^="ItemContainer-sc-176t3v5-0"] foreignObject :is(div, img) { + border-radius: var(--border-radius-user-icon) !important; +} From a0451c92b3929bfeb7200ae645ceeeb6407d2d97 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 02:17:35 -0400 Subject: [PATCH 08/16] fix formatting error (again) in iceshrimp light --- data/iceshrimp-light/Custom.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index 5bfcdca..00ea61d 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -29,9 +29,14 @@ a[href^="/server/"] svg > circle { } [class^="TypingIndicator__Base-sc-"] > div > [class^="avatars"] > img { - border-radius: var(--border-radius-user-icon); + border-radius: var(--border-radius-user-icon); } [data-item-index="0"] [class^="ItemContainer-sc-176t3v5-0"] foreignObject :is(div, img) { - border-radius: var(--border-radius-user-icon) !important; + border-radius: var(--border-radius-user-icon) !important; +} + +[class^="ServerHeader__ServerBanner-sc-"] { + margin: 0.5rem; + border-radius: var(--border-radius-user-icon); } From 1ef8bdf6e416df1f96ed72a87d0182e85bbdca75 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 11:30:33 -0400 Subject: [PATCH 09/16] remove dm sans in iceshrimp light --- data/iceshrimp-light/Custom.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index 00ea61d..bc33fa7 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -6,8 +6,6 @@ things may feel slightly off. */ -@import url("https://fonts.googleapis.com/css2?family=DM+Sans:ital,opsz,wght@0,9..40,100..1000;1,9..40,100..1000&display=swap"); - :root { --border-radius-user-icon: 8px; @@ -20,7 +18,6 @@ a[href^="/server/"] svg > circle { [class^="UserShort__Name"] { filter: contrast(70%); - font-family: "DM Sans", sans-serif; } [class^="MessageReply__ReplyBase-sc-"]::before { From dae6f2fd6f0b908dfc5eed5216c85775e6a5f83a Mon Sep 17 00:00:00 2001 From: Max Walters Date: Sat, 11 May 2024 11:31:04 -0400 Subject: [PATCH 10/16] bump version in iceshrimp light --- data/iceshrimp-light/Preset.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 0ad3d74..b741b94 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -3,7 +3,7 @@ name = "IceShrimp Light" creator = "theycallhermax" description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" tags = ["light", "blue", "iceshrimp"] -version = "1.0.0" +version = "1.1.0" [variables] light = true From 9a24eefa77582ef66aa5714dc1aa2f9e7d942c78 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Tue, 28 May 2024 08:32:53 -0400 Subject: [PATCH 11/16] fix error, warning, and success colours to match upstream IceShrimp theme --- data/iceshrimp-light/Preset.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index b741b94..423aa7d 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -3,7 +3,7 @@ name = "IceShrimp Light" creator = "theycallhermax" description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" tags = ["light", "blue", "iceshrimp"] -version = "1.1.0" +version = "1.2.0" [variables] light = true @@ -15,9 +15,9 @@ block = "#414141" message-box = "#f1f5ff" mention = "rgb(229, 200, 144, 0.40)" -success = "#a6d189" -warning = "#ef9f76" -error = "#e64553" +success = "rgb(134, 179, 0)" +warning = "rgb(255, 240, 219)" +error = "rgb(236, 65, 55)" hover = "rgba(0, 0, 0, 0.1)" [variables.scrollbar] From 62a4165747d0065dd4e2e5936c43fc8ba250adb3 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Mon, 3 Jun 2024 16:23:00 -0400 Subject: [PATCH 12/16] add status colours from upstream iceshrimp theme --- data/iceshrimp-light/Preset.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 423aa7d..9e1a472 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -3,7 +3,7 @@ name = "IceShrimp Light" creator = "theycallhermax" description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" tags = ["light", "blue", "iceshrimp"] -version = "1.2.0" +version = "1.3.0" [variables] light = true @@ -38,8 +38,8 @@ background = "#9A92FF" foreground = "#3B364C" [variables.status] -online = "#40a02b" -away = "#df8e1d" -busy = "#e64553" -streaming = "#7287fd" -invisible = "#c6d0f5" +online = "#58d4c9" +away = "#e8cd7e" +busy = "#ea5353" +streaming = "#89b4fa" +invisible = "#888888" From 92ae468083a1495b9d1233140c3a86918be2e03f Mon Sep 17 00:00:00 2001 From: Max Walters Date: Mon, 3 Jun 2024 17:05:11 -0400 Subject: [PATCH 13/16] fix css wrapping --- data/iceshrimp-light/Custom.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index bc33fa7..febd2ab 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -1,9 +1,9 @@ /* This is the default CSS for the IceShrimp Light theme. - This applies small fixes that makes Revolt more in place with the - theme, it is entirely optional to have this CSS as-is, but - things may feel slightly off. + This applies small fixes that makes Revolt more in place + with the upstream theme, it is entirely optional to have + this CSS as-is, but things may feel slightly off. */ :root { @@ -37,3 +37,7 @@ a[href^="/server/"] svg > circle { margin: 0.5rem; border-radius: var(--border-radius-user-icon); } + +a, a:visited { + color: #FF7268; +} From c676152494aec363f23ab7eb2e6a94c4cb065485 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Wed, 5 Jun 2024 12:46:59 -0400 Subject: [PATCH 14/16] add `a` element colour on hover --- data/iceshrimp-light/Custom.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index febd2ab..ba97fe3 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -38,6 +38,6 @@ a[href^="/server/"] svg > circle { border-radius: var(--border-radius-user-icon); } -a, a:visited { +a, a:visited, a:hover { color: #FF7268; } From 7d6224afb8e97f827e1aa10c9b767751738f9dac Mon Sep 17 00:00:00 2001 From: Max Walters Date: Tue, 16 Jul 2024 20:19:50 -0400 Subject: [PATCH 15/16] remove custom `a` colour --- data/iceshrimp-light/Custom.css | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/iceshrimp-light/Custom.css b/data/iceshrimp-light/Custom.css index ba97fe3..d76db47 100644 --- a/data/iceshrimp-light/Custom.css +++ b/data/iceshrimp-light/Custom.css @@ -8,7 +8,6 @@ :root { --border-radius-user-icon: 8px; - font-feature-settings: "liga" 1, "calt" 1; } @@ -37,7 +36,3 @@ a[href^="/server/"] svg > circle { margin: 0.5rem; border-radius: var(--border-radius-user-icon); } - -a, a:visited, a:hover { - color: #FF7268; -} From 1c00030fdc8aa4c992d2b5232c7ee352ddffd139 Mon Sep 17 00:00:00 2001 From: Max Walters Date: Tue, 16 Jul 2024 20:22:08 -0400 Subject: [PATCH 16/16] fix capitalization in "IceShrimp" --- data/iceshrimp-light/Preset.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/iceshrimp-light/Preset.toml b/data/iceshrimp-light/Preset.toml index 9e1a472..de465df 100644 --- a/data/iceshrimp-light/Preset.toml +++ b/data/iceshrimp-light/Preset.toml @@ -1,5 +1,5 @@ slug = "iceshrimp-light" -name = "IceShrimp Light" +name = "Iceshrimp Light" creator = "theycallhermax" description = "The light theme from the Misskey fork bringing you no-nonsense fixes, features and improvements you actually want" tags = ["light", "blue", "iceshrimp"]