Merge branch 'themelight' into 'dev'

Theme Vars + CSS Cleaning

See merge request Vrelnir/degrees-of-lewdity!1520

.stylelintrc.json

-{
-  "plugins": ["stylelint-no-unsupported-browser-features"],
-  "extends": [
-    "stylelint-config-standard",
-    "stylelint-config-property-sort-order-smacss",
-    "stylelint-prettier/recommended"
-  ],
-  "rules": {
-    "plugin/no-unsupported-browser-features": [
-      true,
-      {
-        "severity": "warning"
-      }
-    ]
-  }
-}

img/dolls/style.css

-body { 
-	background: black; 
-	color: white;
-}
+/* NOTE: Moving this file out of img/dolls will break combat spacing */
 #enemy-controls-cache {
 	display: none;
-} 
+}
+
 #enemy-controls-container {
-	color: black;
 	width: 80vw;
 	height: 300px;
 	overflow-y: auto;
+	color: var(--900);
 }
-#all-controls { 
+
+#all-controls {
 	display: flex;
 }
+
 #divsex {
 	margin-top: 250px;
 	margin-left: 300px;
-	background-color: black;
-	/*display: inline;*/
+	background-color: var(--900);
+
+	/* display: inline; */
 }
-#side-panel { 
-	width : 20vw;
+
+#side-panel {
+	width: 20vw;
 }
+
 #loadinfo {
-	overflow-y: scroll;
-	max-height: 30vh;
 	display: inline;
 	position: fixed;
 	right: 0;
 	bottom: 0;
+	max-height: 30vh;
+	overflow-y: scroll;
 }
-#global-controls {
-	
-}
-h3 {
-	margin-left: 5px;
-	margin-bottom: 5px;
-	display: block;
-}
-h4 {
-	margin-left: 5px;
-	margin-bottom: 2px;
-	margin-top: 0px;
-	display: block; 
-}
-.enemy-controller { 
-	background : #ddd;
-	border-bottom-width: 2px;
-	border-bottom-style: solid; 
-	border-bottom-color: #0003;
+
+/* 
+	#global-controls {
+		
+	} 
+*/
+
+.enemy-controller {
+	border-bottom: 2px solid var(--900);
+	background: var(--150);
 }
-.selector { 
+
+.selector {
 	padding-right: 20px;
 }
-.appearance {                
+
+.appearance {
 	display: flex;
-	flex-wrap: wrap;            
+	flex-wrap: wrap;
 }
-.actions { 
-	background : #ccc;
+
+.actions {
+	background: var(--150);
 }
-.actions div {                
-	
+
+.actions div {
 	display: flex;
-	flex-wrap: wrap;            
-}
+	flex-wrap: wrap;
+}
\ No newline at end of file

modules/css/canvasmodel.css

-
 table.editorlayers {
 	border-spacing: 4px 1px;
 	border-collapse: separate;
 }
+
 .editorcolours > div {
 	margin-right: 4em;
 }
+
 .editorcolours {
 	display: flex;
 	flex-wrap: wrap;
 }
+
 .editorcolours .export-block {
-	float: right;
 	padding-top: 1.33em;
+	float: right;
 }
+
 .editorcolours table th {
 	font-size: small;
 	text-align: center;
 }
-input.editlayer-z, input.editlayer-alpha {
+
+input.editlayer-z,
+input.editlayer-alpha {
 	width: 3.5em;
 	min-width: unset;
 }
+
 input.editlayer-animation {
 	width: 5em;
 	min-width: unset;
 }
+
 input.editlayer-masksrc {
 	width: 10em;
 	min-width: unset;
 }
+
 input.editlayer-show {
 	margin-left: 1em;
 }
+
 input.editlayer-desaturate {
 	margin-left: 2.5em;
 }
+
 input.editlayer-brightness,
 input.editlayer-contrast {
-	min-width: unset;
 	width: 3.5em;
+	min-width: unset;
 }
 
 .editormodelgroups {
 	display: flex;
-	justify-content: flex-start;
 	align-items: flex-start;
+	justify-content: flex-start;
 }
+
 .editormodelgroup {
-	margin: 0 1em;
 	display: grid;
 	grid-template-columns: auto auto;
+	margin: 0 1em;
 }
+
 .editormodelgroup label {
 	font-family: monospace;
 }
 
 .editormodelgroup .optioncategory {
-	grid-column-start: 1;
-	grid-column-end: 3;
-	font-weight: bold;
+	grid-column: 1 / 3;
 	margin-top: 0.5em;
+	font-weight: bold;
 }
+
 .editormodelgroup .optionlabel {
 	grid-column-start: 1;
 	align-self: center;
 }
+
 .editormodelgroup .optioneditor {
+	display: flex;
 	grid-column-start: 2;
 	justify-self: stretch;
-	display: flex;
 }
+
 .optioneditor label {
 	min-width: 2.75em;
 }
-.optioneditor input, .optioneditor select {
+
+.optioneditor input,
+.optioneditor select {
 	flex-grow: 1;
 }
-

stylelint.config.cjs

+module.exports = {
+	plugins: ["stylelint-no-unsupported-browser-features"],
+	extends: [
+		"stylelint-config-standard",
+		"stylelint-config-property-sort-order-smacss",
+		"stylelint-prettier/recommended",
+	],
+	rules: {
+		"plugin/no-unsupported-browser-features": [
+			true,
+			{
+				severity: "warning",
+				// To prevent stylelint from removing -webkit-background-clip
+				ignore: ["background-clip"],
+			},
+		],
+
+		// Class and ID patterns disabled for now due to the large amounts of classes and IDs that break this rule
+		"selector-class-pattern": null,
+		"selector-id-pattern": null,
+
+		// Modified kebab-case for numbered CSS vars
+		"custom-property-pattern": [
+			"^([a-z0-9]*)(-[a-z0-9]+)*$",
+			{
+				message: "Expected custom property name to be kebab-case",
+			},
+		],
+	},
+};