From 5668edea38da9fd1cad629db9c768ff19e62e094 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Fri, 3 May 2019 04:02:31 +0400 Subject: [PATCH] Have added new structure sites Signed-off-by: Valentin Popov --- _data/social_links.yml | 14 --- _includes/navbar.html | 45 --------- _layouts/default.html | 7 +- _layouts/page.html | 12 +-- _layouts/post.html | 21 +++-- _pages/atom.xml | 1 - _pages/index.html | 39 +++----- _scss/LICENSE.txt | 7 -- _scss/README.md | 26 ------ _scss/base/_main.scss | 2 - _scss/components/_background.scss | 10 -- _scss/components/_core.scss | 28 +++++- _scss/components/_navigation.scss | 150 ------------------------------ _scss/sakura/_main.scss | 2 +- assets/background.svg | 137 --------------------------- 15 files changed, 65 insertions(+), 436 deletions(-) delete mode 100644 _data/social_links.yml delete mode 100644 _includes/navbar.html delete mode 100644 _scss/LICENSE.txt delete mode 100644 _scss/README.md delete mode 100644 _scss/components/_background.scss delete mode 100644 _scss/components/_navigation.scss delete mode 100644 assets/background.svg diff --git a/_data/social_links.yml b/_data/social_links.yml deleted file mode 100644 index 13a7b68..0000000 --- a/_data/social_links.yml +++ /dev/null @@ -1,14 +0,0 @@ -- title: "E-Mail" - url: "mailto:info@valentineus.link" - -- title: "GitHub" - url: "https://github.com/valentineus" - -- title: "Instagram" - url: "https://www.instagram.com/valentius.p" - -- title: "Twitter" - url: "https://twitter.com/valyaha" - -- title: "VK" - url: "https://vk.com/valentineus" diff --git a/_includes/navbar.html b/_includes/navbar.html deleted file mode 100644 index 4171449..0000000 --- a/_includes/navbar.html +++ /dev/null @@ -1,45 +0,0 @@ -{% assign pages = site.pages | where: "show", true %} - -
-

- {{ page.title | default: site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape }} -

- - - - - - -
diff --git a/_layouts/default.html b/_layouts/default.html index 0b2b632..5da4845 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -7,10 +7,9 @@ layout: compress {% include head.html %} - {% include navbar.html %} + {{ content }} -
- {{ content }} -
+ {% include aside.html %} + diff --git a/_layouts/page.html b/_layouts/page.html index 42c6c1c..561017a 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -2,10 +2,10 @@ layout: default --- -
-
+
+
+

{{ page.title | default: site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape }}

+
-
- {{ content }} -
-
+ {{ content }} + diff --git a/_layouts/post.html b/_layouts/post.html index 9d63a38..c792d23 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,13 +2,22 @@ layout: default --- -
-
+ diff --git a/_pages/atom.xml b/_pages/atom.xml index 3b8bf2f..ef04f9e 100644 --- a/_pages/atom.xml +++ b/_pages/atom.xml @@ -2,7 +2,6 @@ permalink: "atom.xml" layout: compress title: "RSS" -show: true --- diff --git a/_pages/index.html b/_pages/index.html index ffc140d..7ebd809 100644 --- a/_pages/index.html +++ b/_pages/index.html @@ -1,33 +1,22 @@ --- -title: "Posts list" permalink: "index.html" layout: page -show: false --- -{% assign postsByYear = site.posts | group_by_exp: "post", "post.date | date: '%Y'" %} +{% for post in site.posts %} +
+

+ + + -{% for year in postsByYear %} -
- -

{{ year.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | slugify }}

