migrate all stylesheets to SCSS

combine main stylesheets into a single file, minify and fingerprint all files
cyborgjourney · May 26, 2021 · d659dc3 · d659dc3
1 parent 9a58ba5
commit d659dc3
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 13 deletions.
diff --git a/static/css/feather-component-button.css → assets/css/_feather-component-button.scss b/static/css/feather-component-button.css → assets/css/_feather-component-button.scss
diff --git a/static/css/feather-component-grid.css → assets/css/_feather-component-grid.scss b/static/css/feather-component-grid.css → assets/css/_feather-component-grid.scss
diff --git a/static/css/feather-core.css → assets/css/_feather-core.scss b/static/css/feather-core.css → assets/css/_feather-core.scss
diff --git a/static/css/main.css → assets/css/_main.scss b/static/css/main.css → assets/css/_main.scss
diff --git a/static/css/index.css → assets/css/index.scss b/static/css/index.css → assets/css/index.scss
diff --git a/static/css/memberships.css → assets/css/memberships.scss b/static/css/memberships.css → assets/css/memberships.scss
diff --git a/static/css/projects.css → assets/css/projects.scss b/static/css/projects.css → assets/css/projects.scss
diff --git a/assets/css/style.scss b/assets/css/style.scss
@@ -0,0 +1,6 @@
+// feather core and components
+@import "feather-core";
+@import "feather-component-button";
+@import "feather-component-grid";
+
+@import "main";
diff --git a/static/css/year-in-review.css → assets/css/year-in-review.scss b/static/css/year-in-review.css → assets/css/year-in-review.scss
diff --git a/content/_index.html b/content/_index.html
@@ -2,7 +2,7 @@
 title: Twitter Open Source
 description: Twitter Open Source Website
 keywords: twitter, open, source, open source, finatra, finagle, scala
-custom_css: index.css
+custom_css: index.scss
 custom_js: index.js
 ---
 

diff --git a/content/memberships.html b/content/memberships.html
@@ -3,6 +3,6 @@
 title: Memberships | Twitter Open Source
 description: Twitter Open Source Website
 keywords: twitter, open, source, open source, finatra, finagle, scala
-custom_css: memberships.css
+custom_css: memberships.scss
 custom_js: memberships.js
 ---
diff --git a/content/projects.html b/content/projects.html
@@ -3,6 +3,6 @@
 title: Projects | Twitter Open Source
 description: All Twitter Open Source Projects
 keywords: twitter, open, source, open source, finatra, finagle, scala
-custom_css: projects.css
+custom_css: projects.scss
 custom_js: projects.js
 ---
diff --git a/content/year-in-review.html b/content/year-in-review.html
@@ -3,6 +3,6 @@
 title: Year in Review | Twitter Open Source
 description: Twitter Open Source Website
 keywords: twitter, open, source, open source, finatra, finagle, scala
-custom_css: year-in-review.css
+custom_css: year-in-review.scss
 custom_js: year-in-review.js
 ---
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -24,15 +24,10 @@
     <title>{{ .Title }}</title>
     <link rel="shortcut icon" type="image/png" href="{{ "assets/favicon.ico" | relURL }}"/>
 
-    <!-- Feather CSS -->
-    <link rel="stylesheet" href="{{ "css/feather-core.css" | relURL }}"/>
-    <link rel="stylesheet" href="{{ "css/feather-component-grid.css" | relURL }}"/>
-    <link rel="stylesheet" href="{{ "css/feather-component-button.css" | relURL }}"/>
-
-    <!-- Main CSS -->
-    <link rel="stylesheet" href="{{ "css/main.css" | relURL }}"/>
+    {{- $style := resources.Get "css/style.scss" | toCSS | minify | fingerprint }}
+    <link rel="stylesheet" href="{{ $style.RelPermalink }}"/>
 
     {{- with .Params.custom_css }}
-    <!-- Custom CSS -->
-    <link rel="stylesheet" href="{{ printf "css/%s" . | relURL }}"/>
+    {{- $style := resources.Get (printf "css/%s" .) | toCSS | minify | fingerprint }}
+    <link rel="stylesheet" href="{{ $style.RelPermalink }}"/>
     {{ end }}