Restructured css files

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();
 	})

common/assets/csscomponents/twittercard.css → 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;

common/assets/cssextensions/micro.css → 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 */
 

common/assets/cssextensions/twittercard.css → 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;

common/assets/moderndeck.css → 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 {

common/extension/content.js

@@ -18,15 +18,15 @@ 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);
 
 	// Gross hack for 9.4 because modenrdeck.css is not being loaded
 
 	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);
 

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/*",

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");

sadmoderndeck.html

@@ -1,6 +1,6 @@
 <html>
     <head>
-        <!-- <link rel="stylesheet" href="common/assets/csscomponents/icon.css"> -->
+        <!-- <link rel="stylesheet" href="common/assets/css/components/icon.css"> -->
 
         <style>
             @font-face {

src/BuildProps.json

@@ -1 +1 @@
-{"buildId":1969,"buildDate":"2022-04-27T04:41:20.689Z","buildVersion":"10.0.0"}
+{"buildId":1973,"buildDate":"2022-04-27T04:51:48.331Z","buildVersion":"10.0.0"}

src/StylesheetExtensions.ts

@@ -16,12 +16,12 @@ export const isStylesheetExtensionEnabled = (name: string): boolean => {
 	if ($(`#mtd_custom_css_${name}`).length > 0) {
 		return true;
 	}
-	return !!document.querySelector(`link.mtd-stylesheet-extension[href="${window.mtdBaseURL}assets/cssextensions/${name}.css"]`);
+	return !!document.querySelector(`link.mtd-stylesheet-extension[href="${window.mtdBaseURL}assets/css/extensions/${name}.css"]`);
 }
 
 /*
 	Enables a certain stylesheet extension.
-	Stylesheet extensions are loaded from assets/cssextensions/[name].css
+	Stylesheet extensions are loaded from assets/css/extensions/[name].css
 
 	These are the predefined ModernDeck ones including colour themes, default light and dark themes, and various preferences
 
@@ -33,7 +33,7 @@ export const enableStylesheetExtension = (name: string): void => {
 		return;
 
 	// This is where components are located
-	let url = `${window.mtdBaseURL}assets/cssextensions/${name}.css`;
+	let url = `${window.mtdBaseURL}assets/css/extensions/${name}.css`;
 
 	if (!isStylesheetExtensionEnabled(name)) {
 		window.head.append(
@@ -55,7 +55,7 @@ export const disableStylesheetExtension = (name: string): void => {
 	if (!isStylesheetExtensionEnabled(name))
 		return;
 
-	$(`head>link[href="${window.mtdBaseURL}assets/cssextensions/${name}.css"]`).remove();
+	$(`head>link[href="${window.mtdBaseURL}assets/css/extensions/${name}.css"]`).remove();
 
 	if ($(`#mtd_custom_css_${name}`).length > 0) {
 		$(`#mtd_custom_css_${name}`).remove();