github/schildichat-desktop
1
0
Fork 1
mirror of https://github.com/SchildiChat/schildichat-desktop.git synced 2025-03-25 17:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fork compound-web and make tooltip design less bad

Browse Source
This commit is contained in:
SpiritCroc 2024-10-25 18:29:06 +02:00
parent 5bda6c96d6
commit 840d1f60ea
6 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -10,3 +10,6 @@
[submodule "element-desktop"]
path = element-desktop
url = https://github.com/SchildiChat/element-desktop.git
[submodule "compound-web"]
path = compound-web
url = https://github.com/SchildiChat/compound-web.git

1
compound-web Submodule

@ -0,0 +1 @@
Subproject commit 049d117dbd9fb88f15277e42fa9702fdab5003d1

6
merge_helpers.sh
View File

@ -17,11 +17,11 @@ add_upstream() {
echo "Remote named upstream already exists, deleting..."
git remote remove upstream
fi
local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|')"
local sc_remote="$(git remote -v|grep origin|grep fetch|sed 's|.*\t\(.*\) (fetch)|\1|;s|git@github.com:|https://github.com/|')"
if echo "$sc_remote" | grep -q matrix-js-sdk; then
# matrix.org repo
local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|matrix-org|')"
elif echo "$sc_remote" | grep -q "element\\|matrix-react-sdk"; then
elif echo "$sc_remote" | grep -q "element\\|matrix-react-sdk\\|compound-web"; then
# vector-im repo
local upstream_remote="$(echo "$sc_remote" | sed 's|SchildiChat|element-hq|')"
else
@ -34,7 +34,7 @@ add_upstream() {
}
forall_repos() {
for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop"; do
for repo in "matrix-js-sdk" "matrix-react-sdk" "element-web" "element-desktop" "compound-web"; do
pushd "$SCHILDI_ROOT/$repo" > /dev/null
"$@"
popd > /dev/null

3
merge_upstream.sh
View File

@ -56,4 +56,7 @@ forall_repos commit_if_dirty "Automatic setup commit"
./apply_patches.sh
compound_web_version=`cat matrix-react-sdk/package.json|grep compound-web|sed 's|.*: \"\(.*\)",|\1|;s|\^||'`
echo "TODO: merge compound web at $compound_web_version"
popd > /dev/null

2
res/css/sc-cpd-overrides.css
View File

@ -88,6 +88,7 @@
--cpd-color-gray-200: #212121;
--cpd-color-gray-100: #171717;
--cpd-color-theme-bg: #171717;
--cpd-color-tooltip-bg: #424242;
}
.cpd-theme-light.cpd-theme-light {
@ -171,4 +172,5 @@
--cpd-color-gray-200: #f5f5f5;
--cpd-color-gray-100: #fafafa;
--cpd-color-theme-bg: #ffffff;
--cpd-color-tooltip-bg: #f5f5f5;
}

8
setup.sh
View File

@ -10,8 +10,15 @@ $yarn link
$yarn install
popd
pushd compound-web
$yarn unlink &>/dev/null || true
$yarn link
$yarn install
popd
pushd matrix-react-sdk
$yarn link matrix-js-sdk
$yarn link @vector-im/compound-web
$yarn unlink &>/dev/null || true
$yarn link
$yarn install
@ -19,6 +26,7 @@ popd
pushd element-web
$yarn link matrix-js-sdk
$yarn link @vector-im/compound-web
$yarn link matrix-react-sdk
$yarn install
popd