From 1c0aebd73801309d4be4cca4a708c7d6fe7e46a5 Mon Sep 17 00:00:00 2001 From: Vrifox Date: Tue, 3 Nov 2020 20:22:08 +0100 Subject: [PATCH] update --- .gitignore | 1 + assets/_default/list.scss | 7 +-- assets/_default/single.scss | 10 ++--- assets/errorpages.scss | 8 ++-- assets/import/colors.scss | 17 +++++++ .../_footer.scss => import/footer.scss} | 0 .../{partials/_main.scss => import/main.scss} | 0 .../{partials/_nav.scss => import/nav.scss} | 0 .../_syntax.scss => import/syntax.scss} | 0 assets/index.scss | 44 +++++++++---------- assets/projects/list.scss | 8 ++-- 11 files changed, 57 insertions(+), 38 deletions(-) create mode 100644 assets/import/colors.scss rename assets/{partials/_footer.scss => import/footer.scss} (100%) rename assets/{partials/_main.scss => import/main.scss} (100%) rename assets/{partials/_nav.scss => import/nav.scss} (100%) rename assets/{partials/_syntax.scss => import/syntax.scss} (100%) diff --git a/.gitignore b/.gitignore index 53d9a19..423409b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ # ignored files deploy.sh .directory +*.kate-swp # not ignored directories !/content/errorpages/ diff --git a/assets/_default/list.scss b/assets/_default/list.scss index 9776a61..3e0741d 100644 --- a/assets/_default/list.scss +++ b/assets/_default/list.scss @@ -1,6 +1,7 @@ -@import '../partials/main'; -@import '../partials/nav'; -@import '../partials/footer'; +@import '../import/colors.scss'; +@import '../import/main.scss'; +@import '../import/nav.scss'; +@import '../import/footer.scss'; .section.header { align-items: center; diff --git a/assets/_default/single.scss b/assets/_default/single.scss index f051b97..da75d93 100644 --- a/assets/_default/single.scss +++ b/assets/_default/single.scss @@ -1,6 +1,8 @@ -@import '../partials/main'; -@import '../partials/nav'; -@import '../partials/syntax'; +@import '../import/colors.scss'; +@import '../import/syntax.scss'; +@import '../import/main.scss'; +@import '../import/nav.scss'; +@import '../import/footer.scss'; .section-article { article { @@ -113,5 +115,3 @@ } } } - -@import '../partials/footer'; diff --git a/assets/errorpages.scss b/assets/errorpages.scss index 2c66b94..b78041b 100644 --- a/assets/errorpages.scss +++ b/assets/errorpages.scss @@ -1,5 +1,7 @@ -@import 'partials/main'; -@import 'partials/nav'; +@import 'import/colors.scss'; +@import 'import/main.scss'; +@import 'import/nav.scss'; +@import 'import/footer'; header { margin: 150px 0; @@ -8,5 +10,3 @@ header { font-size: 2em; } } - -@import 'partials/footer'; diff --git a/assets/import/colors.scss b/assets/import/colors.scss new file mode 100644 index 0000000..4b615d6 --- /dev/null +++ b/assets/import/colors.scss @@ -0,0 +1,17 @@ +$green: rgb(100, 200, 130); +$green-dark: rgb(80, 180, 110); +$green-light: rgb(100, 220, 150); +$red: rgb(255, 130, 130); +$red-dark: rgb(235, 110, 110); +$red-light: rgb(255, 150, 150); +$white: rgb(245, 245, 255); +$white-dark: rgb(215, 215, 225); +$white-light: rgb(255, 255, 255); +$white-disabled: rgb(150, 150, 160); + +$bg30: rgb(30, 30, 45); +$bg40: rgb(40, 40, 60); +$bg50: rgb(50, 50, 75); +$bg60: rgb(60, 60, 90); +$bg70: rgb(70, 70, 105); +$bg80: rgb(80, 80, 120); diff --git a/assets/partials/_footer.scss b/assets/import/footer.scss similarity index 100% rename from assets/partials/_footer.scss rename to assets/import/footer.scss diff --git a/assets/partials/_main.scss b/assets/import/main.scss similarity index 100% rename from assets/partials/_main.scss rename to assets/import/main.scss diff --git a/assets/partials/_nav.scss b/assets/import/nav.scss similarity index 100% rename from assets/partials/_nav.scss rename to assets/import/nav.scss diff --git a/assets/partials/_syntax.scss b/assets/import/syntax.scss similarity index 100% rename from assets/partials/_syntax.scss rename to assets/import/syntax.scss diff --git a/assets/index.scss b/assets/index.scss index b7b95c7..eb017dc 100644 --- a/assets/index.scss +++ b/assets/index.scss @@ -1,9 +1,11 @@ -@import 'partials/main'; -@import 'partials/nav'; +@import 'import/colors.scss'; +@import 'import/main.scss'; +@import 'import/nav.scss'; +@import 'import/footer.scss'; .section.header { align-items: center; - background: rgb(70, 70, 105); + background: $bg70; display: flex; height: 150px; margin: 0 0 40px 0; @@ -17,15 +19,15 @@ } .section-header { - color: rgb(215, 215, 225); + color: $white-dark; font-size: 1.5em; a { border-bottom: 2px solid; - color: rgb(245, 245, 255); + color: $white; font-weight: bold; transition: border .2s, color .2s; &:hover { - color: rgb(255, 130, 130); + color: $red; text-decoration: none; } } @@ -37,24 +39,24 @@ grid-gap: 1rem; margin: 20px 0; a { - color: rgb(255, 255, 255); + color: $white-light; text-decoration: none; } article { - background: rgb(60, 60, 90); - border: 1px solid rgb(60, 60, 90); + background: $bg60; + border: 1px solid $bg60; border-radius: 5px; - color: rgb(255, 255, 255); + color: $white; display: flex; flex-flow: column; height: max-content; padding: 20px; transition: background .2s; &:hover { - background: rgb(70, 70, 105); + background: $bg70; } img { - background: rgb(80, 80, 120); + background: $bg80; border-radius: 5px 5px 0px 0px; margin: -20px -20px 15px -20px; max-height: 250px; @@ -72,7 +74,7 @@ margin: 0; } .author { - color: rgb(200, 200, 230); + color: $white-dark; font-style: italic; } } @@ -89,24 +91,24 @@ grid-template-columns: repeat(3, 1fr); margin: 20px 0; a { - color: rgb(255, 255, 255); + color: $white-light; text-decoration: none; } article { - background: rgb(60, 60, 90); - border: 1px solid rgb(60, 60, 90); + background: $bg60; + border: 1px solid $bg60; border-radius: 5px; - color: rgb(255, 255, 255); + color: $white-light; display: flex; flex-flow: column; height: max-content; padding: 20px; transition: background .2s; &:hover { - background: rgb(70, 70, 105); + background: $bg70; } img { - background: rgb(80, 80, 120); + background: $bg80; border-radius: 5px 5px 0px 0px; margin: -20px -20px 10px -20px; max-height: 170px; @@ -124,7 +126,7 @@ margin: 0; } .status { - color: rgb(215, 215, 225); + color: $white-dark; font-style: italic; } } @@ -139,5 +141,3 @@ grid-template-columns: repeat(1, 1fr); } } - -@import 'partials/footer'; diff --git a/assets/projects/list.scss b/assets/projects/list.scss index 7a73f8e..d2266f7 100644 --- a/assets/projects/list.scss +++ b/assets/projects/list.scss @@ -1,5 +1,7 @@ -@import '../partials/main'; -@import '../partials/nav'; +@import '../import/colors.scss'; +@import '../import/main.scss'; +@import '../import/nav.scss'; +@import '../import/footer.scss'; .section.header { align-items: center; @@ -73,5 +75,3 @@ grid-template-columns: repeat(1, 1fr); } } - -@import '../partials/footer';