From 87789c58c58fd523a3df3f5a06a881d4792bd340 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sat, 11 Dec 2021 14:48:45 +0100 Subject: [PATCH] Cyanine: Footer hidden if empty, Landingpage fullscreen option, bold font, markdown for contrast --- content/00-welcome/00-setup-your-website.md | 8 +++- themes/cyanine/css/style.css | 4 +- themes/cyanine/cyanine.yaml | 6 ++- themes/cyanine/home/landingpageContrast.twig | 8 ++-- themes/cyanine/home/landingpageIntro.twig | 11 ++++++ themes/cyanine/partials/footer.twig | 39 ++++++++++---------- 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/content/00-welcome/00-setup-your-website.md b/content/00-welcome/00-setup-your-website.md index bfbcbc6..73e801a 100644 --- a/content/00-welcome/00-setup-your-website.md +++ b/content/00-welcome/00-setup-your-website.md @@ -6,8 +6,6 @@ Typemill provides detailed settings, and you have access to nearly all settings You will find all configurations and settings under the main navigation point `settings` with the following sub-navigation: -[favicon io (ZIP, 21.53 KB)](media/files/favicon-io.zip){.tm-download file-zip} - * System settings * Theme settings * Plugin settings @@ -15,10 +13,16 @@ You will find all configurations and settings under the main navigation point `s All settings are stored in the `\settings` folder of Typemill. It is not recommended to edit the settings manually, because it might crash the system if done wrong. +[:replace text="hallo" color="green":] + +[:replace text="hallo" color="red":] + ## Developer Settings As of version 1.4.0 you will find some advanced developer settings in the author panel under `settings`. See the details below. +[:ebookproduct id="unknown":] + ! **Only for devs** ! ! These options are for developers only. Make sure that you fully understand what happens. For example, you should never activate the error reporting on live systems because this is a security risk. diff --git a/themes/cyanine/css/style.css b/themes/cyanine/css/style.css index 6f0a093..d7f3049 100644 --- a/themes/cyanine/css/style.css +++ b/themes/cyanine/css/style.css @@ -108,8 +108,8 @@ tr{ th,td{ padding: .5em 1em; } -p b, p strong{ - font-weight: bold; +main b, main strong{ + font-weight: 600; } /************************************ diff --git a/themes/cyanine/cyanine.yaml b/themes/cyanine/cyanine.yaml index ab0bbac..ba5ded3 100644 --- a/themes/cyanine/cyanine.yaml +++ b/themes/cyanine/cyanine.yaml @@ -1,5 +1,5 @@ name: Cyanine Theme -version: 1.1.9 +version: 1.1.10 description: Cyanine is a modern and flexible multi-purpose theme and the standard theme for typemill. author: Trendschau homepage: https://trendschau.net @@ -81,6 +81,10 @@ forms: type: text label: Label for startbutton placeholder: my label + introFullsize: + type: checkbox + label: Full Screen + checkboxlabel: Use full screen for the intro segment introImage: type: checkbox label: Background Image diff --git a/themes/cyanine/home/landingpageContrast.twig b/themes/cyanine/home/landingpageContrast.twig index c95098b..1a33bf4 100644 --- a/themes/cyanine/home/landingpageContrast.twig +++ b/themes/cyanine/home/landingpageContrast.twig @@ -1,9 +1,11 @@
-
+

{{ settings.themes.cyanine.contrastTitle }}

-

{{ settings.themes.cyanine.contrastText }}

- {{ settings.themes.cyanine.contrastLabel }} +

{{ markdown(settings.themes.cyanine.contrastText) }}

+ {% if settings.themes.cyanine.contrastLink %} + {{ settings.themes.cyanine.contrastLabel }} + {% endif %}
diff --git a/themes/cyanine/home/landingpageIntro.twig b/themes/cyanine/home/landingpageIntro.twig index 12874f6..b7bbaec 100644 --- a/themes/cyanine/home/landingpageIntro.twig +++ b/themes/cyanine/home/landingpageIntro.twig @@ -1,8 +1,18 @@ +{% if settings.themes.cyanine.introFullsize %} +
+ +
+ +
+ +{% else %}
+ +{% endif %}
{% if logo %} @@ -30,4 +40,5 @@
+
diff --git a/themes/cyanine/partials/footer.twig b/themes/cyanine/partials/footer.twig index a56e33c..90e4a3e 100644 --- a/themes/cyanine/partials/footer.twig +++ b/themes/cyanine/partials/footer.twig @@ -1,28 +1,29 @@ -{% set nowYear = "now"|date("Y") %} +{% if (settings.themes.cyanine.footercolumns.footer1 or settings.themes.cyanine.footercolumns.footer2 or settings.themes.cyanine.footercolumns.footer3) %} -
-
- {% for column,key in settings.themes.cyanine.footercolumns %} - {% if settings.themes.cyanine[column] %} -
- {{ markdown(settings.themes.cyanine[column]) }} -
- {% endif %} - {% endfor %} -
-
- {% if settings.year is empty or settings.year == nowYear %} - {% set copyrightYears = nowYear %} - {% else %} - {% set copyrightYears = settings.year ~ ' - ' ~ nowYear %} - {% endif %} -
-
+
+
+ {% for column,key in settings.themes.cyanine.footercolumns %} + {% if settings.themes.cyanine[column] %} +
+ {{ markdown(settings.themes.cyanine[column]) }} +
+ {% endif %} + {% endfor %} +
+
+ +{% endif %}
{% if settings.themes.cyanine.copyrightline %} {{ markdown(settings.themes.cyanine.copyrightlinetext) }} {% else %} + {% set nowYear = "now"|date("Y") %} + {% if settings.year is empty or settings.year == nowYear %} + {% set copyrightYears = nowYear %} + {% else %} + {% set copyrightYears = settings.year ~ ' - ' ~ nowYear %} + {% endif %}

{{ settings.copyright }} {{ __('by') }} {{ settings.author }}, {{ copyrightYears }}. {{ __('All Rights Reserved') }}. {{ __('Built with') }} Typemill.

{% endif %}
\ No newline at end of file