Skip to content

Commit

Permalink
Fork compound-web and make tooltip design less bad
Browse files Browse the repository at this point in the history
  • Loading branch information
SpiritCroc committed Oct 25, 2024
1 parent 5bda6c9 commit 840d1f6
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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 change: 1 addition & 0 deletions compound-web
Submodule compound-web added at 049d11
6 changes: 3 additions & 3 deletions merge_helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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|[email protected]:|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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions merge_upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions res/css/sc-cpd-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 changes: 8 additions & 0 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,23 @@ $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
popd

pushd element-web
$yarn link matrix-js-sdk
$yarn link @vector-im/compound-web
$yarn link matrix-react-sdk
$yarn install
popd
Expand Down

0 comments on commit 840d1f6

Please sign in to comment.