1
0
mirror of https://github.com/typemill/typemill.git synced 2025-08-06 22:26:32 +02:00

Version 1.4.6 Collapse Navigation, standard content, landingpage intro and fixes

This commit is contained in:
trendschau
2021-06-11 22:28:37 +02:00
parent 14ea7c7995
commit 33a0bbfa09
19 changed files with 79 additions and 99 deletions

View File

@@ -67,6 +67,7 @@ article h1, article h2, article h3, article h4, article h5, article h6{
line-height: 1em;
position: relative;
}
h1,h2,h3,h4,h5,h6{ word-wrap: break-word; hyphens: auto; }
article h1{ font-size: 2.2em; margin: 1.4em 0 0.6em; z-index:1; }
article h2{ font-size: 1.6em; margin: 1.8em 0 0.6em; }
article h3{ font-size: 1.3em; margin: 1.6em 0 0.6em; }

View File

@@ -28,26 +28,28 @@ forms:
blog:
type: checkbox
checkboxlabel: Activate a List of Posts on Homepage
checkboxlabel: Activate a List of Posts on the Homepage
blogdetails:
type: fieldset
legend: Configure List of Posts
fields:
blogintro:
type: checkbox
label: Intro Page
checkboxlabel: Show the content of the homepage before the list of posts
blogfolder:
type: text
label: Enter the folder path with the posts
placeholder: /blog
blogimage:
type: checkbox
label: Post-Images
checkboxlabel: Display the hero images from meta in the list of blog-posts
landingpage:
type: checkbox
checkboxlabel: Activate a Landing Page on Homepage
checkboxlabel: Activate a Landing Page on the Homepage
landingpageIntro:
type: fieldset
@@ -74,6 +76,14 @@ forms:
type: text
label: Label for startbutton
placeholder: my label
introImage:
type: checkbox
label: Background Image
checkboxlabel: Use the hero-image from the homepage as background image
introImageOpacity:
type: text
label: Opacity for background image
placeholder: 0.8
landingpageInfo:
type: fieldset

View File

@@ -1,30 +1,33 @@
<section class="landingpageintro w-100 dib tc bt bl br bb">
<div class="mw7 pb7 ph3 center">
<header class="mt6">
{% if logo %}
<img src="{{ base_url }}/{{ logo }}" class="logo-image"/>
{% elseif settings.themes.cyanine.introTitle %}
<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns">{{ settings.themes.cyanine.introTitle }}</h1>
{% else %}
<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns">{{ title }}</h1>
{% endif %}
</header>
<div class="cover bg-left bg-center-l" {% if settings.themes.cyanine.introImage %}style="background-image: url({{image.img_url}});background-color:rgba(255,255,255,{{settings.themes.cyanine.introImageOpacity|default('0.8')}});background-blend-mode: lighten;" {% endif%} >
<div class="f5 f4-ns fw3 lh-copy">
{% if settings.themes.cyanine.introMarkdown %}
{{ markdown(settings.themes.cyanine.introMarkdown) }}
{% else %}
{{ content }}
{% endif %}
<div class="mw7 pb7 pt6 ph3 center">
<div class="introbg pa4">
<header>
{% if logo %}
<img src="{{ base_url }}/{{ logo }}" class="logo-image"/>
{% elseif settings.themes.cyanine.introTitle %}
<h1 class="f-large lh-title mv2">{{ settings.themes.cyanine.introTitle }}</h1>
{% else %}
<h1 class="f-large lh-title mv2">{{ title }}</h1>
{% endif %}
</header>
<div class="f5 f4-ns fw3 lh-copy">
{% if settings.themes.cyanine.introMarkdown %}
{{ markdown(settings.themes.cyanine.introMarkdown) }}
{% else %}
{{ content }}
{% endif %}
</div>
{% if settings.themes.cyanine.introButtonLink %}
<a class="button link dim ph4 pv3 mt3 ba dib" href="{{ settings.themes.cyanine.introButtonLink }}">{{ settings.themes.cyanine.introButtonLabel }}</a>
{% endif %}
</div>
</div>
{% if settings.themes.cyanine.introButtonLink %}
<a class="button link dim ph4 pv3 mt3 ba dib" href="{{ settings.themes.cyanine.introButtonLink }}">{{ settings.themes.cyanine.introButtonLabel }}</a>
{% endif %}
</div>
</div>
</section>

View File

@@ -243,11 +243,12 @@
{% if settings.themes.cyanine.collapseNav %}
<script>
var expandButton = document.getElementById("expander");
var expandLabel = expandButton.dataset.expandlabel;
var collapseLabel = expandButton.dataset.collapselabel;
if(expandButton)
if(expandButton !== null)
{
var expandLabel = expandButton.dataset.expandlabel;
var collapseLabel = expandButton.dataset.collapselabel;
expandButton.addEventListener('click', function(e)
{
var contentnav = document.getElementById("contentnav");