From 09c09d87f814f778e23dd5ba0aef7fdddfea64d2 Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Mon, 14 Feb 2022 19:03:30 +0000
Subject: [PATCH] refactor: added back templating ability
---
assets/scss/main.scss | 3 +++
assets/scss/modules/_variables.scss | 2 +-
layouts/partials/head.html | 18 +-----------------
3 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index ff403f3..bcab4ad 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -1,3 +1,6 @@
+$layout-direction: {{ .Site.Language.LanguageDirection | default "ltr" }};
+$content-ratio: {{ .Site.Params.contentratio | default 0.6 }};
+
@import './modules/variables';
@import './modules/config';
@import './modules/color_theme';
diff --git a/assets/scss/modules/_variables.scss b/assets/scss/modules/_variables.scss
index 4cf6d14..679bf11 100644
--- a/assets/scss/modules/_variables.scss
+++ b/assets/scss/modules/_variables.scss
@@ -35,7 +35,7 @@
$thumbnail-height: 15em;
$scroll-padding-top: 100px;
$body-max-width: 1920px;
-$content-ratio: 0.6;
+
$sidebar-ratio: calc(1 - #{$content-ratio});
$content-max-width: calc(#{$body-max-width} * #{$content-ratio});
$sidebar-max-width: calc(#{$body-max-width} - #{$content-max-width});
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index d02ab29..9132005 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -48,7 +48,7 @@
<!-- CSS -->
{{ $sassTemplate := resources.Get "scss/main.scss" }}
- {{ $style := $sassTemplate | resources.ToCSS | resources.Minify | resources.Fingerprint }}
+ {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint }}
<link
@@ -58,23 +58,7 @@
crossorigin="anonymous"
type="text/css"
/>
- {{ if eq .Site.Language.LanguageDirection "rtl" }}
- <!-- Arabic font -->
- <link
- rel="stylesheet"
- href="https://fonts.googleapis.com/css?family=Tajawal:300,500,700&display=swap&subset=arabic"
- />
- {{ $templateStyle := resources.Get "css/style.rtl.css" }}
- {{ $style := $templateStyle | resources.ExecuteAsTemplate "css/main.rtl.css" . | resources.Minify | resources.Fingerprint }}
- <link
- rel="stylesheet"
- href="{{ $style.RelPermalink }}"
- integrity="{{ $style.Data.Integrity }}"
- crossorigin="anonymous"
- type="text/css"
- />
- {{ end }}
{{ $markupHighlightStyle := resources.Get "css/markupHighlight.css" | resources.Minify | resources.Fingerprint }}
<link
rel="stylesheet"
--
Gitblit v1.10.0