diff --git a/build/build.js b/build/build.js index b99fe29d..1b0a5198 100644 --- a/build/build.js +++ b/build/build.js @@ -114,9 +114,6 @@ function minifyExt() { .on('data', item => minifyItem(item.path)) .on('end', () => { console.info("Searched for files to minify"); - //console.info("Removing csscomponents..."); - - //fs.removeSync(tmpDirExt + "/sources/csscomponents"); makeChromeExt(); }) diff --git a/common/assets/csscomponents/.stylelintrc.json b/common/assets/css/components/.stylelintrc.json similarity index 100% rename from common/assets/csscomponents/.stylelintrc.json rename to common/assets/css/components/.stylelintrc.json diff --git a/common/assets/csscomponents/accessibilityHelper.css b/common/assets/css/components/accessibilityHelper.css similarity index 100% rename from common/assets/csscomponents/accessibilityHelper.css rename to common/assets/css/components/accessibilityHelper.css diff --git a/common/assets/csscomponents/alert.css b/common/assets/css/components/alert.css similarity index 100% rename from common/assets/csscomponents/alert.css rename to common/assets/css/components/alert.css diff --git a/common/assets/csscomponents/calendarDropdown.css b/common/assets/css/components/calendarDropdown.css similarity index 100% rename from common/assets/csscomponents/calendarDropdown.css rename to common/assets/css/components/calendarDropdown.css diff --git a/common/assets/csscomponents/classicnav.css b/common/assets/css/components/classicnav.css similarity index 100% rename from common/assets/csscomponents/classicnav.css rename to common/assets/css/components/classicnav.css diff --git a/common/assets/csscomponents/collapsed.css b/common/assets/css/components/collapsed.css similarity index 100% rename from common/assets/csscomponents/collapsed.css rename to common/assets/css/components/collapsed.css diff --git a/common/assets/csscomponents/contextmenu.css b/common/assets/css/components/contextmenu.css similarity index 100% rename from common/assets/csscomponents/contextmenu.css rename to common/assets/css/components/contextmenu.css diff --git a/common/assets/csscomponents/coredefinitions.css b/common/assets/css/components/coredefinitions.css similarity index 100% rename from common/assets/csscomponents/coredefinitions.css rename to common/assets/css/components/coredefinitions.css diff --git a/common/assets/csscomponents/emoji.css b/common/assets/css/components/emoji.css similarity index 100% rename from common/assets/csscomponents/emoji.css rename to common/assets/css/components/emoji.css diff --git a/common/assets/csscomponents/emojipicker.css b/common/assets/css/components/emojipicker.css similarity index 100% rename from common/assets/csscomponents/emojipicker.css rename to common/assets/css/components/emojipicker.css diff --git a/common/assets/csscomponents/gifpicker.css b/common/assets/css/components/gifpicker.css similarity index 100% rename from common/assets/csscomponents/gifpicker.css rename to common/assets/css/components/gifpicker.css diff --git a/common/assets/csscomponents/icon.css b/common/assets/css/components/icon.css similarity index 100% rename from common/assets/csscomponents/icon.css rename to common/assets/css/components/icon.css diff --git a/common/assets/csscomponents/marginclasses.css b/common/assets/css/components/marginclasses.css similarity index 100% rename from common/assets/csscomponents/marginclasses.css rename to common/assets/css/components/marginclasses.css diff --git a/common/assets/csscomponents/mobile.css b/common/assets/css/components/mobile.css similarity index 100% rename from common/assets/csscomponents/mobile.css rename to common/assets/css/components/mobile.css diff --git a/common/assets/csscomponents/navigationdrawer.css b/common/assets/css/components/navigationdrawer.css similarity index 100% rename from common/assets/csscomponents/navigationdrawer.css rename to common/assets/css/components/navigationdrawer.css diff --git a/common/assets/csscomponents/notifications.css b/common/assets/css/components/notifications.css similarity index 100% rename from common/assets/csscomponents/notifications.css rename to common/assets/css/components/notifications.css diff --git a/common/assets/csscomponents/settings.css b/common/assets/css/components/settings.css similarity index 100% rename from common/assets/csscomponents/settings.css rename to common/assets/css/components/settings.css diff --git a/common/assets/csscomponents/spinner.css b/common/assets/css/components/spinner.css similarity index 100% rename from common/assets/csscomponents/spinner.css rename to common/assets/css/components/spinner.css diff --git a/common/assets/csscomponents/superclasses.css b/common/assets/css/components/superclasses.css similarity index 100% rename from common/assets/csscomponents/superclasses.css rename to common/assets/css/components/superclasses.css diff --git a/common/assets/csscomponents/themeeditor.css b/common/assets/css/components/themeeditor.css similarity index 100% rename from common/assets/csscomponents/themeeditor.css rename to common/assets/css/components/themeeditor.css diff --git a/common/assets/csscomponents/twittercard.css b/common/assets/css/components/twittercard.css similarity index 99% rename from common/assets/csscomponents/twittercard.css rename to common/assets/css/components/twittercard.css index 735b6021..1d6b2a80 100644 --- a/common/assets/csscomponents/twittercard.css +++ b/common/assets/css/components/twittercard.css @@ -6,7 +6,7 @@ */ @import "coredefinitions.css"; -@import "../cssextensions/dark.css"; +@import "../extensions/dark.css"; @font-face { font-family:Material; diff --git a/common/assets/csscomponents/welcome.css b/common/assets/css/components/welcome.css similarity index 100% rename from common/assets/csscomponents/welcome.css rename to common/assets/css/components/welcome.css diff --git a/common/assets/csscomponents/windowcontrol.css b/common/assets/css/components/windowcontrol.css similarity index 100% rename from common/assets/csscomponents/windowcontrol.css rename to common/assets/css/components/windowcontrol.css diff --git a/common/assets/cssextensions/.stylelintrc.json b/common/assets/css/extensions/.stylelintrc.json similarity index 100% rename from common/assets/cssextensions/.stylelintrc.json rename to common/assets/css/extensions/.stylelintrc.json diff --git a/common/assets/cssextensions/altsensitive.css b/common/assets/css/extensions/altsensitive.css similarity index 100% rename from common/assets/cssextensions/altsensitive.css rename to common/assets/css/extensions/altsensitive.css diff --git a/common/assets/cssextensions/amoled.css b/common/assets/css/extensions/amoled.css similarity index 100% rename from common/assets/cssextensions/amoled.css rename to common/assets/css/extensions/amoled.css diff --git a/common/assets/cssextensions/black.css b/common/assets/css/extensions/black.css similarity index 100% rename from common/assets/cssextensions/black.css rename to common/assets/css/extensions/black.css diff --git a/common/assets/cssextensions/blue.css b/common/assets/css/extensions/blue.css similarity index 100% rename from common/assets/cssextensions/blue.css rename to common/assets/css/extensions/blue.css diff --git a/common/assets/cssextensions/cyan.css b/common/assets/css/extensions/cyan.css similarity index 100% rename from common/assets/cssextensions/cyan.css rename to common/assets/css/extensions/cyan.css diff --git a/common/assets/cssextensions/dark.css b/common/assets/css/extensions/dark.css similarity index 100% rename from common/assets/cssextensions/dark.css rename to common/assets/css/extensions/dark.css diff --git a/common/assets/cssextensions/darker.css b/common/assets/css/extensions/darker.css similarity index 100% rename from common/assets/cssextensions/darker.css rename to common/assets/css/extensions/darker.css diff --git a/common/assets/cssextensions/discorddark.css b/common/assets/css/extensions/discorddark.css similarity index 100% rename from common/assets/cssextensions/discorddark.css rename to common/assets/css/extensions/discorddark.css diff --git a/common/assets/cssextensions/fixedarrows.css b/common/assets/css/extensions/fixedarrows.css similarity index 100% rename from common/assets/cssextensions/fixedarrows.css rename to common/assets/css/extensions/fixedarrows.css diff --git a/common/assets/cssextensions/green.css b/common/assets/css/extensions/green.css similarity index 100% rename from common/assets/cssextensions/green.css rename to common/assets/css/extensions/green.css diff --git a/common/assets/cssextensions/grey.css b/common/assets/css/extensions/grey.css similarity index 100% rename from common/assets/cssextensions/grey.css rename to common/assets/css/extensions/grey.css diff --git a/common/assets/cssextensions/hideMessages.css b/common/assets/css/extensions/hideMessages.css similarity index 100% rename from common/assets/cssextensions/hideMessages.css rename to common/assets/css/extensions/hideMessages.css diff --git a/common/assets/cssextensions/highcontrast.css b/common/assets/css/extensions/highcontrast.css similarity index 100% rename from common/assets/cssextensions/highcontrast.css rename to common/assets/css/extensions/highcontrast.css diff --git a/common/assets/cssextensions/light.css b/common/assets/css/extensions/light.css similarity index 100% rename from common/assets/cssextensions/light.css rename to common/assets/css/extensions/light.css diff --git a/common/assets/cssextensions/loginpage.css b/common/assets/css/extensions/loginpage.css similarity index 100% rename from common/assets/cssextensions/loginpage.css rename to common/assets/css/extensions/loginpage.css diff --git a/common/assets/cssextensions/micro.css b/common/assets/css/extensions/micro.css similarity index 94% rename from common/assets/cssextensions/micro.css rename to common/assets/css/extensions/micro.css index af6480ca..aa44fee3 100644 --- a/common/assets/cssextensions/micro.css +++ b/common/assets/css/extensions/micro.css @@ -5,11 +5,11 @@ Released under the MIT License */ -@import "../csscomponents/settings.css"; -@import "../csscomponents/contextmenu.css"; -@import "../csscomponents/windowcontrol.css"; -@import "../csscomponents/spinner.css"; -@import "../csscomponents/alert.css"; +@import "../components/settings.css"; +@import "../components/contextmenu.css"; +@import "../components/windowcontrol.css"; +@import "../components/spinner.css"; +@import "../components/alert.css"; /* Variables, same as moderndeck.css */ diff --git a/common/assets/cssextensions/newcharacterindicator.css b/common/assets/css/extensions/newcharacterindicator.css similarity index 100% rename from common/assets/cssextensions/newcharacterindicator.css rename to common/assets/css/extensions/newcharacterindicator.css diff --git a/common/assets/cssextensions/nocontextmenuicons.css b/common/assets/css/extensions/nocontextmenuicons.css similarity index 100% rename from common/assets/cssextensions/nocontextmenuicons.css rename to common/assets/css/extensions/nocontextmenuicons.css diff --git a/common/assets/cssextensions/nonewtweetsbutton.css b/common/assets/css/extensions/nonewtweetsbutton.css similarity index 100% rename from common/assets/cssextensions/nonewtweetsbutton.css rename to common/assets/css/extensions/nonewtweetsbutton.css diff --git a/common/assets/cssextensions/orange.css b/common/assets/css/extensions/orange.css similarity index 100% rename from common/assets/cssextensions/orange.css rename to common/assets/css/extensions/orange.css diff --git a/common/assets/cssextensions/paper.css b/common/assets/css/extensions/paper.css similarity index 100% rename from common/assets/cssextensions/paper.css rename to common/assets/css/extensions/paper.css diff --git a/common/assets/cssextensions/pink.css b/common/assets/css/extensions/pink.css similarity index 100% rename from common/assets/cssextensions/pink.css rename to common/assets/css/extensions/pink.css diff --git a/common/assets/cssextensions/red.css b/common/assets/css/extensions/red.css similarity index 100% rename from common/assets/cssextensions/red.css rename to common/assets/css/extensions/red.css diff --git a/common/assets/cssextensions/scrollbarsdefault.css b/common/assets/css/extensions/scrollbarsdefault.css similarity index 100% rename from common/assets/cssextensions/scrollbarsdefault.css rename to common/assets/css/extensions/scrollbarsdefault.css diff --git a/common/assets/cssextensions/scrollbarsnarrow.css b/common/assets/css/extensions/scrollbarsnarrow.css similarity index 100% rename from common/assets/cssextensions/scrollbarsnarrow.css rename to common/assets/css/extensions/scrollbarsnarrow.css diff --git a/common/assets/cssextensions/scrollbarsnone.css b/common/assets/css/extensions/scrollbarsnone.css similarity index 100% rename from common/assets/cssextensions/scrollbarsnone.css rename to common/assets/css/extensions/scrollbarsnone.css diff --git a/common/assets/cssextensions/squareavatars.css b/common/assets/css/extensions/squareavatars.css similarity index 100% rename from common/assets/cssextensions/squareavatars.css rename to common/assets/css/extensions/squareavatars.css diff --git a/common/assets/cssextensions/teal.css b/common/assets/css/extensions/teal.css similarity index 100% rename from common/assets/cssextensions/teal.css rename to common/assets/css/extensions/teal.css diff --git a/common/assets/cssextensions/threadIndicator.css b/common/assets/css/extensions/threadIndicator.css similarity index 100% rename from common/assets/cssextensions/threadIndicator.css rename to common/assets/css/extensions/threadIndicator.css diff --git a/common/assets/cssextensions/twittercard.css b/common/assets/css/extensions/twittercard.css similarity index 99% rename from common/assets/cssextensions/twittercard.css rename to common/assets/css/extensions/twittercard.css index 4fb9e6df..a384cc70 100644 --- a/common/assets/cssextensions/twittercard.css +++ b/common/assets/css/extensions/twittercard.css @@ -5,8 +5,8 @@ Released under the MIT License */ -@import "../csscomponents/coredefinitions.css"; -@import "../csscomponents/dark.css"; +@import "../components/coredefinitions.css"; +@import "../components/dark.css"; @font-face { font-family:Material; diff --git a/common/assets/cssextensions/twitterdark.css b/common/assets/css/extensions/twitterdark.css similarity index 100% rename from common/assets/cssextensions/twitterdark.css rename to common/assets/css/extensions/twitterdark.css diff --git a/common/assets/cssextensions/violet.css b/common/assets/css/extensions/violet.css similarity index 100% rename from common/assets/cssextensions/violet.css rename to common/assets/css/extensions/violet.css diff --git a/common/assets/cssextensions/yellow.css b/common/assets/css/extensions/yellow.css similarity index 100% rename from common/assets/cssextensions/yellow.css rename to common/assets/css/extensions/yellow.css diff --git a/common/assets/moderndeck.css b/common/assets/css/moderndeck.css similarity index 99% rename from common/assets/moderndeck.css rename to common/assets/css/moderndeck.css index 6b1bcef4..32edbfed 100644 --- a/common/assets/moderndeck.css +++ b/common/assets/css/moderndeck.css @@ -10,25 +10,25 @@ */ /* stylelint-disable */ -@import "csscomponents/alert.css"; -@import "csscomponents/calendarDropdown.css"; -@import "csscomponents/contextmenu.css"; -@import "csscomponents/coredefinitions.css"; -@import "csscomponents/windowcontrol.css"; -@import "csscomponents/icon.css"; -@import "csscomponents/superclasses.css"; -@import "csscomponents/marginclasses.css"; -@import "csscomponents/emojipicker.css"; -@import "csscomponents/gifpicker.css"; -@import "csscomponents/emoji.css"; -@import "csscomponents/settings.css"; -@import "csscomponents/navigationdrawer.css"; -@import "csscomponents/welcome.css"; -@import "csscomponents/collapsed.css"; -@import "csscomponents/notifications.css"; -@import "csscomponents/classicnav.css"; -@import "csscomponents/themeeditor.css"; -@import "csscomponents/accessibilityHelper.css"; +@import "components/alert.css"; +@import "components/calendarDropdown.css"; +@import "components/contextmenu.css"; +@import "components/coredefinitions.css"; +@import "components/windowcontrol.css"; +@import "components/icon.css"; +@import "components/superclasses.css"; +@import "components/marginclasses.css"; +@import "components/emojipicker.css"; +@import "components/gifpicker.css"; +@import "components/emoji.css"; +@import "components/settings.css"; +@import "components/navigationdrawer.css"; +@import "components/welcome.css"; +@import "components/collapsed.css"; +@import "components/notifications.css"; +@import "components/classicnav.css"; +@import "components/themeeditor.css"; +@import "components/accessibilityHelper.css"; /* stylelint-enable */ :root { diff --git a/common/extension/content.js b/common/extension/content.js index 141a1f5b..6f02fe10 100644 --- a/common/extension/content.js +++ b/common/extension/content.js @@ -18,7 +18,7 @@ if (document.querySelector(`[rel="manifest"]`) === null) { const injStyles = document.createElement("link"); injStyles.rel = "stylesheet"; - injStyles.href = browser.runtime.getURL("assets/moderndeck.css"); + injStyles.href = browser.runtime.getURL("assets/css/moderndeck.css"); document.head.appendChild(injStyles); @@ -26,7 +26,7 @@ if (document.querySelector(`[rel="manifest"]`) === null) { const injStyles2 = document.createElement("link"); injStyles2.rel = "stylesheet"; - injStyles2.href = browser.runtime.getURL("assets/moderndeck.css"); + injStyles2.href = browser.runtime.getURL("assets/css/moderndeck.css"); document.head.appendChild(injStyles2); diff --git a/common/manifest.json b/common/manifest.json index 9ceb1acf..664f3322 100644 --- a/common/manifest.json +++ b/common/manifest.json @@ -37,7 +37,8 @@ "assets", "assets/*", "assets/js/moderndeck.js.map", - "assets/cssextensions/*", + "assets/css/*", + "assets/css/*", "assets/fonts/*", "assets/js/*", "assets/libraries/*", diff --git a/main.js b/main.js index cc0dbc93..529c08ed 100644 --- a/main.js +++ b/main.js @@ -687,7 +687,7 @@ function makeWindow() { (store.get("mtd_safemode") ? `document.getElementsByTagName("html")[0].classList.add("mtd-disable-css");` : `const injStyles = document.createElement("link"); injStyles.rel = "stylesheet"; - injStyles.href = "moderndeck://assets/moderndeck.css"; + injStyles.href = "moderndeck://assets/css/moderndeck.css"; document.head.appendChild(injStyles);`) + `const InjectScript = document.createElement("script"); diff --git a/sadmoderndeck.html b/sadmoderndeck.html index 5e92c5c3..5921ee40 100644 --- a/sadmoderndeck.html +++ b/sadmoderndeck.html @@ -1,6 +1,6 @@ - +