From b3fab62cf47b61337fd6ee624e2d896ff4b4b767 Mon Sep 17 00:00:00 2001 From: trendschau Date: Sun, 18 Jul 2021 22:33:21 +0200 Subject: [PATCH] Version 1.4.7: Notice 4, iso-hint for langattr, download icon cyanine --- content/index.txt | 1 + system/author/css/style.css | 16 ++++++++++++---- system/author/js/vue-blox.js | 2 +- system/author/settings/system.twig | 1 + themes/cyanine/css/style.css | 20 ++++++++++++++++++-- themes/cyanine/cyanine.yaml | 2 +- themes/cyanine/layout.twig | 10 +--------- 7 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 content/index.txt diff --git a/content/index.txt b/content/index.txt new file mode 100644 index 0000000..272072a --- /dev/null +++ b/content/index.txt @@ -0,0 +1 @@ +["# Typemill","The open-source flat-file cms for text-driven websites. Create handbooks, documentations, manuals, web-novels, traditional websites, and more."] \ No newline at end of file diff --git a/system/author/css/style.css b/system/author/css/style.css index 2e8a9a2..e2cfee5 100644 --- a/system/author/css/style.css +++ b/system/author/css/style.css @@ -281,6 +281,10 @@ button.note3{ background-color: #08e; color: #fff; } +button.note4{ + background-color: #00ee67; + color: #fff; +} .blox-editor textarea.pl-notice{ padding-left: 40px; @@ -297,17 +301,21 @@ button.note3{ background-color: #fffbf0; border-left: 10px solid #fb0; } -.notice3, +.notice3{ + margin: 1em 0; + padding: 10px 1em; + background-color: #f0f8fe; + border-left: 10px solid #08e; +} .notice4, .notice5, .notice6 { margin: 1em 0; padding: 10px 1em; - background-color: #f0f8fe; - border-left: 10px solid #08e; + background-color: #f1fff7; + border-left: 10px solid #00ee67; } - /******************** * NAVI * ********************/ diff --git a/system/author/js/vue-blox.js b/system/author/js/vue-blox.js index a42f782..588820a 100644 --- a/system/author/js/vue-blox.js +++ b/system/author/js/vue-blox.js @@ -873,7 +873,7 @@ const noticeComponent = Vue.component('notice-component', { } this.prefix = this.prefix + '!'; - if(this.prefix.length > 3) + if(this.prefix.length > 4) { this.prefix = '!'; } diff --git a/system/author/settings/system.twig b/system/author/settings/system.twig index b11c968..215b846 100644 --- a/system/author/settings/system.twig +++ b/system/author/settings/system.twig @@ -64,6 +64,7 @@
+
Please use ISO 639-1 codes like "en"
{% if errors.settings.langattr %} {{ errors.settings.langattr | first }} {% endif %} diff --git a/themes/cyanine/css/style.css b/themes/cyanine/css/style.css index 71fbcbe..5a76541 100644 --- a/themes/cyanine/css/style.css +++ b/themes/cyanine/css/style.css @@ -259,10 +259,10 @@ h6:hover > .tm-heading-anchor{ text-decoration: none; } -/* style the typemill download-button for files */ +/* style the typemill download-button for files a.tm-download { - line-height: 35px; + line-height: 35px; margin-left: 40px; } a.tm-download::before{ @@ -281,6 +281,22 @@ a.tm-download::before{ a.tm-download:hover::before{ text-decoration: none; } +*/ + +/* style the typemill download-button for files */ +a.tm-download +{ + margin-left: 40px; +} +a.tm-download::before{ + content: url("data:image/svg+xml; utf8, "); + position: absolute; + margin-left: -40px; + text-decoration: none; +} +a.tm-download:hover::before{ + text-decoration: none; +} /* Fake youtube button. Works with typemillutilities.js */ .video-container{ diff --git a/themes/cyanine/cyanine.yaml b/themes/cyanine/cyanine.yaml index 3b8d894..bb6f42d 100644 --- a/themes/cyanine/cyanine.yaml +++ b/themes/cyanine/cyanine.yaml @@ -1,5 +1,5 @@ name: Cyanine Theme -version: 1.1.5 +version: 1.1.6 description: Cyanine is a modern and flexible multi-purpose theme and the standard theme for typemill. author: Trendschau homepage: https://trendschau.net diff --git a/themes/cyanine/layout.twig b/themes/cyanine/layout.twig index bbdffeb..14cddd5 100644 --- a/themes/cyanine/layout.twig +++ b/themes/cyanine/layout.twig @@ -164,15 +164,7 @@ .mainnavigation li, tr, hr, .notice4{ border-color: {{ settings.themes.cyanine.thinbordercolor|default('lightgray') }}; } - a.tm-download::before{ - border: 1px solid {{ settings.themes.cyanine.fontcolorlink|default('#007F7F') }}; - color: {{ settings.themes.cyanine.fontcolorlink|default('#007F7F') }}; - } - a.tm-download:hover::before{ - color: {{ settings.themes.cyanine.contentnavihovercolor|default('#f7f7f7') }}; - background: {{ settings.themes.cyanine.fontcolorlink|default('#007F7F') }}; - } - + .notice1{ background-color: #ffded4; border-left: 4px solid #f65a3c;