1
0
mirror of https://github.com/typemill/typemill.git synced 2025-08-13 01:24:26 +02:00

Merge branch 'release139' into develop

This commit is contained in:
trendschau
2020-10-03 21:42:44 +02:00
67 changed files with 2395 additions and 1144 deletions

View File

@@ -4,18 +4,18 @@
{% block content %}
<section class="bg-secondary w-100 dib tc bt bl br bb b--primary">
<section class="w-100 dib tc bt bl br bb">
<div class="mw7 pb7 ph3 center">
<header class="mt6">
<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">Not Found</h1>
<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns">Not Found</h1>
</header>
<div class="f5 f4-ns fw3 lh-copy">
<p>Sorry, but we did not find the page that you are looking for.</p>
</div>
<a class="link bg-primary white dim ph4 pv3 mt3 dib" href="{{ base_url }}">Home</a>
<a class="button link dim ph4 pv3 mt3 dib" href="{{ base_url }}">Home</a>
</div>

View File

@@ -76,7 +76,10 @@ article h6{ font-size: 1em; font-style: italic; font-weight:300; margin: 1em 0 0
article .h1, article .h2, article .h3, article .h4, article .h5, article .h6{
height: auto; /* fix for tachyons */
}
hr{}
hr{
border: none;
border-top: 1px solid;
}
ol{}
footer ul{ padding-left:1em; }
li{}
@@ -114,7 +117,10 @@ a, a:link, a:visited, a:focus, a:hover, a:active, button{
transition: all .15s ease!important;
transition-property: color, background-color, text-shadow, border;
}
article a:hover, article a:focus, article a:active,
footer a:hover, footer a:focus, footer a:active{
text-decoration: none;
}
/* Fix background for hightlight plugin */
code.hljs{ background: transparent; }
@@ -180,12 +186,12 @@ ul.TOC,.TOC ul{
text-decoration: none;
display: inline-block;
width: 100%;
border-bottom: 1px dashed lightseagreen;
border-bottom: 1px dashed;
line-height: 1em;
margin: .3em 0;
}
.TOC li a:hover,.TOC li a:focus,.TOC li a:active{
border-bottom: 1px solid lightseagreen;
border-bottom: 1px solid;
}
.TOC li a:after{
content: '\203A';
@@ -199,14 +205,10 @@ ul.TOC,.TOC ul{
.notice1 {
margin: 1em 0;
padding: 10px 1em;
background-color: #ffded4;
border-left: 4px solid #f65a3c;
}
.notice2 {
margin: 1em 0;
padding: 10px 1em;
background-color: #fff3d4;
border-left: 4px solid #f6b73c;
}
.notice3,
.notice4,
@@ -310,6 +312,15 @@ button.play-video::after {
content: ' ';
}
.landingpageinfo h2{
font-size: 2.25rem;
}
.landingpageinfo h3{
font-size: 1.5rem;
}
.landingpageinfo h4{
font-size: 1.25rem;
}
/************************************
* TACHYONS ADDITIONS *

View File

@@ -18,6 +18,14 @@ settings:
forms:
fields:
layoutsize:
type: select
label: Layout Size
options:
standard: Standard
large: Large
full: Full Width
landingpage:
type: checkbox
checkboxlabel: Activate a landingpage
@@ -30,6 +38,15 @@ forms:
type: number
label: Position of Intro Segment
description: Use 0 to disable the section
introTitle:
type: text
label: Title for your landingpage intro
placeholder: Typemill
description: Leave empty to use the title of your base content page.
introMarkdown:
type: textarea
label: Text for your landingpage intro (use markdown)
description: Leave empty to use the content of your base content page.
introButtonLink:
type: text
label: Link for startbutton
@@ -247,76 +264,137 @@ forms:
fields:
font:
type: select
label: Basic font-family
description: All fonts are system fonts with (fallbacks) if the font is not installed
options:
serif: serif
sans-serif-tm: sans-serif
courier: courier (sans-serif)
helvetica: helvetica (sans-serif)
avenir: avenir (sans-serif)
athelas: athelas (serif)
georgia: georgia (serif)
times: times (serif)
bodoni: bodoni (serif)
calisto: calisto (serif)
garamond: garamond (serif)
baskerville: baskerville (serif)
label: General font-family
description: All fonts are system fonts with fallbacks
options:
BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif: sans-serif
georgia,times,serif: serif
courier,sans-serif: courier (sans-serif)
helvetica,sans-serif: helvetica (sans-serif)
avenir,sans-serif: avenir (sans-serif)
athelas,serif: athelas (serif)
georgia,serif: georgia (serif)
times,serif: times (serif)
bodoni,serif: bodoni (serif)
calisto,serif: calisto (serif)
garamond,serif: garamond (serif)
baskerville,serif: baskerville (serif)
fontheadline:
type: select
label: Font-family for headlines
description: All fonts are system fonts with (fallbacks) if the font is not installed
options:
serif: serif
sans-serif-tm: sans-serif
description: All fonts are system fonts with fallbacks
options:
BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif: sans-serif
georgia,times,serif: serif
courier,sans-serif: courier (sans-serif)
helvetica,sans-serif: helvetica (sans-serif)
avenir,sans-serif: avenir (sans-serif)
athelas,serif: athelas (serif)
georgia,serif: georgia (serif)
times,serif: times (serif)
bodoni,serif: bodoni (serif)
calisto,serif: calisto (serif)
garamond,serif: garamond (serif)
baskerville,serif: baskerville (serif)
fontnavi:
type: select
label: Font-family for navigations
description: All fonts are system fonts with (fallbacks) if the font is not installed
options:
serif: serif
sans-serif-tm: sans-serif
courier: courier (sans-serif)
helvetica: helvetica (sans-serif)
avenir: avenir (sans-serif)
athelas: athelas (serif)
georgia: georgia (serif)
times: times (serif)
bodoni: bodoni (serif)
calisto: calisto (serif)
garamond: garamond (serif)
baskerville: baskerville (serif)
description: All fonts are system fonts with fallbacks
options:
BlinkMacSystemFont,Segoe UI,Roboto,Oxygen-Sans,Ubuntu,Cantarell,Helvetica Neue,sans-serif: sans-serif
georgia,times,serif: serif
courier,sans-serif: courier (sans-serif)
helvetica,sans-serif: helvetica (sans-serif)
avenir,sans-serif: avenir (sans-serif)
athelas,serif: athelas (serif)
georgia,serif: georgia (serif)
times,serif: times (serif)
bodoni,serif: bodoni (serif)
calisto,serif: calisto (serif)
garamond,serif: garamond (serif)
baskerville,serif: baskerville (serif)
fieldsetColors:
type: fieldset
legend: Colors
fields:
brandcolorprimary:
type: text
label: Primary brand color
label: Background color for body
placeholder: 'leightseagreen'
description: Used for the body background and borders
brandcolorsecondary:
type: text
label: Secondary brand color
placeholder: '#f7f7f7'
description: Used for content background, font-colors on hover and more
fieldsize: half
fontcolorprimary:
type: text
label: Primary font color
placeholder: 'lightseagreen'
description: Used for text
fontcolorsecondary:
label: Font color for body
placeholder: 'white'
fieldsize: half
newsbackground:
type: text
label: Secondary font color
label: Background color for news-box
placeholder: 'white'
fieldsize: half
newscolor:
type: text
label: Font color for news-box
placeholder: '#333'
fieldsize: half
brandcolortertiary:
type: text
label: Background color for buttons
placeholder: 'lightseagreen'
fieldsize: half
fontcolortertiary:
type: text
label: Font color for buttons
placeholder: '#F7F7F7'
description: Used as contrary color for hovers in navigation and buttons
fieldsize: half
bordercolortertiary:
type: text
label: Border color for buttons
placeholder: '#F7F7F7'
fieldsize: half
fontcolorlink:
type: text
label: text-links
label: Font color for content links
placeholder: '#007F7F'
description: Used for links, check contrast for a11y.
fieldsize: half
brandcolorsecondary:
type: text
label: Background color for content
placeholder: '#f7f7f7'
fieldsize: half
fontcolorsecondary:
type: text
label: Font color for content
placeholder: '#333'
fieldsize: half
codebackground:
type: text
label: Background color for code
placeholder: '#ddd'
fieldsize: half
codecolor:
type: text
label: Font color for code
placeholder: '#333'
fieldsize: half
contentnavihoverbackground:
type: text
label: Background color for hover of content navigation
placeholder: 'lightseagreen'
fieldsize: half
contentnavihovercolor:
type: text
label: Font color for hover of content navigation
placeholder: 'white'
fieldsize: half
thinbordercolor:
type: text
label: Thin border color
placeholder: 'lightgray'
description: Used for thin borders in navigations and tables
description: Used for content navigation, table and horizontal line
fieldsize: half
noticecolors:
type: checkbox
label: Color for notices
checkboxlabel: Use grayscale color schema for notices
fieldsize: half

View File

@@ -1,9 +1,9 @@
<section class="bg-primary white w-100 dib tc bl br bb b--primary">
<section class="landingpagecontrast w-100 dib tc bl br bb">
<div class="mw7 pv6 ph3 center">
<h2 class="f2 {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ settings.themes.cyanine.contrastTitle }}</h2>
<h2 class="f2">{{ settings.themes.cyanine.contrastTitle }}</h2>
<p class="f5 f4-ns fw3 lh-copy">{{ settings.themes.cyanine.contrastText }}</p>
<a class="link ba b--white bg-primary white dim ph4 pv3 mt3 dib {{ settings.themes.cyanine.fontnavi|default('tm-sans-serif') }}" href="{{ settings.themes.cyanine.contrastLink }}">{{ settings.themes.cyanine.contrastLabel }}</a>
<a class="button link ba dim ph4 pv3 mt3 dib" href="{{ settings.themes.cyanine.contrastLink }}">{{ settings.themes.cyanine.contrastLabel }}</a>
</div>
</section>

View File

@@ -1,6 +1,6 @@
<section class="bg-secondary w-100 dib tc bl br bb b--primary">
<section class="landingpageinfo w-100 dib tc bl br bb">
<div class="mw7 pv6 ph3 center">
<div class="f5 f4-ns mw7 pv6 ph3 center">
{{ markdown(settings.themes.cyanine.infoMarkdown) }}

View File

@@ -1,17 +1,25 @@
<section class="bg-secondary w-100 dib tc bt bl br bb b--primary">
<section class="landingpageintro w-100 dib tc bt bl br bb">
<div class="mw7 pb7 ph3 center">
<header class="mt6">
<h1 class="f-large f-headline-ns lh-title mv2 pt5-ns {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ title }}</h1>
{% if 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="f5 f4-ns fw3 lh-copy">
{{ content }}
{% if settings.themes.cyanine.introMarkdown %}
{{ markdown(settings.themes.cyanine.introMarkdown) }}
{% else %}
{{ content }}
{% endif %}
</div>
{% if settings.themes.cyanine.introButtonLink %}
<a class="link bg-primary white dim ph4 pv3 mt3 dib {{ settings.themes.cyanine.fontnavi|default('tm-sans-serif') }}" href="{{ settings.themes.cyanine.introButtonLink }}">{{ settings.themes.cyanine.introButtonLabel }}</a>
<a class="button link dim ph4 pv3 mt3 ba dib" href="{{ settings.themes.cyanine.introButtonLink }}">{{ settings.themes.cyanine.introButtonLabel }}</a>
{% endif %}

View File

@@ -1,9 +1,9 @@
<section class="bg-secondary w-100 dib tc bl br bb b--primary">
<section class="landingpagenavi w-100 dib tc bl br bb">
<div class="mw7 pv6 ph3 center">
<h2 class="f2 {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ settings.themes.cyanine.naviTitle }}</h2>
<nav class="cy-nav f5 f4-l fw3">
<h2 class="f2">{{ settings.themes.cyanine.naviTitle }}</h2>
<nav class="navigation f5 f4-l fw3">
{% include 'partials/navigationFlat.twig' with {'flatnavi': navigation, 'navidepth': settings.themes.cyanine.naviDepth } %}
</nav>

View File

@@ -1,8 +1,8 @@
<section class="bg-secondary w-100 dib tc bl br bb b--primary">
<section class="landingpagenews w-100 dib tc bl br bb">
<div class="mw8 pv6 ph3 center">
<h2 class="f2 {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ settings.themes.cyanine.newsHeadline }}</h2>
<h2 class="f2">{{ settings.themes.cyanine.newsHeadline }}</h2>
{% set pagelist = getPageList(navigation, settings.themes.cyanine.newsFolder, base_url) %}
@@ -14,13 +14,13 @@
{% set page = getPageMeta(settings, element) %}
<li class="db list tl pa0 w-100 mh0 mv2 mh2-l bg-white">
<a class="link dark-gray mv4" href="{{ element.urlAbs }}">
<li class="db list tl pa0 w-100 mh0 mv2 mh2-l shadow-2-hover">
<a class="link mv4 dim" href="{{ element.urlAbs }}">
<div class="db h4-5 overflow-hidden">
<img class="db w-100" src="{{ page.meta.heroimage }}" alt="{{ page.meta.heroimagealt }}">
</div>
<div class="pa2 ph3-ns pb3-ns">
<h3 class="{{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ page.meta.title }}</h3>
<h3>{{ page.meta.title }}</h3>
<p class="f5 lh-copy">{{ page.meta.description|length > 80 ? page.meta.description|slice(0, 81)|split(' ')|slice(0, -1)|join(' ') ~ '…' : page.meta.description }}</p>
</div>
</a>
@@ -39,15 +39,15 @@
{% set post = getPageMeta(settings, element) %}
{% set date = element.order[0:4] ~ '-' ~ element.order[4:2] ~ '-' ~ element.order[6:2] %}
<li class="db list tl pa0 w-100 mh0 mv2 mh2-l bg-white shadow-2-hover">
<li class="db list tl pa0 w-100 mh0 mv2 mh2-l shadow-2-hover">
<a class="link dark-gray mv4" href="{{ element.urlAbs }}">
<a class="link mv4 dim" href="{{ element.urlAbs }}">
<div class="db h4-5 overflow-hidden">
<img class="db w-100" src="{{ post.meta.heroimage }}" alt="{{ post.meta.heroimagealt }}">
</div>
<div class="pa2 ph3-ns pb3-ns">
<h3 class="{{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ post.meta.title }}</h3>
<small class="f6 gray"><time datetime="{{date}}">{{ date | date("d.m.Y") }}</time> | {{ post.meta.author }}</small>
<h3>{{ post.meta.title }}</h3>
<small class="f6"><time datetime="{{date}}">{{ date | date("d.m.Y") }}</time> | {{ post.meta.author }}</small>
<p class="f5 lh-copy">{{ post.meta.description|length > 80 ? post.meta.description|slice(0, 81)|split(' ')|slice(0, -1)|join(' ') ~ '…' : post.meta.description }}</p>
</div>
</a>
@@ -59,7 +59,7 @@
{% endif %}
<a href="{{ settings.themes.cyanine.newsFolder }}" class="dib link pa3 ma1 dark-gray hover-white hover-bg-dark-gray ba b--dark-gray">{{ settings.themes.cyanine.newsLabel }}</a>
<a href="{{ settings.themes.cyanine.newsFolder }}" class="button link dim dib pa3 ma1 ba">{{ settings.themes.cyanine.newsLabel }}</a>
</div>

View File

@@ -1,15 +1,15 @@
<section class="bg-secondary w-100 dib tc bl br bb b--primary">
<section class="landingpageteaser w-100 dib tc bl br bb">
<div class="mw7 pv6 ph3 center flex-m flex-l justify-between">
<div class="mw5 center ml0-l mr0-l mv4 dib">
<h2 class="f2 {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ settings.themes.cyanine.teaser1title }}</h2>
<h2 class="f2">{{ settings.themes.cyanine.teaser1title }}</h2>
<p class="f5 f4-ns fw3 lh-copy">{{ settings.themes.cyanine.teaser1text }}</p>
<a href="{{ settings.themes.cyanine.teaser1link }}" class="w-100 dib link pa3 ma1 dark-gray hover-white hover-bg-dark-gray ba b--dark-gray {{ settings.themes.cyanine.fontnavi|default('tm-sans-serif') }}">{{ settings.themes.cyanine.teaser1label }}</a>
<a href="{{ settings.themes.cyanine.teaser1link }}" class="button link dim w-100 dib pa3 ma1 ba">{{ settings.themes.cyanine.teaser1label }}</a>
</div>
<div class="mw5 center ml0-l mr0-l mv4 dib">
<h2 class="f2 {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ settings.themes.cyanine.teaser2title }}</h2>
<h2 class="f2">{{ settings.themes.cyanine.teaser2title }}</h2>
<p class="f5 f4-ns fw3 lh-copy">{{ settings.themes.cyanine.teaser2text }}</p>
<a href="{{ settings.themes.cyanine.teaser2link }}" class="w-100 dib link pa3 ma1 dark-gray hover-white hover-bg-dark-gray ba b--dark-gray {{ settings.themes.cyanine.fontnavi|default('tm-sans-serif') }}">{{ settings.themes.cyanine.teaser2label }}</a>
<a href="{{ settings.themes.cyanine.teaser2link }}" class="button link dim w-100 dib pa3 ma1 ba">{{ settings.themes.cyanine.teaser2label }}</a>
</div>
</div>

View File

@@ -9,8 +9,6 @@
<meta name="author" content="{{ metatabs.meta.author }}" />
<meta name="generator" content="TYPEMILL" />
<meta name="msapplication-TileColor" content="#F9F8F6" />
<base href="{{ base_url }}/">
{% if favicon %}
<meta name="msapplication-TileColor" content="#F9F8F6" />
@@ -23,15 +21,17 @@
<link rel="apple-touch-icon" sizes="180x180" href="{{ base_url }}/media/files/favicon-180.png" />
{% endif %}
<link rel="canonical" href="{{ base_url }}{{ item.urlAbs }}" />
<link rel="canonical" href="{{ item.urlAbs }}" />
<meta property="og:site_name" content="{{ settings.title }}">
<meta property="og:title" content="{{ title }}">
<meta property="og:description" content="{{ metatabs.meta.description }}">
<meta property="og:type" content="article">
<meta property="og:url" content="{{ item.urlAbs }}">
<meta property="og:image" content="{{ image.img_url }}">
<meta name="twitter:image:alt" content="{{ image.img_alt }}">
{% if image.img_url %}
<meta property="og:image" content="{{ image.img_url }}">
<meta name="twitter:image:alt" content="{{ image.img_alt }}">
{% endif %}
<meta name="twitter:card" content="summary_large_image">
{% block stylesheets %}
@@ -39,69 +39,174 @@
<link rel="stylesheet" href="{{ base_url }}/themes/cyanine/css/style.css" />
<style>
.f-link,a.tm-download::before,
article a, article a:link, article a:visited,
footer a, footer a:link, footer a:visited{
color: {{ settings.themes.cyanine.fontcolorlink|default('#007F7F') }};
/*******************
** LAYOUT SIZES **
*******************/
{% if settings.themes.cyanine.layoutsize == 'large' %}
@media screen and (min-width: 50em){
.grid-container{
max-width: 82rem;
grid-template-columns: 25% 75%;
}
.grid-main{
max-width: 56rem;
margin: auto;
}
}
{% elseif settings.themes.cyanine.layoutsize == 'full' %}
@media screen and (min-width: 70em){
.grid-container{
max-width: 100%;
grid-template-columns: 20% 80%;
}
.grid-main{
padding-left: 4rem;
padding-right: 4rem;
margin: auto;
}
}
{% else %}
@media screen and (min-width: 50em){
.grid-container{
max-width: 64rem;
grid-template-columns: 30% 70%;
}
}
{% endif %}
/*******************
** FONT FAMILIES **
*******************/
body,.landingpagecontrast{
font-family: {{ settings.themes.cyanine.font|default('-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif') }};
}
article a:hover, article a:focus, article a:active,
footer a:hover, footer a:focus, footer a:active{
text-decoration: none;
h1,h2,h3,h4,h5,h6,.logo{
font-family: {{ settings.themes.cyanine.fontheadline|default('-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif') }};
}
table{
background: #fff;
.navigation, button, .button, .mainnavigation{
font-family: {{ settings.themes.cyanine.fontnavi|default('-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif') }};
}
thead{
color: {{ settings.themes.cyanine.fontcolorsecondary|default('#F7F7F7') }};
background-color: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
/*******************
** COLORS **
*******************/
body,.landingpagecontrast{
background: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
tr{
border-color: {{ settings.themes.cyanine.thinbordercolor|default('lightgray') }};
main, footer, .landingpageintro, .landingpageinfo, .landingpageteaser, .landingpagenavi, .landingpagecontrast, .landingpagenews{
border-color: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
article pre, article code{
background-color: #ddd;
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited{
background: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
body,.landingpagecontrast, a,
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited{
color: {{ settings.themes.cyanine.fontcolorprimary|default('#F7F7F7') }};
}
.landingpagecontrast a, .landingpagecontrast a:link, .landingpagecontrast a:visited{
border-color: {{ settings.themes.cyanine.fontcolorprimary|default('#F7F7F7') }};
}
main, footer, .landingpageintro, .landingpageinfo, .landingpageteaser, .landingpagenavi, .landingpagenews,button.expander{
background: {{ settings.themes.cyanine.brandcolorsecondary|default('#f7f7f7') }};
}
main, footer, .landingpageintro, .landingpageinfo, .landingpageteaser, .landingpagenavi, .landingpagenews, .logo a, button.expander{
color: {{ settings.themes.cyanine.fontcolorsecondary|default('#333') }};
}
button.expander{
border-color: {{ settings.themes.cyanine.fontcolorsecondary|default('#333') }};
}
main a, footer a, .landingpageintro p a, .landingpageinfo p a, .landingpageteaser p a, .landingpagenavi p a{
color: {{ settings.themes.cyanine.fontcolorlink|default('#007474') }};
}
.TOC li a, .TOC li a:hover,.TOC li a:focus,.TOC li a:active{
border-color: {{ settings.themes.cyanine.fontcolorlink|default('#007474') }};
}
.navigation, button, .button,thead{
background: {{ settings.themes.cyanine.brandcolortertiary|default('lightseagreen') }};
}
.navigation, button, .button{
border-color: {{ settings.themes.cyanine.bordercolortertiary|default('lightseagreen') }};
}
.navigation, button, .button,thead,
.navigation a,.navigation a:hover,.navigation a:focus, .navigation a:active{
color: {{ settings.themes.cyanine.fontcolortertiary|default('#F7F7F7') }};
}
article pre{
border-left: 4px solid {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
border-left: 4px solid {{ settings.themes.cyanine.brandcolortertiary|default('lightseagreen') }};
}
article pre, article code{
background: {{ settings.themes.cyanine.codebackground|default('#ddd') }};
color: {{ settings.themes.cyanine.codecolor|default('#333') }};
}
.mainnavigation a:hover,.mainnavigation a:focus,.mainnavigation a:active, .mainnavigation .active > a:first-child{
background: {{ settings.themes.cyanine.contentnavihoverbackground|default('lightseagreen') }};
color: {{ settings.themes.cyanine.contentnavihovercolor|default('white') }};
}
.landingpagenews li{
background: {{ settings.themes.cyanine.newsbackground|default('white') }};
}
.landingpagenews li a{
color: {{ settings.themes.cyanine.newscolor|default('#333') }};
}
.mainnavigation li, tr, hr{
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.fontcolorsecondary|default('#f7f7f7') }};
color: {{ settings.themes.cyanine.contentnavihovercolor|default('#f7f7f7') }};
background: {{ settings.themes.cyanine.fontcolorlink|default('#007F7F') }};
}
.f-primary{
color: {{ settings.themes.cyanine.fontcolorprimary|default('#333') }};
.notice1{
background-color: #ffded4;
border-left: 4px solid #f65a3c;
}
.f-secondary,
.hover-f-secondary:hover,.hover-f-secondary:focus,.hover-f-secondary:active, .active > a:first-child.hover-f-secondary{
color: {{ settings.themes.cyanine.fontcolorsecondary|default('#f7f7f7') }};
.notice2{
background-color: #fff3d4;
border-left: 4px solid #f6b73c;
}
.bg-primary,
.hover-bg-primary:hover,.hover-bg-primary:focus,.hover-bg-primary:active, .active > a:first-child.hover-bg-primary{
background-color: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
.bg-secondary{
background-color: {{ settings.themes.cyanine.brandcolorsecondary|default('#f7f7f7') }};
}
.b--primary{
border-color: {{ settings.themes.cyanine.brandcolorprimary|default('lightseagreen') }};
}
.b--secondary{
border-color: {{ settings.themes.cyanine.brandcolorsecondary|default('#f7f7f7') }};
}
.b--tertiary{
border-color: {{ settings.themes.cyanine.thinbordercolor|default('lightgray') }};
}
h1, h2, h3, h4, h5, h6{
{% if settings.themes.cyanine.fontheadline == 'serif' %}
font-family: georgia, times, serif;
{% elseif settings.themes.cyanine.fontheadline == 'sans-serif-tm' %}
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
{% endif %}
.notice3,
.notice4,
.notice5,
.notice6 {
background-color: #d4e0ff;
border-left: 4px solid #3c7bf6;
}
{% if settings.themes.cyanine.noticecolors %}
.notice1 {
background-color: #fafafa;
border-left: 10px solid #000;
color: #333;
}
.notice2 {
background-color: #eee;
border-left: 10px solid #999;
color: #333;
}
.notice3,
.notice4,
.notice5,
.notice6 {
background-color: #444;
border-left: 10px solid #ccc;
color: #fff;
}
{% endif %}
</style>
{{ assets.activateTachyons() }}
@@ -109,7 +214,7 @@
{% endblock %}
</head>
<body class="{{ settings.themes.cyanine.font|default('tm-sans-serif') }} optimize-text pa2 bg-primary dark-gray">
<body class="optimize-text pa2">
{% block content %}{% endblock %}

View File

@@ -1,8 +1,8 @@
{% set published = metatabs.meta.manualdate ? metatabs.meta.manualdate : metatabs.meta.modified %}
<main class="{{ item.elementType }} w-100 bg-secondary pb5 bl br bb b--primary">
<main class="{{ item.elementType }} w-100 pb5 bl br bb">
<div class="w-100 mw8 center grid-container">
<div class="w-100 center grid-container">
<aside class="grid-header ph3 pv3">
@@ -10,9 +10,9 @@
<div class="logo">
<p class="pa0 ma0">
<a class="link f1 fw9 f-primary {{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}" href="{{ base_url }}" title="My Title">
<a class="link f1 fw9" href="{{ base_url }}" title="My Title">
{% if logo %}
<img src="{{ logo }}" class="logo-image"/>
<img src="{{ base_url }}/{{ logo }}" class="logo-image"/>
{% else %}
{{ settings.title }}
{% endif %}
@@ -25,7 +25,7 @@
{% if widgets %}
{% for index,widget in widgets %}
<div id="{{ index }}" class="mt4-l mt3">
{{ widget }}
{{ widget }}
</div>
{% endfor %}
{% endif %}
@@ -41,7 +41,7 @@
<article>
<header>
<h1 class="{{ settings.themes.cyanine.fontheadline|default('tm-sans-serif') }}">{{ title }}</h1>
<h1>{{ title }}</h1>
{% if (settings.themes.cyanine.datePosition.top or settings.themes.cyanine.authorPosition.top or settings.themes.cyanine.gitPosition.top) %}
<div class="f5 pv1 flex justify-between">
@@ -86,10 +86,10 @@
<div class="f5 pv5 flex justify-between {{ settings.themes.cyanine.fontnavi|default('tm-sans-serif') }}">
{% if item.prevItem %}
<a class="link pv2 ph3 bg-primary white dim" href="{{ item.prevItem.urlRel }}">&lsaquo;&nbsp; {{ item.prevItem.name }}</a>
<a class="navigation link pv2 ph3 ba dim" href="{{ item.prevItem.urlRel }}">&lsaquo;&nbsp; {{ item.prevItem.name }}</a>
{% endif %}
{% if item.nextItem %}
<a class="link pv2 ph3 bg-primary white dim" href="{{ item.nextItem.urlRel }}">{{ item.nextItem.name }} &nbsp;&rsaquo;</a>
<a class="navigation link pv2 ph3 ba dim" href="{{ item.nextItem.urlRel }}">{{ item.nextItem.name }} &nbsp;&rsaquo;</a>
{% endif %}
</div>

View File

@@ -1,6 +1,6 @@
<div class="f6 pv3 w-100 flex-l justify-between {{ settings.themes.cyanine.fontnavi}}">
<div class="f6 pv3 w-100 flex-l justify-between">
<div>
<div class="mw6">
<a class="link f-link underline-hover" href="{{ base_url }}">{{ settings.title|title }}</a>
{% for crumb in breadcrumb %}

View File

@@ -1,6 +1,6 @@
{% set nowYear = "now"|date("Y") %}
<footer class="w-100 bg-secondary bl br bb b--primary lh-copy">
<footer class="w-100 bl br bb lh-copy">
<div class="mw8 center pv3 flex-l">
{% for column,key in settings.themes.cyanine.footercolumns %}
{% if settings.themes.cyanine[column] %}
@@ -19,6 +19,6 @@
</div>
</footer>
<div class="w-100 center f6 f-secondary">
<div class="w-100 center f6">
<p class="f6">{{ settings.copyright }} {{ __('by') }} {{ settings.author }}, {{ copyrightYears }}. {{ __('All Rights Reserved') }}. {{ __('Built with') }} <a class="link underline f-secondary" href="https://typemill.net">Typemill</a>.</p>
</div>

View File

@@ -7,22 +7,22 @@
{% set depth = element.keyPathArray|length %}
{% if element.activeParent %}
<li class="bt bb b--tertiary margin-bottom-1 {{ element.elementType }} level-{{ depth }} activeParent">
<li class="bt bb margin-bottom-1 {{ element.elementType }} level-{{ depth }} activeParent">
{% elseif element.active %}
<li class="bt bb b--tertiary margin-bottom-1 {{ element.elementType }} level-{{ depth }} active">
<li class="bt bb margin-bottom-1 {{ element.elementType }} level-{{ depth }} active">
{% else %}
<li class="bt bb b--tertiary margin-bottom-1 {{ element.elementType }} level-{{ depth }}">
<li class="bt bb margin-bottom-1 {{ element.elementType }} level-{{ depth }}">
{% endif %}
{% if (element.elementType == 'folder') %}
<a class="link dib w-100 relative fw7 pv2 pr2 indent-l-{{depth}} margin-bottom-1 arrow-after hover-bg-primary f-primary hover-f-secondary" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>
<a class="link dib w-100 relative fw7 pv2 pr2 indent-l-{{depth}} margin-bottom-1 arrow-after" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>
{% if (element.folderContent|length > 0) and (element.contains == 'pages') %}
<ul class="list pa0">
{{ macros.loop_over(element.folderContent, chapnum) }}
</ul>
{% endif %}
{% else %}
<a class="link dib w-100 relative fw3 pv2 pr2 indent-l-{{depth}} margin-bottom-1 arrow-after hover-bg-primary f-primary hover-f-secondary" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
<a class="link dib w-100 relative fw3 pv2 pr2 indent-l-{{depth}} margin-bottom-1 arrow-after" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
{% endif %}
</li>
{% endfor %}
@@ -31,9 +31,9 @@
{% import _self as macros %}
{% if settings.themes.cyanine.collapseNav %}
<button id="expander" class=" dn db-l link pointer w-100 bg-secondary ba b--tertiary pa2 mb1 f7">expand navigation</button>
<button id="expander" class="expander dim dn db-l link pointer w-100 ba pa2 mb3 f6">expand navigation</button>
{% endif %}
<ul class="list pa0 menu {{ settings.themes.cyanine.fontnavi }}">
<ul class="mainnavigation list pa0 menu">
{{ macros.loop_over(navigation, settings.themes.cyanine.chapnum ) }}
</ul>

View File

@@ -5,16 +5,16 @@
{% import _self as macros %}
{% for element in navigation %}
<li class="{% if level == 1 %}w-100 w-50-l ba bb bg-primary f-secondary b--secondary pa4{% endif %} {{ element.elementType }}">
<li class="{% if level == 1 %}w-100 w-50-l ba bb pa4{% endif %} {{ element.elementType }}">
{% if element.elementType == 'folder' and level < maxdepth %}
<a class="link relative f-secondary dib bb bt-0 br-0 bl-0 b--dashed b--solid-hover b--light-gray w-100 ma2 arrow-after-transition" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>
<a class="link relative dib bb bt-0 br-0 bl-0 b--dashed b--solid-hover w-100 ma2 arrow-after-transition" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }}. {% endif %}{{ element.name }}</a>
{% if element.contains == 'pages' %}
<ul class="list">
{{ macros.loop_over(element.folderContent,level+1, maxdepth, chapnum) }}
</ul>
{% endif %}
{% else %}
<a class="link relative f-secondary dib bb bt-0 br-0 bl-0 b--dashed b--solid-hover b--light-gray w-100 ma2 arrow-after-transition" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
<a class="link relative dib bb bt-0 br-0 bl-0 b--dashed b--solid-hover w-100 ma2 arrow-after-transition" href="{{ element.urlAbs }}">{% if chapnum %}{{ element.chapter }} {% endif %}{{ element.name }}</a>
{% endif %}
</li>
{% endfor %}
@@ -22,6 +22,6 @@
{% import _self as macros %}
<ul class="list pa0 flex-m flex-l flex-wrap tl justify-between {{ settings.themes.cyanine.fontnavi}}">
<ul class="navigation list pa0 flex-m flex-l flex-wrap tl justify-between">
{{ macros.loop_over(flatnavi, 1, maxdepth, settings.themes.cyanine.chapnum) }}
</ul>

View File

@@ -7,7 +7,7 @@
<li class="post-entry">
<header>
<a class="link f-link underline-hover" href="{{ element.urlAbs }}"><h2 class="mt4 mb2 {{ settings.themes.cyanine.fontheadline}}">{{ post.meta.title }}</h2></a>
<a class="link f-link underline-hover" href="{{ element.urlAbs }}"><h2 class="mt4 mb2">{{ post.meta.title }}</h2></a>
<div class="mt3"><small><time datetime="{{date}}">{{ date | date("d.m.Y") }}</time> | {{ post.meta.author }}</small></div>
</header>
<p>{{ post.meta.description }}</p>