+ + {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + +

- -
+

{{ post.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}

+ {% endfor %} diff --git a/_scss/LICENSE.txt b/_scss/LICENSE.txt deleted file mode 100644 index 90dabc3..0000000 --- a/_scss/LICENSE.txt +++ /dev/null @@ -1,7 +0,0 @@ -Copyright 2017, 2018 Valentin Popov - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/_scss/README.md b/_scss/README.md deleted file mode 100644 index 0ed68c7..0000000 --- a/_scss/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# Style development - -Catalog, dedicated to the development of styles for the site. -The assembly of styles is carried out by Jekyll independently. -Input the project file is located here: - -``` -/valentineus.github.io/assets/css/styles.scss -``` - -## Description catalogs - -| Catalog | Description | -| ------------ | --------------------------------- | -| `base` | Header files. | -| `bootstrap` | Source code repository Bootstrap. | -| `components` | Used components. | -| `utilities` | Auxiliary development tools. | - -## License - -MIT License - -[MIT](LICENSE.txt). -Copyright (c) -[Valentin Popov](https://valentineus.link/). diff --git a/_scss/base/_main.scss b/_scss/base/_main.scss index 13a219c..810b2d4 100644 --- a/_scss/base/_main.scss +++ b/_scss/base/_main.scss @@ -1,3 +1 @@ @import 'components/core'; -@import 'components/background'; -@import 'components/navigation'; diff --git a/_scss/components/_background.scss b/_scss/components/_background.scss deleted file mode 100644 index f91231d..0000000 --- a/_scss/components/_background.scss +++ /dev/null @@ -1,10 +0,0 @@ -$background-image: '/assets/background.svg'; - -html { - background: $color-bg url($background-image) repeat fixed; -} - -body { - border-left: 1px solid $color-bg-alt; - border-right: 1px solid $color-bg-alt; -} diff --git a/_scss/components/_core.scss b/_scss/components/_core.scss index 56cbba4..1278e65 100644 --- a/_scss/components/_core.scss +++ b/_scss/components/_core.scss @@ -13,7 +13,31 @@ html { } body { + display: flex; + flex-direction: row; min-height: 100%; - padding-bottom: 20px; - padding-top: 100px; +} + +.container { + flex: 75%; + padding-right: 32px; +} + +.sidebar { + flex: 25%; +} + +@media (max-width: 684px) { + body { + flex-direction: column; + } + + .container { + flex: 100%; + padding-right: 0; + } + + .sidebar { + flex: 100%; + } } diff --git a/_scss/components/_navigation.scss b/_scss/components/_navigation.scss deleted file mode 100644 index 128ae0b..0000000 --- a/_scss/components/_navigation.scss +++ /dev/null @@ -1,150 +0,0 @@ -.navigation-container { - background: $color-bg; - border-left: 1px solid $color-bg-alt; - border-right: 1px solid $color-bg-alt; - height: 100px; - left: 0; - margin: auto; - max-width: 52em; - padding: 0; - position: fixed; - right: 0; - top: 0; - width: 100%; - z-index: 128; -} - -.navigation { - background: $color-bg; - border-left: 1px solid $color-bg-alt; - border-right: 1px solid $color-bg-alt; - height: 100%; - left: 0; - margin: auto; - max-width: 52em; - padding: 0; - position: fixed; - right: 0; - top: 100px; - transform: scale(.1, 0); - transform-origin: 100% 0%; - transition: none; - width: 100%; -} - -.navigation-header { - height: 100px; - margin: auto; - overflow: hidden; - padding-bottom: 32px; - padding-left: 32px; - padding-right: 100px; - padding-top: 32px; - position: absolute; - text-overflow: ellipsis; - text-transform: uppercase; - white-space: nowrap; - width: 100%; -} - -.navigation-footer { - bottom: 0; - list-style-type: none; - margin: auto; - max-width: 52em; - padding: 20px; - position: fixed; - text-align: center; - width: 100%; - - li { - border-right: 1px solid; - display: inline; - padding: 0 20px; - - @media (max-width: 684px) { - padding: 0 10px; - } - } - - li:last-child { - border-right: 0; - } -} - -.navigation-pills { - height: 100%; - list-style-type: none; - margin: 0; - padding: 0; - text-align: center; - width: 100%; -} - -.navigation-item { - padding-bottom: 5px; - - &:last-child { - padding-bottom: 0; - } - - a { - text-decoration: none; - text-transform: uppercase; - } -} - -.toggle-button { - display: none; - - &:checked ~ .navigation { - transform: none; - transition: all .1s; - } - - &:checked ~ .toggle-label { - span { - opacity: 0; - top: 50%; - } - - span:first-child { - opacity: 1; - transform: rotate(405deg); - } - - span:last-child { - opacity: 1; - transform: rotate(-405deg); - } - } -} - -.toggle-label { - float: right; - height: 20px; - margin: 40px; - position: relative; - width: 15px; - - &:hover { - cursor: pointer; - } - - span { - background: $color-text; - height: 2px; - position: absolute; - top: 50%; - transition: .5s; - width: 100%; - - &:first-child { - top: 3px; - } - - &:last-child { - top: 16px; - } - } -} diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss index 70cc96d..0c4dcf7 100644 --- a/_scss/sakura/_main.scss +++ b/_scss/sakura/_main.scss @@ -9,7 +9,7 @@ body { font-size: $font-size-base; line-height: 1.6em; margin: auto; - max-width: 52em; + max-width: 72em; padding: 32px; } diff --git a/assets/background.svg b/assets/background.svg deleted file mode 100644 index 6d77f2b..0000000 --- a/assets/background.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -