consolidate css into the components folder

girba · girba · commit 70d0df2cf674 · 2026-05-27T11:06:43.000+02:00
diff --git a/_includes/head.html b/_includes/head.html
@@ -49,16 +49,16 @@
     charset="utf-8"
   ></script>
   <link rel="stylesheet" href="/assets/css/all.css" />
-  <link rel="stylesheet" href="/css/styles.css" />
-  <link rel="stylesheet" href="/css/annotate.css" />
+  <link rel="stylesheet" href="/assets/css/styles.css" />
+  <link rel="stylesheet" href="/assets/css/annotate.css" />
   {% if page.image_wall %}
-  <link rel="stylesheet" href="/css/image-wall.css" />
+  <link rel="stylesheet" href="/assets/css/image-wall.css" />
   {% endif %}
   {% if page.image_stack %}
-  <link rel="stylesheet" href="/css/image-stack.css" />
+  <link rel="stylesheet" href="/assets/css/image-stack.css" />
   {% endif %}
   {% if page.image_comparison %}
-  <link rel="stylesheet" href="/css/image-comparison.css" />
+  <link rel="stylesheet" href="/assets/css/image-comparison.css" />
   {% endif %}
   <!-- Matomo -->
   <script type="text/javascript">
diff --git a/_sass/base/_general.scss b/_sass/base/_general.scss
@@ -1,7 +1,6 @@
 html,
 body {
   height: 100%;
-
 }
 
 body {
diff --git a/_sass/components/annotate.scss b/_sass/components/annotate.scss
@@ -1,6 +1,3 @@
----
----
-
 .insert-label {
   position: relative;
   display: inline-block;
diff --git a/_sass/components/image-comparison.scss b/_sass/components/image-comparison.scss
@@ -1,6 +1,3 @@
----
----
-
 @import "base/config";
 
 .image-comparison-slider {
diff --git a/_sass/components/image-stack.scss b/_sass/components/image-stack.scss
@@ -1,6 +1,3 @@
----
----
-
 .image-stack-wrap {
   // margin-top: 12px;
 }
diff --git a/_sass/components/image-wall.scss b/_sass/components/image-wall.scss
@@ -1,6 +1,3 @@
----
----
-
 .image-wall-modal {
   max-height: calc(100vh - 132px);
   border-radius: 18px;
diff --git a/_sass/components/styles.scss b/_sass/components/styles.scss
@@ -1,27 +1,24 @@
----
----
-
 @import "main";
 
 @font-face {
     font-family: "sources-extralight";
-    src: url("../assets/webfonts/sourcesanspro-extralight-webfont.woff");
+    src: url("../webfonts/sourcesanspro-extralight-webfont.woff");
 }
 
 @font-face {
     font-family: "sources-bold";
-    src: url("../assets/webfonts/sourcesanspro-bold-webfont.woff");
+    src: url("../webfonts/sourcesanspro-bold-webfont.woff");
 }
 
 @font-face {
     font-family: "sources-regular";
-    src: url("../assets/webfonts/sourcesanspro-regular-webfont.woff");
+    src: url("../webfonts/sourcesanspro-regular-webfont.woff");
 }
 
 @font-face {
     font-family: "desyrel";
-    src: url("../assets/webfonts/desyrel.woff2") format("woff2"),
-         url("../assets/webfonts/desyrel.woff") format("woff");
+    src: url("../webfonts/desyrel.woff2") format("woff2"),
+         url("../webfonts/desyrel.woff") format("woff");
     font-display: swap;
 }
 
diff --git a/assets/css/annotate.scss b/assets/css/annotate.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import "components/annotate";
diff --git a/assets/css/image-comparison.scss b/assets/css/image-comparison.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import "components/image-comparison";
diff --git a/assets/css/image-stack.scss b/assets/css/image-stack.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import "components/image-stack";
diff --git a/assets/css/image-wall.scss b/assets/css/image-wall.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import "components/image-wall";
diff --git a/assets/css/styles.scss b/assets/css/styles.scss
@@ -0,0 +1,4 @@
+---
+---
+
+@import "components/styles";
diff --git a/pages/cases.md b/pages/cases.md

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`html,`
`2`	`2`	`body {`
`3`	`3`	`height: 100%;`
`4`		`-`
`5`	`4`	`}`
`6`	`5`
`7`	`6`	`body {`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,3 @@ @@
 ----
 ----
+-
 @import "base/config";
 .image-comparison-slider {
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`----`
`2`		`----`
`3`		`-`
`4`	`1`	`.image-stack-wrap {`
`5`	`2`	`// margin-top: 12px;`
`6`	`3`	`}`