From 113b6a39353c627f2314baa3d15315ea3976bbad Mon Sep 17 00:00:00 2001
From: alexanderdavide <alexeble1998@gmail.com>
Date: Sat, 19 Feb 2022 14:40:52 +0000
Subject: [PATCH] Merge branch 'feature/refactor-css-to-scss' of github.com:alexanderdavide/anatole into feature/refactor-css-to-scss
---
assets/scss/main.scss | 3 ---
assets/scss/modules/_config.scss | 6 ++----
assets/scss/anatole.scss | 4 ++++
assets/scss/anatole.rtl.scss | 4 ++++
layouts/partials/head.html | 31 ++++++++++++++++++++-----------
5 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/assets/scss/anatole.rtl.scss b/assets/scss/anatole.rtl.scss
new file mode 100644
index 0000000..4e81691
--- /dev/null
+++ b/assets/scss/anatole.rtl.scss
@@ -0,0 +1,4 @@
+$content-ratio: {{- .Site.Params.contentratio | default 0.6 -}};
+$text-direction: "rtl";
+
+@import 'main.scss';
\ No newline at end of file
diff --git a/assets/scss/anatole.scss b/assets/scss/anatole.scss
new file mode 100644
index 0000000..6a9ba81
--- /dev/null
+++ b/assets/scss/anatole.scss
@@ -0,0 +1,4 @@
+$content-ratio: {{- .Site.Params.contentratio | default 0.6 -}};
+$text-direction: "ltr";
+
+@import 'main.scss';
\ No newline at end of file
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
index bcab4ad..ff403f3 100644
--- a/assets/scss/main.scss
+++ b/assets/scss/main.scss
@@ -1,6 +1,3 @@
-$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/_config.scss b/assets/scss/modules/_config.scss
index 81ad6c7..146870f 100644
--- a/assets/scss/modules/_config.scss
+++ b/assets/scss/modules/_config.scss
@@ -25,16 +25,14 @@
}
}
-$layout-direction: ltr !default;
-
@mixin ltr {
- @if $layout-direction == ltr {
+ @if $text-direction == ltr {
@content;
}
}
@mixin rtl {
- @if $layout-direction == rtl {
+ @if $text-direction == rtl {
@content;
}
}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 9132005..c5c66a6 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -45,19 +45,28 @@
{{- end -}}
-
<!-- CSS -->
- {{ $sassTemplate := resources.Get "scss/main.scss" }}
- {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint }}
-
-
+ {{ if eq .Site.Language.LanguageDirection "rtl" }}
+ {{ $sassTemplate := resources.Get "scss/anatole.rtl.scss" }}
+ {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.rtl.scss" . | resources.ToCSS | resources.Minify | resources.Fingerprint }}
<link
- rel="stylesheet"
- href="{{ $style.RelPermalink }}"
- integrity="{{ $style.Data.Integrity }}"
- crossorigin="anonymous"
- type="text/css"
- />
+ rel="stylesheet"
+ href="{{ $style.RelPermalink }}"
+ integrity="{{ $style.Data.Integrity }}"
+ crossorigin="anonymous"
+ type="text/css"
+/>
+ {{ else }}
+ {{ $sassTemplate := resources.Get "scss/anatole.scss" }}
+ {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.scss" . | resources.ToCSS | 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
--
Gitblit v1.10.0