diff --git a/README.md b/README.md index 75cd4b7..4a33b58 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Element Web Modifications For version [1.7.34-40](https://github.com/vector-im/element-web) -![Element Showcase](https://gitfap.de/noxy/element-modifications/-/raw/master/img/2021-05-19_19-35.png "Element Showcase") +![Element Showcase](https://gitfap.de/noxy/element-modifications/-/raw/master/img/2021-08-12_13-24.png "Element Showcase") Running at https://chat.f0ck.it @@ -22,6 +22,12 @@ Copy the `patch` directory to the root of the element-web directory and run the `yarn dist` +After successful compile go to the dist/ directory and unpack your compiled element-web, open the index.html and add the following line after `` + +`` + +Should be around line ~53 + # If weak male download prebuilt See prebuilt folder for that @@ -42,7 +48,7 @@ Fill in this: "stickerpicker": { "content": { "type": "m.stickerpicker", - "url": "https://matrix.f0ck.it/?theme=$theme", + "url": "https://matrix.f0ck.it/stickers/?theme=$theme", "name": "Stickerpicker", "data": {} }, diff --git a/config.json b/config.json index 89d5f44..ac1726b 100644 --- a/config.json +++ b/config.json @@ -12,7 +12,7 @@ "brand": "f0ck.it", "branding": { "welcomeBackgroundUrl": "/img/background-auth.jpg", - "authFooterLinks": [{"text": "chat.f0ck.it is running with glowers patchset on version 1.7.29-21 ", "url": "https://gitfap.de/noxy/element-modifications"}] + "authFooterLinks": [{"text": "chat.f0ck.it is running with glowers patchset on version 1.7.34-40-g66c86697 ", "url": "https://gitfap.de/noxy/element-modifications"}] }, "embeddedPages": { "loginForWelcome": true diff --git a/custom.css b/custom.css index a7735bc..4a250a5 100644 --- a/custom.css +++ b/custom.css @@ -312,6 +312,7 @@ span.mx_MVideoBody video.mx_MVideoBody { .mx_MediaBody.mx_AudioPlayer_container .mx_AudioPlayer_seek .mx_Clock { width: auto; } +<<<<<<< HEAD .mx_ToastContainer .mx_Toast_toast, .mx_ToastContainer.mx_ToastContainer_stacked::before { -webkit-box-shadow: 0px 0px 0px 1px rgba(136, 131, 131, 0.5); @@ -342,4 +343,6 @@ span.mx_MVideoBody video.mx_MVideoBody { -webkit-box-shadow: unset; box-shadow: unset; border-radius: 0; -} \ No newline at end of file +} +======= +>>>>>>> 26529aa77a2fdc33f832f6903982bb6f048c8d18 diff --git a/img/2021-05-19_19-35.png b/img/2021-05-19_19-35.png deleted file mode 100644 index 3c565e4..0000000 Binary files a/img/2021-05-19_19-35.png and /dev/null differ diff --git a/img/2021-08-12_13-24.png b/img/2021-08-12_13-24.png new file mode 100644 index 0000000..f163eb6 Binary files /dev/null and b/img/2021-08-12_13-24.png differ diff --git a/patch/code_patches.sh b/patch/code_patch.sh similarity index 90% rename from patch/code_patches.sh rename to patch/code_patch.sh index 597e720..a33532b 100644 --- a/patch/code_patches.sh +++ b/patch/code_patch.sh @@ -1,7 +1,3 @@ #!/bin/bash - - - - echo Adding greentext patch... -patch "../node_modules/commonmark/dist/commonmark.js" ./greentext.patch \ No newline at end of file +patch "../node_modules/commonmark/dist/commonmark.js" ./greentext.patch