diff --git a/main.js b/main.js index 0b97d8d..5123dfe 100644 --- a/main.js +++ b/main.js @@ -6,12 +6,7 @@ const os = require("os"); require("v8-compile-cache"); require("./utils/updater"); -if (os.type() == 'Linux'){ - var iconformat = __dirname + "/discord.png" -} else { //test this - console.log("Running Non-Linux") - var iconformat = __dirname + "/discord.ico"; -} +var iconformat = __dirname + "/discord.png" contextMenu({ prepend: (defaultActions, parameters, browserWindow) => [ diff --git a/manager.css b/manager.css new file mode 100644 index 0000000..b9b0858 --- /dev/null +++ b/manager.css @@ -0,0 +1,117 @@ +@import url("https://kckarnige.github.io/femboi_owo/discord-font.css"); + +:root { + background-color: #2f3136; + user-select: none; + --header-secondary: #b9bbbe; + --header-primary: #fff; + --background-tertiary: #202225; +} + +body { + color: white; +} + +h1 { + font-size: 0; + text-align: center; + transform: translateY(-105%); +} + +.logo:before { + content: "ARM"; + color: #7289da; + font-weight: normal; + font-family: Helvetica, sans-serif; +} + +span { + text-align: center; +} + +.logo { + color: #ffffff; + font-weight: normal; + font-family: Discordinated; + font-size: 32px; + text-align: center; +} + +.container { + position: fixed; + top: 50%; + left: 50%; + color: #fff; + transform: translate(-50%, -50%); +} + +button.back-btn { + position: absolute; + background-color: #7289da; + font-family: Whitney, "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #ffffff; + padding: 4px; + border-radius: 5px; + width: 105px; + height: 25px; + margin-top: 5px; + margin-left: 5px; + text-align: center; + border-style: none; + outline: none; +} + +button.back-btn:hover { + background-color: #687dc6; + border-style: none; + outline: none; + cursor: pointer; +} + +button.back-btn:active { + background-color: #5c6fb1; +} + +#tm-list { + position: absolute; + top: 100px; + left: 50%; + transform: translateX(-50%); +} + +#tm-list-item { + background: #23272a; + font-family: Whitney, Helvetica Neue, Helvetica, Arial, sans-serif; + width: 100%; + border-radius: 5px; + padding: 10px 10px 18px; +} + +#theme-name { + color: #7289da; + font-weight: 400; + font-size: 20px; +} + +#theme-author { + color: #99aab5; + font-size: 12px; +} + +#theme-description { + color: #b9bbbe; + font-size: 15px; + position: relative; + top: 8px; + width: 75%; +} + +::-webkit-scrollbar { + width: 0.4em; + background: transparent; +} + +::-webkit-scrollbar-thumb { + background: #202225; + border-radius: 25px; +} diff --git a/manager.html b/manager.html index 96d3d7f..60f668f 100644 --- a/manager.html +++ b/manager.html @@ -3,84 +3,7 @@ ArmCord Manager - + diff --git a/utils/theme.js b/utils/theme.js index c515406..8814e82 100644 --- a/utils/theme.js +++ b/utils/theme.js @@ -1,5 +1,5 @@ const fs = require("fs"); -const armcord = require("./ArmCord.js"); +const armcord = require("./armcord.js"); const themeFolder = __dirname + "/themes/"; window.addEventListener("DOMContentLoaded", () => { @@ -14,13 +14,13 @@ window.addEventListener("DOMContentLoaded", () => { const theme = fs.readFileSync(`${__dirname}/themes/${file}/${themeFile.theme}`, "utf8"); if (themeFile.theme.endsWith(".scss")) { console.log( - `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't support scss files if you want to have this theme ported feel free to reach out https://discord.gg/F25bc4RYDt `, + `%cCouldn't load ${themeFile.name} made by ${themeFile.author}. ArmCord doesn't support SCSS files! If you want to have this theme ported, feel free to reach out https://discord.gg/F25bc4RYDt `, "color:red; font-weight: bold; font-size: 50px;color: red;" ); } armcord.addStyle(theme); - var html = `

${themeFile.name}

`; - document.getElementById("tm-list").insertAdjacentHTML("afterend", html); + var html = `
${themeFile.name}
By ${themeFile.author}
${themeFile.description}


`; + document.getElementById("tm-list").innerHTML = html + document.getElementById("tm-list").innerHTML; console.log(`%cLoaded ${themeFile.name} made by ${themeFile.author}`, "color:red"); } catch (err) { console.error(err); diff --git a/utils/themes/test_thing/LICENSE b/utils/themes/test_thing/LICENSE new file mode 100644 index 0000000..3cf6dad --- /dev/null +++ b/utils/themes/test_thing/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2021 GooseNest + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/utils/themes/test_thing/README.md b/utils/themes/test_thing/README.md new file mode 100644 index 0000000..3fb7430 --- /dev/null +++ b/utils/themes/test_thing/README.md @@ -0,0 +1,3 @@ +# GT-RevertRebrand ArmCord + +Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) diff --git a/utils/themes/test_thing/RevertRebrand.theme.css b/utils/themes/test_thing/RevertRebrand.theme.css new file mode 100644 index 0000000..c342047 --- /dev/null +++ b/utils/themes/test_thing/RevertRebrand.theme.css @@ -0,0 +1,9 @@ +/** + * @name Revert Rebrand + * @author GooseNest + * @description Reverts Discord's 2021 rebrand (font, colors, reactions, mentions, loading screen, home icon, reply ping color, and more) + * @invite neMncS2 + * @version 3.0 +*/ + +@import url('https://Goose-Nest.github.io/GT-RevertRebrand/src/main.css'); \ No newline at end of file diff --git a/utils/themes/test_thing/manifest.json b/utils/themes/test_thing/manifest.json new file mode 100644 index 0000000..c0dad3e --- /dev/null +++ b/utils/themes/test_thing/manifest.json @@ -0,0 +1,8 @@ +{ + "name": "Test Theme", + "description": "A test description (For theme seperation)", + "version": "3.0", + "author": "KayoticCarnige", + "license": "MIT", + "theme": "RevertRebrand.theme.css" +} \ No newline at end of file