From 09a1b388e33b0984e738d6b07bbf9dc395dde575 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Sat, 8 May 2021 17:09:46 +0200 Subject: [PATCH] Bump version add changes from https://github.com/kckarnige/armcord thanks --- main.js | 2 +- package.json | 2 +- preload.js | 24 +++++++++++++++++++----- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/main.js b/main.js index f24a492..a5bcfa6 100644 --- a/main.js +++ b/main.js @@ -8,7 +8,7 @@ require("./utils/updater"); if (os.type() == 'Linux'){ var iconformat = __dirname + "/discord.png" -} else { +} else { //test this console.log("Running Non-Linux") var iconformat = __dirname + "/discord.ico"; } diff --git a/package.json b/package.json index 76abfa5..0eec7e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "armcord", - "version": "2.3.3", + "version": "2.4.0", "description": "ArmCord is a Discord client made for ARM Linux that allows you to customize your experience.", "main": "main.js", "scripts": { diff --git a/preload.js b/preload.js index a98f193..de85cf9 100644 --- a/preload.js +++ b/preload.js @@ -26,10 +26,20 @@ electronLocalshortcut.register(currentWindow, "F5", () => { electronLocalshortcut.register(currentWindow, "F12", () => { currentWindow.webContents.openDevTools(); }); +electronLocalshortcut.register(currentWindow, "F1", () => { + require("shell").openExternal("https://support.discord.com/"); +}); +electronLocalshortcut.register(currentWindow, "F2", () => { + window.location.href = "https://discord.com/invite/F25bc4RYDt"; +}); require("./utils/capturer.js") addStyle(` @import url("https://kckarnige.github.io/femboi_owo/discord-font.css"); - +:root { + --window-buttons: var(--header-secondary); + --cord-color: var(--header-primary); + --armcord-color: #7289da; +} .base-3dtUhz, .sidebar-2K8pFh { display: -webkit-box; display: -ms-flexbox; @@ -47,7 +57,7 @@ div.menubar[role="menubar"] { .window-title:after { content: "Cord"; - color: #fff; + color: var(--cord-color) !important; font-weight: normal; font-size: 14px; font-family: Discordinated; @@ -55,7 +65,7 @@ div.menubar[role="menubar"] { .window-title:before { content: "ARM"; - color: #7289da; + color: var(--armcord-color); font-weight: normal; font-size: 14px; font-family: Helvetica, sans-serif; @@ -67,8 +77,12 @@ div.menubar[role="menubar"] { transform: translate(10px, 2px) !important; } -.titlebar { - background: #202225 !important; +background: #202225 !important; + background: var(--background-tertiary) !important; + font-family: Verdana, Geneva, Tahoma, sans-serif; +} +.titlebar .window-controls-container .window-icon { + background: var(--window-buttons) !important; } `); })