mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-13 14:10:47 +02:00
Initial compound-based SC theme bringup
This commit is contained in:
@ -58,5 +58,5 @@ index 54da3f3..354f039 100644
|
||||
if (!haveDeploy) {
|
||||
const outPath = path.join(pkgDir, filename);
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -52,5 +52,5 @@ index 1128b40d3..d85526642 100644
|
||||
|
||||
/**
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -25,5 +25,5 @@ index c3450d70cf..e296676149 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -259,5 +259,5 @@ index 50cecda665..8efc2d040d 100644
|
||||
DefaultTagID.Conference,
|
||||
DefaultTagID.Untagged,
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -21,5 +21,5 @@ index 67ee1ca084..67dcaa3855 100644
|
||||
|
||||
/**
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -100,5 +100,5 @@ index 194cb31d20..0c0aec2138 100644
|
||||
// file extension.
|
||||
text = content.body;
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -25,5 +25,5 @@ index e0e06ec980..7ee27f8402 100644
|
||||
isState: false,
|
||||
previewer: new PollStartEventPreview(),
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -26,5 +26,5 @@ index 93fb42f447..09df8eaac9 100644
|
||||
|
||||
return (
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -21,5 +21,5 @@ index cc027c9682..c4c31a51cb 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -21,5 +21,5 @@ index ff60309e08..275b6d330b 100644
|
||||
|
||||
public tilesWithPadding(n: number, paddingPx: number): number {
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -88,5 +88,5 @@ index 90358f3310..60df05478a 100644
|
||||
const newValue = SettingsStore.getValue("Spaces.enabledMetaSpaces");
|
||||
const enabledMetaSpaces = metaSpaceOrder.filter((k) => newValue[k]);
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -130,5 +130,5 @@ index 2c2eb442a0..62bfd2ea0f 100644
|
||||
isEmojiDisabled={this.isEmojiDisabled}
|
||||
onFinished={this.props.onFinished}
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -28,5 +28,5 @@ index f2e3885de4..2a8bb9224e 100644
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -75,5 +75,5 @@ index 60df05478a..0be7ba190a 100644
|
||||
cliSpace?.getMyMembership() !== KnownMembership.Invite &&
|
||||
this.matrixClient.getRoom(roomId)?.getMyMembership() === KnownMembership.Join &&
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -20,5 +20,5 @@ index 9859f24015..957b54286c 100644
|
||||
const rooms = (this.state.rooms || []).slice(); // cheap clone
|
||||
const msc3946ProcessDynamicPredecessor = SettingsStore.getValue("feature_dynamic_room_predecessors");
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -20,5 +20,5 @@ index 05a3dac067..7861af6381 100644
|
||||
|
||||
/* FIXME THEME - Tint by CSS rather than referencing a duplicate asset */
|
||||
--
|
||||
2.46.2
|
||||
2.47.0
|
||||
|
||||
|
@ -0,0 +1,34 @@
|
||||
From 8b2c552f798e64974d0a0380f55cadb4f72dd67c Mon Sep 17 00:00:00 2001
|
||||
From: SpiritCroc <dev@spiritcroc.de>
|
||||
Date: Sun, 13 Oct 2024 11:23:54 +0200
|
||||
Subject: Import SC compound theme overrides
|
||||
|
||||
---
|
||||
res/css/_common.pcss | 1 +
|
||||
res/css/sc-cpd-overrides.css | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
create mode 120000 res/css/sc-cpd-overrides.css
|
||||
|
||||
diff --git a/res/css/_common.pcss b/res/css/_common.pcss
|
||||
index 7861af6381..f7a660a339 100644
|
||||
--- a/res/css/_common.pcss
|
||||
+++ b/res/css/_common.pcss
|
||||
@@ -11,6 +11,7 @@ Please see LICENSE files in the repository root for full details.
|
||||
|
||||
@import url("@vector-im/compound-design-tokens/assets/web/css/compound-design-tokens.css") layer(compound);
|
||||
@import url("@vector-im/compound-web/dist/style.css");
|
||||
+@import "./sc-cpd-overrides.css";
|
||||
@import "./_font-sizes.pcss";
|
||||
@import "./_animations.pcss";
|
||||
@import "./_spacing.pcss";
|
||||
diff --git a/res/css/sc-cpd-overrides.css b/res/css/sc-cpd-overrides.css
|
||||
new file mode 120000
|
||||
index 0000000000..532e96fddc
|
||||
--- /dev/null
|
||||
+++ b/res/css/sc-cpd-overrides.css
|
||||
@@ -0,0 +1 @@
|
||||
+../../../res/css/sc-cpd-overrides.css
|
||||
\ No newline at end of file
|
||||
--
|
||||
2.47.0
|
||||
|
Reference in New Issue
Block a user