From 4adfb6998c671516d592519b7f9f7a1b4d237792 Mon Sep 17 00:00:00 2001
From: KayoticCarnige <32397453+kckarnige@users.noreply.github.com>
Date: Sun, 14 Nov 2021 14:19:26 -0500
Subject: [PATCH 1/4] Update README.md
---
README.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 95c059c..ba75581 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
-
-# 
+
+
+
ArmCord is a custom alternative Discord client made for people on lower-end devices and ARM architecture that want custom Discord experience. It uses [Cumcord](https://cumcord.com) for custom themes and plugins!
# How to run/install it?
From d0aef2f7a91063be94ee8a9d797ede40d6451b12 Mon Sep 17 00:00:00 2001
From: hanatic <71867548+hanatic@users.noreply.github.com>
Date: Wed, 22 Dec 2021 13:38:45 +0000
Subject: [PATCH 2/4] Fixed broken link in README
All it needed was a line break, for some reason. The more you know.
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index ba75581..81752af 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
+
ArmCord is a custom alternative Discord client made for people on lower-end devices and ARM architecture that want custom Discord experience. It uses [Cumcord](https://cumcord.com) for custom themes and plugins!
# How to run/install it?
From 521278cf0081007547ca4b21bea8c031f582f591 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Sat, 15 Jan 2022 19:31:51 +0100
Subject: [PATCH 3/4] Titlebar, client mod, Discord, everything loads
---
package-lock.json | 15 +--
package.json | 2 +-
src/content/css/discord.css | 12 ++
src/content/css/titlebar.css | 220 ++++++++++++++++-------------------
src/content/setup.html | 34 +++---
src/content/splash.html | 36 ++++--
src/main.ts | 43 +++----
src/preload/bridge.ts | 35 ++++--
src/preload/preload.ts | 43 +++----
src/utils.ts | 2 +-
10 files changed, 236 insertions(+), 206 deletions(-)
create mode 100644 src/content/css/discord.css
diff --git a/package-lock.json b/package-lock.json
index 28fd69e..eb75331 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "armcord",
"version": "3.0.0",
"license": "OSL-3.0",
"dependencies": {
@@ -17,7 +18,7 @@
"ws": "^8.4.0"
},
"devDependencies": {
- "electron": "^16.0.5"
+ "electron": "^16.0.7"
}
},
"node_modules/@electron/get": {
@@ -343,9 +344,9 @@
"dev": true
},
"node_modules/electron": {
- "version": "16.0.5",
- "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.5.tgz",
- "integrity": "sha512-TgQXWmEGQ3uH2P2JDq5GyJDEu/fimRgqp1iNisARtGreU1k3630PqWlR+4SPnSEHN9NuSv92ng6NWxtefeFzxg==",
+ "version": "16.0.7",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.7.tgz",
+ "integrity": "sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@@ -1561,9 +1562,9 @@
"dev": true
},
"electron": {
- "version": "16.0.5",
- "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.5.tgz",
- "integrity": "sha512-TgQXWmEGQ3uH2P2JDq5GyJDEu/fimRgqp1iNisARtGreU1k3630PqWlR+4SPnSEHN9NuSv92ng6NWxtefeFzxg==",
+ "version": "16.0.7",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.7.tgz",
+ "integrity": "sha512-/IMwpBf2svhA1X/7Q58RV+Nn0fvUJsHniG4TizaO7q4iKFYSQ6hBvsLz+cylcZ8hRMKmVy5G1XaMNJID2ah23w==",
"dev": true,
"requires": {
"@electron/get": "^1.13.0",
diff --git a/package.json b/package.json
index 3ed8809..ec57d61 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
},
"homepage": "https://github.com/armcord/armcord#readme",
"devDependencies": {
- "electron": "^16.0.5"
+ "electron": "^16.0.7"
},
"dependencies": {
"@types/electron-json-storage": "^4.5.0",
diff --git a/src/content/css/discord.css b/src/content/css/discord.css
new file mode 100644
index 0000000..8878bf3
--- /dev/null
+++ b/src/content/css/discord.css
@@ -0,0 +1,12 @@
+.info-1VyQPT:last-child:before {
+ content: "ArmCord Version: 3.0.0"!important;
+ height: auto;
+ line-height: 16px;
+ text-align: center;
+ color: var(--text-muted);
+ font-size: 12px;
+ text-transform: none;
+}
+.notice-3bPHh-.colorDefault-22HBa0 {
+ display: none;
+}
\ No newline at end of file
diff --git a/src/content/css/titlebar.css b/src/content/css/titlebar.css
index c8aca19..6c5df04 100644
--- a/src/content/css/titlebar.css
+++ b/src/content/css/titlebar.css
@@ -5,122 +5,104 @@
--armcord-color: #7289da;
--titlebar-color: var(--background-tertiary);
}
-.titleebar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- box-sizing: border-box;
- width: 100%;
- font-size: 13px;
- padding: 0 16px;
- overflow: hidden;
- flex-shrink: 0;
- align-items: center;
- justify-content: center;
- user-select: none;
- zoom: 1;
- line-height: 22px;
- height: 22px;
- display: flex;
- z-index: 99999;
- }
- .titlebar {
- display: block;
- top: 0;
- left: 0;
- right: 0;
- flex-shrink: 0;
- overflow: hidden;
- zoom: 1;
- box-sizing: border-box;
- width: 100%;
- clear:both;
- height: 30px;
- line-height: 30px;
- background-color: #202225;
- -webkit-app-region: drag;
- width: 100%;
- user-select: none;
- -webkit-user-select: none;
- position: fixed;
- z-index: 99999;
-
- }
- .appMount-3lHmkl{
-
- }
- .titlebar #window-title {
- width: 30%;
- height: 100%;
- line-height: 30px;
- float: left;
- padding: 0 0 0 1em;
- }
-
- .titlebar #window-controls-container {
- float: right;
- width: 150px;
- height: 100%;
- line-height: 30px;
- background-color: #202225;
- -webkit-app-region: no-drag;
- }
-
- .titlebar #window-controls-container #minimize,
- .titlebar #window-controls-container #maximize,
- .titlebar #window-controls-container #quit {
- float: left;
- height: 100%;
- width: 33%;
- text-align: center;
- color: #f7f7f7;
- cursor: default;
- }
-
- .titlebar #window-controls-container #minimize:hover {
- background-color: #99AAB5;
- }
- .titlebar #window-controls-container #maximize:hover {
- background-color: #99AAB5;
- }
- .titlebar #window-controls-container #quit:hover {
- background-color: #F04747;
- }
- .titlebar #window-controls-container #quit {
- background-color: #f7f7f7;
- -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- }
- .titlebar #window-controls-container #minimize {
- background-color: #f7f7f7;
- -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- }
- .titlebar #window-controls-container #maximize {
- background-color: #f7f7f7;
- -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E") no-repeat 50% 50%;
- }
- .window-title:after {
- content: "Cord";
- color: var(--cord-color) !important;
- font-weight: normal;
- font-size: 14px;
- font-family: Discordinated;
- }
- .window-title:before {
- content: "ARM";
- color: var(--armcord-color);
- font-weight: normal;
- font-size: 14px;
- font-family: Helvetica, sans-serif;
- }
- .window-title {
- font-size: 0px !important;
- margin-left: initial !important;
- transform: translate(10px, 0px);
- }
- .withFrame-haYltI {
- height: 23px !important;
- }
\ No newline at end of file
+.titlebar {
+ display: block;
+ top: 0;
+ left: 0;
+ right: 0;
+ flex-shrink: 0;
+ overflow: hidden;
+ zoom: 1;
+ box-sizing: border-box;
+ width: 100%;
+ clear: both;
+ height: 30px;
+ line-height: 30px;
+ background-color: #202225;
+ -webkit-app-region: drag;
+ width: 100%;
+ user-select: none;
+ -webkit-user-select: none;
+ position: fixed;
+ z-index: 99999;
+}
+.titlebar #window-title {
+ width: 30%;
+ height: 100%;
+ line-height: 30px;
+ float: left;
+ padding: 0 0 0 1em;
+}
+
+.titlebar #window-controls-container {
+ float: right;
+ width: 150px;
+ height: 100%;
+ line-height: 30px;
+ background-color: #202225;
+ -webkit-app-region: no-drag;
+}
+
+.titlebar #window-controls-container #minimize,
+.titlebar #window-controls-container #maximize,
+.titlebar #window-controls-container #quit {
+ float: left;
+ height: 100%;
+ width: 33%;
+ text-align: center;
+ color: #f7f7f7;
+ cursor: default;
+}
+
+.titlebar #window-controls-container #minimize:hover {
+ background-color: #99aab5;
+}
+.titlebar #window-controls-container #maximize:hover {
+ background-color: #99aab5;
+}
+.titlebar #window-controls-container #quit:hover {
+ background-color: #f04747;
+}
+.titlebar #window-controls-container #quit {
+ background-color: #f7f7f7;
+ -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+ mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+}
+.titlebar #window-controls-container #minimize {
+ background-color: #f7f7f7;
+ -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+ mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+}
+.titlebar #window-controls-container #maximize {
+ background-color: #f7f7f7;
+ -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+ mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
+ no-repeat 50% 50%;
+}
+.window-title:after {
+ content: "Cord";
+ color: var(--cord-color) !important;
+ font-weight: normal;
+ font-size: 14px;
+ font-family: Discordinated;
+}
+.window-title:before {
+ content: "ARM";
+ color: var(--armcord-color);
+ font-weight: normal;
+ font-size: 14px;
+ font-family: Helvetica, sans-serif;
+}
+.window-title {
+ font-size: 0px !important;
+ margin-left: initial !important;
+ transform: translate(10px, 0px);
+}
+.withFrame-haYltI {
+ height: 30px !important;
+}
diff --git a/src/content/setup.html b/src/content/setup.html
index e0cb1d1..88bd26f 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -22,23 +22,23 @@