]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 874ca6f)
error-pages: No longer embed the CSS
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Jan 2024 17:47:24 +0000 (17:47 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Jan 2024 17:47:24 +0000 (17:47 +0000)
HAProxy does not support error pages larger than 16k :(

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am patch | blob | blame | history
src/error-pages/_layouts/error.html patch | blob | blame | history
src/error-pages/assets/main.sass [moved from src/error-pages/_includes/main.sass with 88% similarity] patch | blob | blame | history

diff --git a/Makefile.am b/Makefile.am
index f382c7506dad4978168f4a52db41940c8c2a80c9..caf34d8e1357f331584a754c6b6136e8d4af0bf4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1072,8 +1072,8 @@ EXTRA_DIST += \
        src/error-pages/Gemfile \
        src/error-pages/Gemfile.lock \
        src/error-pages/_config.yml \
-       src/error-pages/_includes/main.sass \
        src/error-pages/_layouts/error.html \
+       src/error-pages/assets/main.sass \
        src/error-pages/500.markdown \
        src/error-pages/502.markdown \
        src/error-pages/503.markdown \
diff --git a/src/error-pages/_layouts/error.html b/src/error-pages/_layouts/error.html
index a119e390ef8c130136eb9546c48479bdcdc05626..5128b2329e77419312845d3ad3afafaa2bcac264 100644 (file)
--- a/src/error-pages/_layouts/error.html
+++ b/src/error-pages/_layouts/error.html
@@ -14,11 +14,7 @@ Content-Type: text/html
 
                <!-- styling stuff -->
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-               <style>
-                       {% capture css %}{% include main.sass %}{% endcapture %}
-                       {{ css | sassify }}
-               </style>
+               <link rel="stylesheet" href="/.errors/assets/main.css">
        </head>
 
        <body>
diff --git a/src/error-pages/_includes/main.sass b/src/error-pages/assets/main.sass
similarity index 88%
rename from src/error-pages/_includes/main.sass
rename to src/error-pages/assets/main.sass
index 2ccce5cd39b49339d6907c0b133650a699eeb7c6..c865eef7d09d11dc172e0f9a50f6c0bc861eae6c 100644 (file)
--- a/src/error-pages/_includes/main.sass
+++ b/src/error-pages/assets/main.sass
@@ -1,6 +1,9 @@
+---
+---
+
 @charset "utf-8"
 
-$baseurl: "https://www.michael.dev.ipfire.org"
+$baseurl: "/.errors/assets"
 
 // Import variables
 @import "../sass/_variables.sass"
@@ -23,7 +26,7 @@ $baseurl: "https://www.michael.dev.ipfire.org"
 @import "../third-party/bulma/sass/helpers/typography.sass"
 
 // Components
-@import "../third-party/bulma/sass/components/navbar.sass"
+//@import "../third-party/bulma/sass/components/navbar.sass"
 
 // Layout
 @import "../third-party/bulma/sass/layout/hero.sass"
The website of ipfire.org.