From 19b9bae0ee7216b272a07a31ce0d3b21ffbcb87d Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Sun, 8 Dec 2019 17:45:22 +0100 Subject: [PATCH] Use Kiste --- README.md | 1 + assets/css/_mobile.scss | 11 - assets/css/_variables.scss | 9 - assets/css/elements/_all.scss | 4 - assets/css/elements/content.scss | 11 - assets/css/elements/heading.scss | 28 -- assets/css/elements/link.scss | 13 - assets/css/elements/paragraph.scss | 7 - assets/css/global.scss | 32 -- assets/global.scss | 3 + assets/js/footer.js | 4 - components/AnimatedLogo.vue | 6 +- components/ExternalLink.vue | 42 -- components/GButton.vue | 117 ------ components/NavigationBar.vue | 290 ------------- components/pages/projects/GProject.vue | 33 +- layouts/default.vue | 53 +-- layouts/none.vue | 9 +- nuxt.config.js | 31 +- package.json | 1 + pages/index.vue | 50 +-- pages/legal-notice.vue | 132 +++--- pages/privacy-policy.vue | 548 +++++++++++++------------ pages/projects.vue | 66 +-- yarn.lock | 32 +- 25 files changed, 479 insertions(+), 1054 deletions(-) delete mode 100644 assets/css/_mobile.scss delete mode 100644 assets/css/_variables.scss delete mode 100644 assets/css/elements/_all.scss delete mode 100644 assets/css/elements/content.scss delete mode 100644 assets/css/elements/heading.scss delete mode 100644 assets/css/elements/link.scss delete mode 100644 assets/css/elements/paragraph.scss delete mode 100644 assets/css/global.scss create mode 100644 assets/global.scss delete mode 100644 assets/js/footer.js delete mode 100644 components/ExternalLink.vue delete mode 100644 components/GButton.vue delete mode 100644 components/NavigationBar.vue diff --git a/README.md b/README.md index d5bb4a0..4c0bf85 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # moritz-ruth.de + > The official website of Moritz Ruth ## Build Setup diff --git a/assets/css/_mobile.scss b/assets/css/_mobile.scss deleted file mode 100644 index 440099a..0000000 --- a/assets/css/_mobile.scss +++ /dev/null @@ -1,11 +0,0 @@ -@mixin mobile() { - @media (max-width: 800px) { - @content; - } -} - -@mixin notMobile() { - @media (min-width: 801px) { - @content; - } -} diff --git a/assets/css/_variables.scss b/assets/css/_variables.scss deleted file mode 100644 index 2702cb5..0000000 --- a/assets/css/_variables.scss +++ /dev/null @@ -1,9 +0,0 @@ -$content-width: 1000px; -$content-padding: 20px; -$small-gutter: 10px; - -$black-brighter: #0e0e0e; - -$blue: #3695d8; -$on-blue: black; -$blue-darker: #3289c7; diff --git a/assets/css/elements/_all.scss b/assets/css/elements/_all.scss deleted file mode 100644 index a848541..0000000 --- a/assets/css/elements/_all.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import "content"; -@import "link"; -@import "heading"; -@import "paragraph"; diff --git a/assets/css/elements/content.scss b/assets/css/elements/content.scss deleted file mode 100644 index 2beba31..0000000 --- a/assets/css/elements/content.scss +++ /dev/null @@ -1,11 +0,0 @@ -@import "../variables"; - -.content { - width: $content-width; - margin: 0 auto; - - @media (max-width: #{$content-width + $content-padding * 2}) { - width: 100%; - padding: 0 #{$content-padding}; - } -} diff --git a/assets/css/elements/heading.scss b/assets/css/elements/heading.scss deleted file mode 100644 index 850f405..0000000 --- a/assets/css/elements/heading.scss +++ /dev/null @@ -1,28 +0,0 @@ -.heading--1, .heading--2, .heading--3, .heading--4, .heading--5, .heading--6 { - margin-top: 1rem; - margin-bottom: 1rem; -} - -.heading--1 { - font-size: 3.8rem; -} - -.heading--2 { - font-size: 3rem; -} - -.heading--3 { - font-size: 2.6rem; -} - -.heading--4 { - font-size: 2.2rem; -} - -.heading--5 { - font-size: 1.8rem; -} - -.heading--6 { - font-size: 1.4rem; -} diff --git a/assets/css/elements/link.scss b/assets/css/elements/link.scss deleted file mode 100644 index e71485d..0000000 --- a/assets/css/elements/link.scss +++ /dev/null @@ -1,13 +0,0 @@ -@import "../variables"; - -.link { - color: $blue; - text-decoration: none; - - transition: 100ms linear opacity; - opacity: 1; - - &:hover { - opacity: 0.8; - } -} diff --git a/assets/css/elements/paragraph.scss b/assets/css/elements/paragraph.scss deleted file mode 100644 index 8de6b89..0000000 --- a/assets/css/elements/paragraph.scss +++ /dev/null @@ -1,7 +0,0 @@ -.paragraph { - margin: 20px 0; - - li { - margin-left: 20px; - } -} diff --git a/assets/css/global.scss b/assets/css/global.scss deleted file mode 100644 index 75c9e83..0000000 --- a/assets/css/global.scss +++ /dev/null @@ -1,32 +0,0 @@ -@import "elements/_all"; - -@import "mobile"; - -:root { - --navbar-height: 100px; - - @include mobile { - --navbar-height: 80px; - } -} - -*, ::before, ::after { - box-sizing: border-box; - margin: 0; - padding: 0; -} - -body { - font-family: "Alata", sans-serif; - font-size: 16px; -} - -html, body, #__nuxt, #__layout, .fill-screen { - max-width: 100vw; - min-height: 100vh; - overflow-x: auto; -} - -::selection { - background-color: #dddddd; -} diff --git a/assets/global.scss b/assets/global.scss new file mode 100644 index 0000000..1eb2785 --- /dev/null +++ b/assets/global.scss @@ -0,0 +1,3 @@ +body { + font-family: "Alata", sans-serif; +} diff --git a/assets/js/footer.js b/assets/js/footer.js deleted file mode 100644 index 9bd2ab7..0000000 --- a/assets/js/footer.js +++ /dev/null @@ -1,4 +0,0 @@ -export const footer = Object.freeze([ - { label: "Legal Notice", to: "/legal-notice" }, - { label: "Privacy Policy", to: "/privacy-policy" } -]); diff --git a/components/AnimatedLogo.vue b/components/AnimatedLogo.vue index a940ca8..63cc043 100644 --- a/components/AnimatedLogo.vue +++ b/components/AnimatedLogo.vue @@ -7,6 +7,8 @@ diff --git a/components/ExternalLink.vue b/components/ExternalLink.vue deleted file mode 100644 index 8bab975..0000000 --- a/components/ExternalLink.vue +++ /dev/null @@ -1,42 +0,0 @@ - - - - - diff --git a/components/GButton.vue b/components/GButton.vue deleted file mode 100644 index e9dc087..0000000 --- a/components/GButton.vue +++ /dev/null @@ -1,117 +0,0 @@ - - - diff --git a/components/NavigationBar.vue b/components/NavigationBar.vue deleted file mode 100644 index 0497c9d..0000000 --- a/components/NavigationBar.vue +++ /dev/null @@ -1,290 +0,0 @@ - - - - - diff --git a/components/pages/projects/GProject.vue b/components/pages/projects/GProject.vue index 00103e2..ab86d85 100644 --- a/components/pages/projects/GProject.vue +++ b/components/pages/projects/GProject.vue @@ -8,32 +8,30 @@
-
- +
+ Open - - + + GitHub - - + + NPM - +
diff --git a/layouts/none.vue b/layouts/none.vue index 366bec2..dfbf1e6 100644 --- a/layouts/none.vue +++ b/layouts/none.vue @@ -1,5 +1,7 @@ diff --git a/nuxt.config.js b/nuxt.config.js index 5674027..253bc95 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -17,7 +17,7 @@ export default { ** Global CSS */ css: [ - "@/assets/css/global.scss" + "@/assets/global.scss" ], /* ** Plugins to load before mounting the App @@ -30,7 +30,8 @@ export default { */ buildModules: [ // Doc: https://github.com/nuxt-community/eslint-module - "@nuxtjs/eslint-module" + "@nuxtjs/eslint-module", + "kiste/nuxt" ], /* ** Nuxt.js modules @@ -40,6 +41,32 @@ export default { "@nuxtjs/pwa" ], + kiste: { + theme: { + contentPadding: "10px" + }, + navigationItems: [ + { + label: "Home", + to: "/" + }, + { + label: "Projects", + to: "/projects" + } + ], + footerItems: [ + { + label: "Legal Notice", + to: "/legal-notice" + }, + { + label: "Privacy Policy", + to: "/privacy-policy" + } + ] + }, + // https://pwa.nuxtjs.org/modules/workbox.html workbox: { workboxExtensions: [ diff --git a/package.json b/package.json index 006bd7e..072c235 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "eslint-plugin-nuxt": ">=0.4.2", "eslint-plugin-vue": "^6.0.1", "fibers": "^4.0.2", + "kiste": "^1.2.0", "sass": "^1.23.7", "sass-loader": "^8.0.0", "serve": "^11.2.0", diff --git a/pages/index.vue b/pages/index.vue index f05ccea..8fb09ce 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,6 +1,6 @@ diff --git a/pages/legal-notice.vue b/pages/legal-notice.vue index 2c1f4d6..e128eaa 100644 --- a/pages/legal-notice.vue +++ b/pages/legal-notice.vue @@ -1,79 +1,77 @@ - - diff --git a/yarn.lock b/yarn.lock index 1d6f7a9..2338bbb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2043,6 +2043,13 @@ chownr@^1.1.1, chownr@^1.1.2: resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== +chroma-js@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/chroma-js/-/chroma-js-2.1.0.tgz#c0be48a21fe797ef8965608c1c4f911ef2da49d5" + integrity sha512-uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg== + dependencies: + cross-env "^6.0.3" + chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -2434,6 +2441,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: safe-buffer "^5.0.1" sha.js "^2.4.8" +cross-env@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-6.0.3.tgz#4256b71e49b3a40637a0ce70768a6ef5c72ae941" + integrity sha512-+KqxF6LCvfhWvADcDPqo64yVIB31gv/jQulX2NGzKS/g3GEVz6/pt4wjHFtFWsHMddebWD/sDthJemzM4MaAag== + dependencies: + cross-spawn "^7.0.0" + cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" @@ -4640,6 +4654,17 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA== +kiste@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/kiste/-/kiste-1.2.0.tgz#d3c78fa9e3135d97e7a5fb760c8b491f08653efe" + integrity sha512-/K5hIpQaa9bOI6Z3oYxkBz1hJyjRn7Pv2j5BTE7gDYPnurCmskmceBPZTb/BvicnEWnwh0c07JPydAK+vJv+UQ== + dependencies: + chroma-js "^2.1.0" + lodash.defaultsdeep "^4.6.1" + lodash.kebabcase "^4.1.1" + lodash.mapvalues "^4.6.0" + vue-ripple-directive "^2.0.1" + last-call-webpack-plugin@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555" @@ -4761,7 +4786,7 @@ lodash.camelcase@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash.defaultsdeep@^4.6.0: +lodash.defaultsdeep@^4.6.0, lodash.defaultsdeep@^4.6.1: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz#512e9bd721d272d94e3d3a63653fa17516741ca6" integrity sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA== @@ -4776,6 +4801,11 @@ lodash.kebabcase@^4.0.1, lodash.kebabcase@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" integrity sha1-hImxyw0p/4gZXM7KRI/21swpXDY= +lodash.mapvalues@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c" + integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw= + lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"