From 20a83cfb4a9f7841944b62c914250d8938274585 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 11:54:12 +0400 Subject: Updated site styles Signed-off-by: Valentin Popov --- _scss/base/_main.scss | 1 - _scss/base/_sakura.scss | 4 ++-- _scss/components/_avatar.scss | 9 --------- _scss/components/_core.scss | 38 +----------------------------------- _scss/normalize/_main.scss | 30 ++++++++++++++-------------- _scss/sakura/_main.scss | 13 ++++++------ _scss/utilities/_textsizeadjust.scss | 7 ++++--- 7 files changed, 29 insertions(+), 73 deletions(-) delete mode 100644 _scss/components/_avatar.scss diff --git a/_scss/base/_main.scss b/_scss/base/_main.scss index e617f45..8e9bc80 100644 --- a/_scss/base/_main.scss +++ b/_scss/base/_main.scss @@ -1,3 +1,2 @@ -@import 'components/avatar'; @import 'components/core'; @import 'components/header'; diff --git a/_scss/base/_sakura.scss b/_scss/base/_sakura.scss index cdc2fe4..0bcce6e 100644 --- a/_scss/base/_sakura.scss +++ b/_scss/base/_sakura.scss @@ -1,8 +1,8 @@ $color-bg-alt: rgba(0, 0, 0, .09); $color-bg: rgb(255, 255, 255); -$color-blossom:rgb(0, 51, 153); +$color-blossom: rgb(0, 51, 153); $color-fade: rgb(51, 102, 204); -$color-html:rgb(255, 255, 255); +$color-html: rgb(255, 255, 255); $color-text: rgb(0, 0, 0); $font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif; diff --git a/_scss/components/_avatar.scss b/_scss/components/_avatar.scss deleted file mode 100644 index e4b133f..0000000 --- a/_scss/components/_avatar.scss +++ /dev/null @@ -1,9 +0,0 @@ -.avatar { - margin: auto; - max-width: 148px; - text-align: center; - - img { - border-radius: 10px; - } -} diff --git a/_scss/components/_core.scss b/_scss/components/_core.scss index f3a28f1..46740ac 100644 --- a/_scss/components/_core.scss +++ b/_scss/components/_core.scss @@ -4,47 +4,11 @@ *::after, *::before { @include text-size-adjust(100%); + box-sizing: border-box; } html { background-color: $color-html; - height: 100%; overflow-y: scroll; } - -body { - display: flex; - flex-direction: row; - min-height: 100%; -} - -.container { - flex: 75%; - padding-right: 16px; -} - -.sidebar { - border-left: 1px solid $color-bg-alt; - flex: 25%; - height: 100%; - padding-left: 16px; -} - -@media (max-width: 684px) { - body { - flex-direction: column; - } - - .container { - flex: 100%; - padding-right: 0; - } - - .sidebar { - border: 0; - display: none; - flex: 100%; - padding-left: 0; - } -} diff --git a/_scss/normalize/_main.scss b/_scss/normalize/_main.scss index 3931bbb..791ed81 100644 --- a/_scss/normalize/_main.scss +++ b/_scss/normalize/_main.scss @@ -93,24 +93,24 @@ select { } button, -[type="button"], -[type="reset"], -[type="submit"] { +[type='button'], +[type='reset'], +[type='submit'] { -webkit-appearance: button; } button::-moz-focus-inner, -[type="button"]::-moz-focus-inner, -[type="reset"]::-moz-focus-inner, -[type="submit"]::-moz-focus-inner { +[type='button']::-moz-focus-inner, +[type='reset']::-moz-focus-inner, +[type='submit']::-moz-focus-inner { border-style: none; padding: 0; } button:-moz-focusring, -[type="button"]:-moz-focusring, -[type="reset"]:-moz-focusring, -[type="submit"]:-moz-focusring { +[type='button']:-moz-focusring, +[type='reset']:-moz-focusring, +[type='submit']:-moz-focusring { outline: 1px dotted ButtonText; } @@ -135,23 +135,23 @@ textarea { overflow: auto; } -[type="checkbox"], -[type="radio"] { +[type='checkbox'], +[type='radio'] { box-sizing: border-box; padding: 0; } -[type="number"]::-webkit-inner-spin-button, -[type="number"]::-webkit-outer-spin-button { +[type='number']::-webkit-inner-spin-button, +[type='number']::-webkit-outer-spin-button { height: auto; } -[type="search"] { +[type='search'] { -webkit-appearance: textfield; outline-offset: -2px; } -[type="search"]::-webkit-search-decoration { +[type='search']::-webkit-search-decoration { -webkit-appearance: none; } diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss index 8e15541..2f22dbc 100644 --- a/_scss/sakura/_main.scss +++ b/_scss/sakura/_main.scss @@ -26,7 +26,7 @@ body { } } -@mixin word-wrap() { +@mixin word-wrap { hyphens: auto; overflow-wrap: break-word; word-break: break-word; @@ -40,6 +40,7 @@ h4, h5, h6 { @include word-wrap; + font-weight: 700; line-height: 1.1; } @@ -126,7 +127,7 @@ code { white-space: pre-wrap; } -pre>code { +pre > code { background-color: transparent; padding: 0; white-space: pre; @@ -159,9 +160,9 @@ textarea { .button, button, -input[type="submit"], -input[type="reset"], -input[type="button"] { +input[type='submit'], +input[type='reset'], +input[type='button'] { background-color: $color-blossom; border: 1px solid $color-blossom; border-radius: 1px; @@ -206,7 +207,7 @@ input[type] { } } -input[type="checkbox"]:focus { +input[type='checkbox']:focus { outline: 1px dotted $color-blossom; } diff --git a/_scss/utilities/_textsizeadjust.scss b/_scss/utilities/_textsizeadjust.scss index 49edd0b..8a01d4d 100644 --- a/_scss/utilities/_textsizeadjust.scss +++ b/_scss/utilities/_textsizeadjust.scss @@ -1,13 +1,14 @@ // Text Size Adjust // -// The text-size-adjust CSS property controls the text inflation algorithm used on some smartphones and tablets. Other browsers will ignore this property. +// The text-size-adjust CSS property controls the text inflation algorithm used +// on some smartphones and tablets. Other browsers will ignore this property. // // Values: none | auto | // Default: none // // https://drafts.csswg.org/css-size-adjust/#adjustment-control @mixin text-size-adjust($value: none) { + -moz-text-size-adjust: $value; + -ms-text-size-adjust: $value; -webkit-text-size-adjust: $value; - -moz-text-size-adjust: $value; - -ms-text-size-adjust: $value; } -- cgit v1.2.3 From 3e0efb5d500550ea2a5687f080582e200a495d25 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 12:17:24 +0400 Subject: Removed sidebar Signed-off-by: Valentin Popov --- _includes/aside.html | 41 ----------------------------------------- _layouts/page.html | 2 -- _layouts/post.html | 2 -- 3 files changed, 45 deletions(-) delete mode 100644 _includes/aside.html diff --git a/_includes/aside.html b/_includes/aside.html deleted file mode 100644 index 311b826..0000000 --- a/_includes/aside.html +++ /dev/null @@ -1,41 +0,0 @@ - diff --git a/_layouts/page.html b/_layouts/page.html index 56d1864..01d6fcd 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -9,5 +9,3 @@ layout: default {{ content }} - -{% include aside.html %} diff --git a/_layouts/post.html b/_layouts/post.html index e4aaa10..8270973 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -18,6 +18,4 @@ layout: default {{ content }} - - {% include disqus.html %} -- cgit v1.2.3 From b837e8c89e0c01aed0b6139f699c76d246411ac7 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 13:44:05 +0400 Subject: Updated theme Signed-off-by: Valentin Popov --- _scss/base/_fonts.scss | 9 ++ _scss/base/_highlight.scss | 20 +-- _scss/base/_sakura.scss | 14 +- _scss/highlight/_main.scss | 207 +++---------------------- _scss/sakura/_main.scss | 22 +-- assets/css/styles.scss | 1 + assets/fonts/open-sans/license.txt | 201 ++++++++++++++++++++++++ assets/fonts/open-sans/open-sans-regular.ttf | Bin 0 -> 27156 bytes assets/fonts/open-sans/open-sans-regular.woff | Bin 0 -> 17248 bytes assets/fonts/open-sans/open-sans-regular.woff2 | Bin 0 -> 13608 bytes 10 files changed, 245 insertions(+), 229 deletions(-) create mode 100644 _scss/base/_fonts.scss create mode 100644 assets/fonts/open-sans/license.txt create mode 100644 assets/fonts/open-sans/open-sans-regular.ttf create mode 100644 assets/fonts/open-sans/open-sans-regular.woff create mode 100644 assets/fonts/open-sans/open-sans-regular.woff2 diff --git a/_scss/base/_fonts.scss b/_scss/base/_fonts.scss new file mode 100644 index 0000000..ad6d38e --- /dev/null +++ b/_scss/base/_fonts.scss @@ -0,0 +1,9 @@ +@font-face { + font-display: swap; + font-family: 'Open Sans'; + font-style: normal; + font-weight: normal; + src: url('/assets/fonts/open-sans/open-sans-regular.ttf') format('truetype'), + url('/assets/fonts/open-sans/open-sans-regular.woff') format('woff'), + url('/assets/fonts/open-sans/open-sans-regular.woff2') format('woff2'); +} diff --git a/_scss/base/_highlight.scss b/_scss/base/_highlight.scss index d7754cf..c3cf783 100644 --- a/_scss/base/_highlight.scss +++ b/_scss/base/_highlight.scss @@ -1,20 +1,4 @@ -$color00: #000; -$color01: #000080; -$color02: #0000cf; -$color03: #00a000; -$color04: #204a87; -$color05: #3465a4; -$color06: #4e9a06; -$color07: #5c35cc; -$color08: #800080; -$color09: #8f5902; -$color10: #a40000; -$color11: #c4a000; -$color12: #c00; -$color13: #ce5c00; -$color14: #ef2929; -$color15: #f57900; -$color16: #f8f8f8; -$color17: #ffc; +$color00: rgb(255, 0, 0); +$color01: rgb(255, 255, 204); @import 'highlight/main'; diff --git a/_scss/base/_sakura.scss b/_scss/base/_sakura.scss index 0bcce6e..58b95fe 100644 --- a/_scss/base/_sakura.scss +++ b/_scss/base/_sakura.scss @@ -1,11 +1,11 @@ $color-bg-alt: rgba(0, 0, 0, .09); -$color-bg: rgb(255, 255, 255); -$color-blossom: rgb(0, 51, 153); -$color-fade: rgb(51, 102, 204); -$color-html: rgb(255, 255, 255); -$color-text: rgb(0, 0, 0); +$color-bg: rgb(250, 250, 250); +$color-blossom: rgb(0, 108, 160); +$color-fade: rgb(13, 78, 120); +$color-html: rgb(250, 250, 250); +$color-text: rgb(85, 85, 85); -$font-family-sans-serif: '-apple-system', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Arial', sans-serif; -$font-size-base: 1.6rem; +$font-family-sans-serif: 'Open Sans', sans-serif; +$font-size-base: 1.6em; @import 'sakura/main'; diff --git a/_scss/highlight/_main.scss b/_scss/highlight/_main.scss index f5cdc72..5e999b9 100644 --- a/_scss/highlight/_main.scss +++ b/_scss/highlight/_main.scss @@ -1,310 +1,139 @@ .highlight { - .bp { - color: $color05; - } - .c { - color: $color09; font-style: italic; } .c1 { - color: $color09; font-style: italic; } .cm { - color: $color09; - font-style: italic; - } - - .cp { - color: $color09; font-style: italic; } .cs { - color: $color09; font-style: italic; } .err { - border: 1px solid $color14; - color: $color10; - } - - .g { - color: $color00; - } - - .gd { - color: $color10; + border: 1px solid $color00; } .ge { - color: $color00; font-style: italic; } .gh { - color: $color01; font-weight: bold; } - .gi { - color: $color03; - } - - .go { - color: $color00; - font-style: italic; - } - .gp { - color: $color09; - } - - .gr { - color: $color14; - } - - .gs { - color: $color00; font-weight: bold; } - .gt { - color: $color10; + .gs { font-weight: bold; } .gu { - color: $color08; font-weight: bold; } .hll { - background-color: $color17; - } - - .il { - color: $color02; - font-weight: bold; + background-color: $color01; } .k { - color: $color04; font-weight: bold; } .kc { - color: $color04; font-weight: bold; } .kd { - color: $color04; font-weight: bold; } .kn { - color: $color04; - font-weight: bold; - } - - .kp { - color: $color04; font-weight: bold; } .kr { - color: $color04; - font-weight: bold; - } - - .kt { - color: $color04; font-weight: bold; } - .l { - color: $color00; - } - - .ld { - color: $color00; - } - - .m { - color: $color02; - font-weight: bold; - } - - .mf { - color: $color02; - font-weight: bold; - } - - .mh { - color: $color02; - font-weight: bold; - } - - .mi { - color: $color02; - font-weight: bold; - } - - .mo { - color: $color02; - font-weight: bold; - } - - .n { - color: $color00; - } - - .na { - color: $color11; - } - - .nb { - color: $color04; - } - .nc { - color: $color00; - } - - .nd { - color: $color07; font-weight: bold; } .ne { - color: $color12; font-weight: bold; } - .nf { - color: $color00; - } - .ni { - color: $color13; - } - - .nl { - color: $color15; + font-weight: bold; } .nn { - color: $color00; - } - - .no { - color: $color00; - } - - .nt { - color: $color04; font-weight: bold; } - .nv { - color: $color00; - } - - .nx { - color: $color00; - } - - .o { - color: $color13; + .nt { font-weight: bold; } .ow { - color: $color04; - font-weight: bold; - } - - .p { - color: $color00; font-weight: bold; } - .py { - color: $color00; - } - .s { - color: $color06; + font-style: italic; } .s1 { - color: $color06; + font-style: italic; } .s2 { - color: $color06; + font-style: italic; } .sb { - color: $color06; + font-style: italic; } .sc { - color: $color06; + font-style: italic; } .sd { - color: $color09; font-style: italic; } .se { - color: $color06; + font-style: italic; + font-weight: bold; } .sh { - color: $color06; + font-style: italic; } .si { - color: $color06; + font-style: italic; + font-weight: bold; } .sr { - color: $color06; + font-style: italic; } .ss { - color: $color06; + font-style: italic; } .sx { - color: $color06; - } - - .vc { - color: $color00; - } - - .vg { - color: $color00; - } - - .vi { - color: $color00; - } - - .w { - color: $color16; - text-decoration: underline; - } - - .x { - color: $color00; + font-style: italic; } } diff --git a/_scss/sakura/_main.scss b/_scss/sakura/_main.scss index 2f22dbc..3f1b756 100644 --- a/_scss/sakura/_main.scss +++ b/_scss/sakura/_main.scss @@ -7,22 +7,16 @@ body { background-color: $color-bg; color: $color-text; font-size: $font-size-base; - line-height: 1.6em; + line-height: 1.4em; margin: auto; - max-width: 72em; - padding: 32px; + max-width: 64em; + padding: 4em; } @media (max-width: 684px) { body { font-size: $font-size-base * .85; - padding: 8px; - } -} - -@media (max-width: 382px) { - body { - font-size: $font-size-base * .75; + padding: 2em; } } @@ -81,13 +75,11 @@ hr { a { color: $color-blossom; - text-decoration: none; &:active, &:focus, &:hover { color: $color-fade; - text-decoration: none; } } @@ -170,7 +162,7 @@ input[type='button'] { color: $color-bg; cursor: pointer; display: inline-block; - padding: 5px 10px; + padding: 1em; text-align: center; text-decoration: none; white-space: nowrap; @@ -198,8 +190,8 @@ input[type] { box-shadow: none; box-sizing: border-box; color: $color-text; - margin-bottom: 10px; - padding: 6px 10px; + margin: .5em; + padding: 1em; &:focus { border: 1px solid $color-blossom; diff --git a/assets/css/styles.scss b/assets/css/styles.scss index 5de4ff2..8bba8f6 100644 --- a/assets/css/styles.scss +++ b/assets/css/styles.scss @@ -6,3 +6,4 @@ @import 'base/highlight'; @import 'base/sakura'; @import 'base/main'; +@import 'base/fonts'; diff --git a/assets/fonts/open-sans/license.txt b/assets/fonts/open-sans/license.txt new file mode 100644 index 0000000..989e2c5 --- /dev/null +++ b/assets/fonts/open-sans/license.txt @@ -0,0 +1,201 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/assets/fonts/open-sans/open-sans-regular.ttf b/assets/fonts/open-sans/open-sans-regular.ttf new file mode 100644 index 0000000..5ca8393 Binary files /dev/null and b/assets/fonts/open-sans/open-sans-regular.ttf differ diff --git a/assets/fonts/open-sans/open-sans-regular.woff b/assets/fonts/open-sans/open-sans-regular.woff new file mode 100644 index 0000000..699e5ad Binary files /dev/null and b/assets/fonts/open-sans/open-sans-regular.woff differ diff --git a/assets/fonts/open-sans/open-sans-regular.woff2 b/assets/fonts/open-sans/open-sans-regular.woff2 new file mode 100644 index 0000000..4359426 Binary files /dev/null and b/assets/fonts/open-sans/open-sans-regular.woff2 differ -- cgit v1.2.3 From 30c54ec5a3a436de0f775ac617c1d70fd4f4ff77 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 19:41:44 +0400 Subject: Updated homepage Signed-off-by: Valentin Popov --- _data/aside_links.yml | 15 --------------- _data/contacts.yml | 7 +++++++ _data/links.yml | 11 +++++++++++ _includes/contacts.html | 19 +++++++++++++++++++ _includes/links.html | 19 +++++++++++++++++++ _includes/posts.html | 18 ++++++++++++++++++ _pages/index.html | 26 +++----------------------- 7 files changed, 77 insertions(+), 38 deletions(-) delete mode 100644 _data/aside_links.yml create mode 100644 _data/contacts.yml create mode 100644 _data/links.yml create mode 100644 _includes/contacts.html create mode 100644 _includes/links.html create mode 100644 _includes/posts.html diff --git a/_data/aside_links.yml b/_data/aside_links.yml deleted file mode 100644 index 43bcd9c..0000000 --- a/_data/aside_links.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: 'e-mail' - tag: 'info@valentineus.link' - url: 'mailto:info@valentineus.link' - -- name: 'telegram' - tag: '@valentineus' - url: 'https://t.me/valentineus' - -- name: 'github' - tag: '@valentineus' - url: 'https://github.com/valentineus' - -- name: 'pgp' - tag: 'A90A8EA3' - url: '/publickey.txt' diff --git a/_data/contacts.yml b/_data/contacts.yml new file mode 100644 index 0000000..479d0c8 --- /dev/null +++ b/_data/contacts.yml @@ -0,0 +1,7 @@ +- title: "info@valentineus.link" + description: "E-Mail" + url: "mailto:info@valentineus.link" + +- title: "@valentineus" + description: "Telegram" + url: "https://t.me/valentineus" diff --git a/_data/links.yml b/_data/links.yml new file mode 100644 index 0000000..23447af --- /dev/null +++ b/_data/links.yml @@ -0,0 +1,11 @@ +- title: "code.valentineus.link" + description: "Code repositories" + url: "https://code.valentineus.link" + +- title: "@valentineus" + description: "GitHub" + url: "https://github.com/valentineus" + +- title: "@valyaha" + description: "Twitter" + url: "https://twitter.com/valyaha" diff --git a/_includes/contacts.html b/_includes/contacts.html new file mode 100644 index 0000000..06df563 --- /dev/null +++ b/_includes/contacts.html @@ -0,0 +1,19 @@ +

Contacts

+ +
    + {% for contact in site.data.contacts %} +
  • + {% assign description = contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} + + {{ title }} + — + {{ description }} +
    • + {% endfor %} +
+ +{% assign description = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_includes/links.html b/_includes/links.html new file mode 100644 index 0000000..d301161 --- /dev/null +++ b/_includes/links.html @@ -0,0 +1,19 @@ +

Related links

+ +
    + {% for link in site.data.links %} +
  • + {% assign description = link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} + + {{ title }} + — + {{ description }} +
    • + {% endfor %} +
+ +{% assign description = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_includes/posts.html b/_includes/posts.html new file mode 100644 index 0000000..6dc0d2b --- /dev/null +++ b/_includes/posts.html @@ -0,0 +1,18 @@ +

Posts

+ +
    + {% for post in site.posts %} +
  • + {% assign date = post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign title = post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} + {% assign url = post.url | relative_url | uri_escape %} + + {{ title }} + () +
    • + {% endfor %} +
+ +{% assign date = "" %} +{% assign title = "" %} +{% assign url = "" %} diff --git a/_pages/index.html b/_pages/index.html index 2c09cfb..71414c7 100644 --- a/_pages/index.html +++ b/_pages/index.html @@ -4,26 +4,6 @@ permalink: "index.html" title: "" --- -{% assign postsByYear = site.posts | group_by_exp: "post", "post.date | date: '%Y'" %} - -{% for year in postsByYear %} -
-

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

- - -
-{% endfor %} +{% include contacts.html %} +{% include links.html %} +{% include posts.html %} -- cgit v1.2.3 From a4251a91b44c44bb9f3586f206b8dabaf03f3fdd Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 19:55:11 +0400 Subject: Updated the header on the posts page Signed-off-by: Valentin Popov --- _layouts/post.html | 27 ++++++++++++++++----------- _scss/base/_main.scss | 1 - _scss/components/_header.scss | 9 --------- 3 files changed, 16 insertions(+), 21 deletions(-) delete mode 100644 _scss/components/_header.scss diff --git a/_layouts/post.html b/_layouts/post.html index 8270973..9e0a766 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,20 +2,25 @@ layout: default --- +{% assign date = page.date | date: '%Y-%m-%d' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} +{% assign title = site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape %} + + +{% assign date = "" %} +{% assign title = "" %} diff --git a/_scss/base/_main.scss b/_scss/base/_main.scss index 8e9bc80..810b2d4 100644 --- a/_scss/base/_main.scss +++ b/_scss/base/_main.scss @@ -1,2 +1 @@ @import 'components/core'; -@import 'components/header'; diff --git a/_scss/components/_header.scss b/_scss/components/_header.scss deleted file mode 100644 index c5b95b8..0000000 --- a/_scss/components/_header.scss +++ /dev/null @@ -1,9 +0,0 @@ -header { - border-bottom: 1px solid $color-bg-alt; -} - -article { - header { - padding-bottom: 16px; - } -} -- cgit v1.2.3 From 8184c9403408ec66c19cdee80d55d9db7ecf87c7 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 19:55:21 +0400 Subject: Updated config file Signed-off-by: Valentin Popov --- _config.yml | 58 ++++++++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/_config.yml b/_config.yml index 7d66f5b..c4e0be3 100644 --- a/_config.yml +++ b/_config.yml @@ -1,69 +1,67 @@ # Permalinks -permalink: '/:year/:month/:day/:title' +permalink: "/:year/:month/:day/:title" # Time Zone -timezone: 'Europe/Samara' +timezone: "Europe/Samara" # Catalogs include: - - '_pages' + - "_pages" # Parsers -highlighter: rouge -markdown: kramdown +highlighter: "rouge" +markdown: "kramdown" # Markdown kramdown: - input: GFM + input: "GFM" hard_wrap: false - syntax_highlighter: rouge + syntax_highlighter: "rouge" # SASS/SCSS sass: - sass_dir: '_scss' - style: ':compressed' + sass_dir: "_scss" + style: ":compressed" # AutoPrefixer autoprefixer: browsers: - - '> 1%' - - 'last 10 versions' + - "> 1%" + - "last 10 versions" # Compress HTML compress_html: blanklines: false - clippings: all - comments: [''] + clippings: "all" + comments: [""] endings: [] profile: false startings: [] # Website address -url: 'https://valentineus.link' -baseurl: '' +url: "https://valentineus.link" +baseurl: "" # Site description -title: 'Personal blog' -description: 'Full-Stack Web Developer.' -avatar: 'https://www.gravatar.com/avatar/989fb5288ac482414a6d13acc329cc38?s=148' -repos: 'https://github.com/valentineus/valentineus.github.io' -rss: '/atom.xml' -lang: 'ru' +title: "My homepage" +description: "I'm Full-Stack Web Developer" +rss: "/atom.xml" +lang: "ru" # About the author author: - email: 'info@valentineus.link' - name: 'Valentin Popov' - url: 'https://valentineus.link' + email: "info@valentineus.link" + name: "Valentin Popov" + url: "https://valentineus.link" # Plugins plugins: - - 'octopress-autoprefixer' + - "octopress-autoprefixer" # Exceptions exclude: - - '.*' - - 'Gemfile' - - 'Gemfile.lock' - - 'LICENSE.txt' - - 'README.md' + - ".*" + - "Gemfile" + - "Gemfile.lock" + - "LICENSE.txt" + - "README.md" -- cgit v1.2.3 From 28aec1dfdd90b7ffdd11321895ac37c0c2ab6fc6 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 20:08:52 +0400 Subject: Deleted variable declaration Signed-off-by: Valentin Popov --- _includes/contacts.html | 12 ++---------- _includes/head.html | 16 ++++++---------- _includes/links.html | 12 ++---------- _includes/posts.html | 12 ++---------- _layouts/page.html | 2 +- _layouts/post.html | 12 +++--------- 6 files changed, 16 insertions(+), 50 deletions(-) diff --git a/_includes/contacts.html b/_includes/contacts.html index 06df563..1389c30 100644 --- a/_includes/contacts.html +++ b/_includes/contacts.html @@ -3,17 +3,9 @@
    {% for contact in site.data.contacts %}
  • - {% assign description = contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} - - {{ title }} + {{ contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} — - {{ description }} + {{ contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
    • {% endfor %}
- -{% assign description = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_includes/head.html b/_includes/head.html index 9078aad..aa6fb4f 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -1,6 +1,3 @@ -{% assign description = page.description | default: site.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} -{% assign title = page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - @@ -11,21 +8,20 @@ {% for tag in site.data.meta_tags %} - + {% endfor %} - - + + - - - {{ title }} + + + {{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} diff --git a/_includes/links.html b/_includes/links.html index d301161..e7a2801 100644 --- a/_includes/links.html +++ b/_includes/links.html @@ -3,17 +3,9 @@
    {% for link in site.data.links %}
  • - {% assign description = link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %} - - {{ title }} + {{ link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} — - {{ description }} + {{ link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
    • {% endfor %}
- -{% assign description = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_includes/posts.html b/_includes/posts.html index 6dc0d2b..fee0c31 100644 --- a/_includes/posts.html +++ b/_includes/posts.html @@ -3,16 +3,8 @@
    {% for post in site.posts %}
  • - {% assign date = post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign title = post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} - {% assign url = post.url | relative_url | uri_escape %} - - {{ title }} - () + {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + ()
    • {% endfor %}
- -{% assign date = "" %} -{% assign title = "" %} -{% assign url = "" %} diff --git a/_layouts/page.html b/_layouts/page.html index 01d6fcd..28cdb0f 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,7 +4,7 @@ layout: default
-

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

+

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

{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 9e0a766..7731828 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -2,25 +2,19 @@ layout: default --- -{% assign date = page.date | date: '%Y-%m-%d' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %} -{% assign title = site.title | strip_newlines | strip_html| strip | normalize_whitespace | smartify | xml_escape %} - - -{% assign date = "" %} -{% assign title = "" %} -- cgit v1.2.3 From 11c402a2938935111fc6c82f53b720eb71e355c7 Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Thu, 23 Jan 2020 20:21:21 +0400 Subject: Simplified data generation code Signed-off-by: Valentin Popov --- _includes/contacts.html | 4 ++-- _includes/head.html | 12 ++++++------ _includes/links.html | 4 ++-- _includes/posts.html | 4 ++-- _layouts/default.html | 2 +- _layouts/page.html | 2 +- _layouts/post.html | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/_includes/contacts.html b/_includes/contacts.html index 1389c30..6a9cef4 100644 --- a/_includes/contacts.html +++ b/_includes/contacts.html @@ -3,9 +3,9 @@ diff --git a/_includes/head.html b/_includes/head.html index aa6fb4f..e7fe582 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,20 +8,20 @@ {% for tag in site.data.meta_tags %} - + {% endfor %} - - + + - - - {{ page.title | default: site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + + + {{ page.title | default: site.title | strip | normalize_whitespace | xml_escape }} diff --git a/_includes/links.html b/_includes/links.html index e7a2801..8d40d6d 100644 --- a/_includes/links.html +++ b/_includes/links.html @@ -3,9 +3,9 @@ diff --git a/_includes/posts.html b/_includes/posts.html index fee0c31..4638c9b 100644 --- a/_includes/posts.html +++ b/_includes/posts.html @@ -3,8 +3,8 @@ diff --git a/_layouts/default.html b/_layouts/default.html index ee363a2..cabcd0b 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@ layout: compress --- - + {% include head.html %} diff --git a/_layouts/page.html b/_layouts/page.html index 28cdb0f..32c9b9f 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -4,7 +4,7 @@ layout: default
-

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

+

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

{{ content }} diff --git a/_layouts/post.html b/_layouts/post.html index 7731828..edbc5b7 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -5,15 +5,15 @@ layout: default
Published - + on - {{ site.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }} + {{ site.title | strip | normalize_whitespace | xml_escape }} | Permalink
-

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

+

{{ site.title | strip | normalize_whitespace | xml_escape }}

{{ content }} -- cgit v1.2.3