diff --git a/.brackets.json b/.brackets.json index d9915da..083120f 100644 --- a/.brackets.json +++ b/.brackets.json @@ -11,7 +11,6 @@ "sourceComments": false, "outputStyle": "nested" }, - "linting.collapsed": false }, "assets/scss/templates/*": { "sass.enabled": true, @@ -23,7 +22,6 @@ "sourceComments": false, "outputStyle": "nested" }, - "linting.collapsed": true }, "assets/vendors/bootstrap/scss/*": { "sass.enabled": true, diff --git a/assets/css/blog.css b/assets/css/blog.css new file mode 100644 index 0000000..44e53ff --- /dev/null +++ b/assets/css/blog.css @@ -0,0 +1,69 @@ +/* STYLE for jannikbeyerstedt.de + * for specific template + */ +h2 { + margin-bottom: 5px; } + +a:hover, a:active, a:focus { + text-decoration: none; } + +main.blog .container { + max-width: 700px; } + +main.blog h1 a { + color: inherit; } + +main.blog article div.meta { + color: #a6a6a6; } + main.blog article div.meta span.tags { + margin-left: 5px; + border-left: 1px solid #a6a6a6; + padding-left: 6px; } + main.blog article div.meta span.tags a { + color: inherit; } + main.blog article div.meta span.tags a:after { + content: ','; } + main.blog article div.meta span.tags a:last-child:after { + content: ''; } + +main.blog article.excerpt { + padding-bottom: 30px; + margin-top: 25px; + border-bottom: 1px solid #a6a6a6; + margin-bottom: 20px; } + main.blog article.excerpt a.more { + font-size: 1.7em; + line-height: 1rem; + position: relative; + top: 0.03em; } + +main.blog article.blogarticle { + margin-top: 30px; + padding-bottom: 60px; + border-bottom: 2px solid silver; + margin-bottom: 50px; } + +main.blog div.teasers article.excerpt:last-child { + border-bottom: none; } + +nav.pagination { + float: none; + text-align: center; + height: 45px; + color: #a6a6a6; } + nav.pagination a.button { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid #d9d9d9; + border-radius: 10px; + color: inherit; } + nav.pagination a.button.older { + float: left; } + nav.pagination a.button.newer { + float: right; } + nav.pagination span.num-pages { + position: relative; + top: 0.5em; } + +/*# sourceMappingURL=blog.css.map */ \ No newline at end of file diff --git a/assets/css/blog.css.map b/assets/css/blog.css.map new file mode 100644 index 0000000..c18f489 Binary files /dev/null and b/assets/css/blog.css.map differ diff --git a/assets/css/main.css b/assets/css/main.css index bb78221..7dc6883 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -22,7 +22,7 @@ p { a { color: #2da301; } - a:active, a:hover { + a:active, a:hover, a:focus { color: #1f7001; } main div.container { diff --git a/assets/css/main.css.map b/assets/css/main.css.map index b8a78d6..3e49568 100644 Binary files a/assets/css/main.css.map and b/assets/css/main.css.map differ diff --git a/assets/scss/blog.scss b/assets/scss/blog.scss new file mode 100644 index 0000000..20cf861 --- /dev/null +++ b/assets/scss/blog.scss @@ -0,0 +1,105 @@ +/* STYLE for jannikbeyerstedt.de + * for specific template + */ +@import "custom"; +@import "variables"; +@import "mixins"; + +@import "mainvariables"; + +$blog_color_meta: #a6a6a6; + +// change main.scss behavior +body { + +} +h2 { + margin-bottom: 5px; +} + +a:hover, a:active, a:focus { + text-decoration: none; +} + + +// additional css +main.blog { + .container { + max-width: 700px; + } + h1 a { + color: inherit; + } + + article { + div.meta { + color: $blog_color_meta; + span.tags { + margin-left: 5px; + border-left: 1px solid $blog_color_meta; + padding-left: 6px; + a {color: inherit;} + a:after {content: ',';} + a:last-child:after {content: '';} + } + } + } + + article.excerpt { + padding-bottom: 30px; + margin-top: 25px; + border-bottom: 1px solid $blog_color_meta; + margin-bottom: 20px; + + a.more { + font-size: 1.7em; + line-height: 1rem; + position: relative; + top: 0.03em; + } + } + + article.blogarticle { + margin-top: 30px; + + padding-bottom: 60px; + border-bottom: 2px solid lighten($blog_color_meta, 10%); + margin-bottom: 50px; + } + + div.teasers { + article.excerpt:last-child { + border-bottom: none; + } + } +} + +nav.pagination { + float: none; + text-align: center; + height: 45px; + color: $blog_color_meta; + a.button { + display: inline-block; + padding: 5px 14px; + background-color: #fff; + border: 1px solid lighten($blog_color_meta, 20%); + border-radius: 10px; + color: inherit; + &.older { + float: left; + } + &.newer { + float: right; + } + } + span.num-pages { + position: relative; + top: 0.5em; + } +} + + + +// ---- from boostrap ---- +//@import "images"; diff --git a/assets/scss/main.scss b/assets/scss/main.scss index bf4264e..ee6c06b 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -28,7 +28,7 @@ p { } a { color: $link_color; - &:active, &:hover { + &:active, &:hover, &:focus { color: $link_active; } } diff --git a/site/blueprints/blog.yaml b/site/blueprints/blog.yaml new file mode 100644 index 0000000..55055b1 --- /dev/null +++ b/site/blueprints/blog.yaml @@ -0,0 +1,16 @@ +title: Blog +pages: + template: + - blogarticle + num: date + sort: flip + +files: true + +fields: + title: + label: Title + type: text + text: + label: Text + type: textarea diff --git a/site/blueprints/blogarticle.yaml b/site/blueprints/blogarticle.yaml new file mode 100644 index 0000000..1d9f660 --- /dev/null +++ b/site/blueprints/blogarticle.yaml @@ -0,0 +1,23 @@ +title: Blog Article +pages: false + +files: true + +fields: + title: + label: Title + type: text + date: + label: Date + type: date + width: 1/4 + tags: + label: Tags + type: tags + width: 3/4 + text: + label: Text + type: textarea + meta-robots: + label: Metatag robots + type: text diff --git a/site/snippets/base/cont-header.php b/site/snippets/base/cont-header.php index dbeec4a..917285c 100644 --- a/site/snippets/base/cont-header.php +++ b/site/snippets/base/cont-header.php @@ -9,12 +9,12 @@ $subnav = false; if ($page->depth() == 1) { $baseSec = $page; - if ( $page->isVisible() && $baseSec->hasVisibleChildren() ) { + if ( $page->isVisible() && $baseSec->hasVisibleChildren() && $page->template() != 'blog' ) { $subnav = true; } }else if ($page->depth() == 2) { $baseSec = $page->parent(); - if ( $page->isVisible() && $baseSec->hasVisibleChildren() ) { + if ( $page->isVisible() && $baseSec->hasVisibleChildren() && $page->template() != 'blogarticle' ) { $subnav = true; } } @@ -26,7 +26,7 @@ if ($page->depth() == 1) {