diff --git a/.gitignore b/.gitignore index c8067b3..c7063b5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,7 @@ /resources/* # ignored files -deploy -git-deploy +deploy.sh .directory # not ignored directories diff --git a/assets/_default/list.scss b/assets/_default/list.scss index 1621d73..9a4a6b4 100644 --- a/assets/_default/list.scss +++ b/assets/_default/list.scss @@ -11,53 +11,53 @@ header { } .section-articles { - margin: 20px 0; display: grid; - grid-template-columns: repeat(2, 1fr); grid-gap: 1rem; + grid-template-columns: repeat(2, 1fr); + margin: 20px 0; a { color: rgb(255, 255, 255); text-decoration: none; } article { background: rgb(60, 60, 90); - color: rgb(255, 255, 255); - padding: 20px; + border: 1px solid rgb(60, 60, 90); border-radius: 5px; + color: rgb(255, 255, 255); display: flex; flex-flow: column; height: max-content; + padding: 20px; transition: background .2s; - border: 1px solid rgb(60, 60, 90); + &:hover { + background: rgb(70, 70, 105); + } img { - order: -1; - max-width: calc(100% + 40px); + background: rgb(80, 80, 120); border-radius: 5px 5px 0px 0px; margin: -20px -20px 20px -20px; - background: rgb(80, 80, 120); - object-fit: cover; max-height: 250px; + max-width: calc(100% + 40px); + object-fit: cover; + order: -1; } h1 { margin-top: 0px; } a { color: rgb(255, 255, 255); - } - a:hover { - text-decoration: underline; + &:hover { + text-decoration: underline; + } } .meta { margin: 0; } .author { - font-style: italic; color: rgb(200, 200, 230); + font-style: italic; } } - article:hover { - background: rgb(70, 70, 105); - } } @media (max-width: 600px) { .section-articles { diff --git a/assets/_default/single.scss b/assets/_default/single.scss index 6d4aad3..2dc5a14 100644 --- a/assets/_default/single.scss +++ b/assets/_default/single.scss @@ -3,8 +3,8 @@ .section-article { article { - max-width: 720px; margin: 80px auto; + max-width: 720px; .meta { color: rgb(180, 180, 220); } @@ -13,18 +13,18 @@ margin-top: 20px; } img { - max-width: 100%; - margin-bottom: 15px; - border-radius: 5px; border: 1px solid rgb(60, 60, 90); + border-radius: 5px; + margin-bottom: 15px; + max-width: 100%; } a { background: rgb(60, 60, 90); + border-radius: 5px; color: rgb(240, 240, 250); - transition: background .2s, color .2s; margin: -5px 0; padding: 5px 5px; - border-radius: 5px; + transition: background .2s, color .2s; &:hover { background: rgb(255, 130, 130); color: rgb(255, 255, 255); @@ -41,8 +41,8 @@ li { a { color: rgb(180, 180, 220); - padding: 10px; margin-left: 10px; + padding: 10px; &:hover { background: rgb(70, 70, 105); } @@ -54,38 +54,38 @@ } .section-articles { - margin: 20px auto -50px auto; display: grid; grid-template-columns: repeat(2, 1fr); grid-gap: 1rem; + margin: 20px auto -50px auto; max-width: 720px; + &::after { + background: rgb(50, 50, 75); + content: ''; + height: 210px; + left: 0; + position: absolute; + width: 100vw; + z-index: -10; + } article { - color: rgb(255, 255, 255); - margin: 20px 0; border-radius: 5px; + color: rgb(255, 255, 255); display: flex; flex-flow: column; height: max-content; + margin: 20px 0; transition: background .2s; a { margin: 10px 0; - } - a:hover { - text-decoration: underline; + &:hover { + text-decoration: underline; + } } } .previous-article { text-align: right; } } -.section-articles::after { - content: ''; - position: absolute; - width: 100vw; - background: rgb(50, 50, 75); - height: 230px; - left: 0; - z-index: -10; -} @import '../partials/footer'; diff --git a/assets/errorpages.scss b/assets/errorpages.scss index dc77a36..2c66b94 100644 --- a/assets/errorpages.scss +++ b/assets/errorpages.scss @@ -2,8 +2,8 @@ @import 'partials/nav'; header { - text-align: center; margin: 150px 0; + text-align: center; h1 { font-size: 2em; } diff --git a/assets/index.scss b/assets/index.scss index f26e564..3f27f38 100644 --- a/assets/index.scss +++ b/assets/index.scss @@ -2,59 +2,59 @@ @import 'partials/nav'; header { - text-align: center; margin: 100px 0; + text-align: center; h1 { font-size: 2em; } } .section-articles { - margin: 20px 0; display: grid; grid-template-columns: repeat(2, 1fr); grid-gap: 1rem; + margin: 20px 0; a { color: rgb(255, 255, 255); text-decoration: none; } article { background: rgb(60, 60, 90); - color: rgb(255, 255, 255); - padding: 20px; + border: 1px solid rgb(60, 60, 90); border-radius: 5px; + color: rgb(255, 255, 255); display: grid; - height: max-content; - grid-template-columns: 120px 1fr; grid-template-areas: "img h1" "img p"; + grid-template-columns: 120px 1fr; + height: max-content; + padding: 20px; transition: background .2s; - border: 1px solid rgb(60, 60, 90); + &:hover { + background: rgb(70, 70, 105); + } img { - object-fit: cover; - height: 180px; - width: 120px; - border-radius: 5px 0px 0px 5px; border: 0px solid rgb(40, 40, 60); + border-radius: 5px 0px 0px 5px; grid-area: img; + height: 180px; margin: -20px; + object-fit: cover; + width: 120px; } h1 { - margin: 0px; grid-area: h1; + margin: 0px; } .meta { - margin: 0; grid-area: p; + margin: 0; } .author { - font-style: italic; color: rgb(200, 200, 230); + font-style: italic; } } - article:hover { - background: rgb(70, 70, 105); - } } @media (max-width: 900px) { .section-articles { @@ -63,32 +63,35 @@ header { } .section-projects { - margin: 20px 0; display: grid; - grid-template-columns: repeat(3, 1fr); grid-gap: 1rem; + grid-template-columns: repeat(3, 1fr); + margin: 20px 0; a { color: rgb(255, 255, 255); text-decoration: none; } article { background: rgb(60, 60, 90); - color: rgb(255, 255, 255); - padding: 20px; + border: 1px solid rgb(60, 60, 90); border-radius: 5px; + color: rgb(255, 255, 255); display: flex; flex-flow: column; height: max-content; + padding: 20px; transition: background .2s; - border: 1px solid rgb(60, 60, 90); + &:hover { + background: rgb(70, 70, 105); + } img { - order: -1; - max-width: calc(100% + 40px); + background: rgb(80, 80, 120); border-radius: 5px 5px 0px 0px; margin: -20px -20px 20px -20px; - background: rgb(80, 80, 120); - object-fit: cover; max-height: 170px; + max-width: calc(100% + 40px); + object-fit: cover; + order: -1; } h1 { margin-top: 0; @@ -97,13 +100,10 @@ header { margin: 0; } .status { - font-style: italic; color: rgb(200, 200, 230); + font-style: italic; } } - article:hover { - background: rgb(70, 70, 105); - } } @media (max-width: 900px) { .section-projects { diff --git a/assets/partials/_footer.scss b/assets/partials/_footer.scss index 0d7a3a4..8562d68 100644 --- a/assets/partials/_footer.scss +++ b/assets/partials/_footer.scss @@ -2,11 +2,21 @@ footer { background: rgb(30, 30, 45); color: rgb(200, 200, 230); margin-top: 100px; - white-space: nowrap; overflow-x: auto; + overflow-y: hidden; + white-space: nowrap; + &::after { + background: rgb(30, 30, 45); + content: ''; + height: 10000px; + overflow: hidden; + position: fixed; + width: 100vw; + } .container { - display: flex; align-items: center; + display: flex; + height: 64px; .website-subnav { margin-left: auto; ul { @@ -15,7 +25,7 @@ footer { } li { list-style-type: none; - padding: 10px 0 10px 30px; + padding: 4px 0 4px 30px; } a { color: rgb(200, 200, 230); @@ -23,14 +33,6 @@ footer { } } } -footer::after { - content: ''; - background: rgb(30, 30, 45); - position: fixed; - height: 10000px; - width: 100vw; - overflow: hidden; -} @media (max-width: 600px) { footer { @@ -42,7 +44,7 @@ footer::after { } .website-subnav { li { - padding: 10px 30px 10px 0; + padding: 4px 30px 4px 0; } } } diff --git a/assets/partials/_main.scss b/assets/partials/_main.scss index 14767a0..f6c1350 100644 --- a/assets/partials/_main.scss +++ b/assets/partials/_main.scss @@ -1,23 +1,19 @@ * { box-sizing: border-box; } -@font-face { - font-family: PoppinsLatin; - src: url(/fonts/PoppinsLatin-Regular.otf); -} html { - scrollbar-width: thin; scrollbar-color: rgb(255, 130, 130) rgb(60, 60, 90); + scrollbar-width: thin; overflow-x: hidden; overflow-y: scroll; } body { background: rgb(40, 40, 60); color: rgb(240, 240, 255); - margin: 0; - font-family: PoppinsLatin, Monaco, Lucida Console, monospace; - font-display: block; display: grid; + font-family: monospace, 'Lucida Console', 'Monaco'; + line-height: 1.8; + margin: 0; } a { color: rgb(255, 130, 130); @@ -28,9 +24,9 @@ a { } .container { - width: calc(100% - 40px); - max-width: 1140px; margin: 0 auto; + max-width: 1140px; + width: calc(100% - 40px); } main { diff --git a/assets/partials/_nav.scss b/assets/partials/_nav.scss index 4f72d77..ca6fbcd 100644 --- a/assets/partials/_nav.scss +++ b/assets/partials/_nav.scss @@ -1,43 +1,45 @@ nav { background: rgb(60, 60, 90); - white-space: nowrap; overflow-x: auto; + overflow-y: hidden; + white-space: nowrap; .container { - display: flex; align-items: center; + display: flex; + height: 64px; .website-name { a { color: rgb(245, 245, 245); - text-decoration: none; - padding: 20px 30px; display: block; + padding: 20px 30px; + text-decoration: none; transition: background .2s; - } - a:hover { - background: rgb(50, 50, 75); + &:hover { + background: rgb(50, 50, 75); + } } } .website-nav { margin-left: auto; ul { display: flex; - padding: 0; margin: 0; + padding: 0; li { list-style-type: none; a { color: rgb(245, 245, 245); - text-decoration: none; - padding: 20px 30px; display: block; + text-decoration: none; transition: background .2s; - } - a:hover { - background: rgb(50, 50, 75); + padding: 20px 30px; + &:hover { + background: rgb(50, 50, 75); + } } .seperator { - padding: 20px 10px; display: block; + padding: 20px 10px; } } } diff --git a/assets/projects/list.scss b/assets/projects/list.scss index b9eb88f..2457053 100644 --- a/assets/projects/list.scss +++ b/assets/projects/list.scss @@ -2,41 +2,44 @@ @import '../partials/nav'; header { - text-align: center; margin: 100px 0; + text-align: center; h1 { font-size: 2em; } } .section-articles { - margin: 20px 0; display: grid; - grid-template-columns: repeat(3, 1fr); grid-gap: 1rem; + grid-template-columns: repeat(3, 1fr); + margin: 20px 0; a { color: rgb(255, 255, 255); text-decoration: none; } article { background: rgb(60, 60, 90); - color: rgb(255, 255, 255); - padding: 20px; + border: 1px solid rgb(60, 60, 90); border-radius: 5px; + color: rgb(255, 255, 255); display: flex; flex-flow: column; - max-width: 562px; height: max-content; + max-width: 562px; + padding: 20px; transition: background .2s; - border: 1px solid rgb(60, 60, 90); + &:hover { + background: rgb(70, 70, 105); + } img { - order: -1; - max-width: calc(100% + 40px); + background: rgb(80, 80, 120); border-radius: 5px 5px 0px 0px; margin: -20px -20px 20px -20px; - background: rgb(80, 80, 120); - object-fit: cover; max-height: 170px; + max-width: calc(100% + 40px); + object-fit: cover; + order: -1; } h1 { margin-top: 0; @@ -45,13 +48,10 @@ header { margin: 0; } .status { - font-style: italic; color: rgb(200, 200, 230); + font-style: italic; } } - article:hover { - background: rgb(70, 70, 105); - } } @media (max-width: 900px) { .section-articles { diff --git a/static/fonts/OFL.txt b/static/fonts/OFL.txt deleted file mode 100644 index 9f5f77d..0000000 --- a/static/fonts/OFL.txt +++ /dev/null @@ -1,94 +0,0 @@ -Copyright 2014-2019 Indian Type Foundry (info@indiantypefoundry.com) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. - diff --git a/static/fonts/PoppinsLatin-Regular.otf b/static/fonts/PoppinsLatin-Regular.otf deleted file mode 100644 index 7a1156b..0000000 Binary files a/static/fonts/PoppinsLatin-Regular.otf and /dev/null differ