diff --git a/.gitignore b/.gitignore index 4d29575..2d02b41 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # dependencies /node_modules +.idea /.pnp .pnp.js diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 0bdd31c..e09fcb4 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,70 +11,74 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -185,10 +190,10 @@ - + - + diff --git a/src/components/elements/logo.jsx b/src/components/elements/logo.jsx index a47c56e..ce5e859 100644 --- a/src/components/elements/logo.jsx +++ b/src/components/elements/logo.jsx @@ -1,10 +1,12 @@ import React, {useEffect, useState} from 'react' -import figlet from '../../when-module-doesnt-merge-your-pullrequest/figlet.js' -import Pagga from '../../when-module-doesnt-merge-your-pullrequest/figlet.js/importable-fonts/Pagga' import asciiWord from "../../functions/ascii-word"; -const font = 'Pagga'; +/* +░█░█░█▀█░█▀▄░█░█░▀█▀░█░█░░░░█▀▄░█▀▀░█░█ +░█▀█░█░█░█▀▄░█▀█░░█░░█▀▄░░░░█░█░█▀▀░▀▄▀ +░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀▀░▀░▀░▀░░▀▀░░▀▀▀░░▀░ +*/ const Logo = (props) => { const text = useState(asciiWord("horhik.dev")) @@ -15,9 +17,6 @@ const Logo = (props) => {
- {/*░█░█░█▀█░█▀▄░█░█░▀█▀░█░█░░░░█▀▄░█▀▀░█░█*/} - {/*░█▀█░█░█░█▀▄░█▀█░░█░░█▀▄░░░░█░█░█▀▀░▀▄▀*/} - {/*░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀▀░▀░▀░▀░░▀▀░░▀▀▀░░▀░*/} 
                 {text}
diff --git a/src/components/elements/page-links.jsx b/src/components/elements/page-links.jsx new file mode 100644 index 0000000..7f99171 --- /dev/null +++ b/src/components/elements/page-links.jsx @@ -0,0 +1,21 @@ +import React from 'react' +import asciiWord from "../../functions/ascii-word"; + +const PageLinks = props => { + return( + + ) +} + +export default PageLinks \ No newline at end of file diff --git a/src/components/pages/homepage.jsx b/src/components/pages/homepage.jsx index ae6c9d0..dc3f90e 100644 --- a/src/components/pages/homepage.jsx +++ b/src/components/pages/homepage.jsx @@ -1,10 +1,12 @@ import React from 'react' import Logo from "../elements/logo"; +import PageLinks from "../elements/page-links"; const HomePage = () => { return (
+
) } diff --git a/src/css/basic.scss b/src/css/basic.scss index 798dd2b..f7d82a7 100644 --- a/src/css/basic.scss +++ b/src/css/basic.scss @@ -12,4 +12,5 @@ body { .App { } -@import "logo"; \ No newline at end of file +@import "logo"; +@import "elements/page-links"; \ No newline at end of file diff --git a/src/css/elements/page-links.scss b/src/css/elements/page-links.scss new file mode 100644 index 0000000..fb8994b --- /dev/null +++ b/src/css/elements/page-links.scss @@ -0,0 +1,26 @@ +.page-list{ + list-style: none; + display: flex; + justify-content: space-between; + width: 300px; + margin: 0 auto; + font-family: Mononoki; +} + +.page-link{ + font-size: 0.4em; + line-height: $ascii-line-height; + width: 100px; + transition: 0.3s; + & a{ + color: var(--cyan); + text-decoration: none; + display: block; + &:visited{ + color: var(--purple); + } + &:hover, &:focus{ + color: var(--pink) + } + } +} \ No newline at end of file diff --git a/src/css/fonts.scss b/src/css/fonts.scss new file mode 100644 index 0000000..5c2692c --- /dev/null +++ b/src/css/fonts.scss @@ -0,0 +1,26 @@ +@font-face { + font-family: 'Mononoki'; + src: url('fonts/mononoki-Regular.eot'); + src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'); + url('fonts/mononoki-Regular.ttf') format('truetype'), + url('fonts/mononoki-Regular.woff2') format('woff2'), + url('fonts/mononoki-Regular.woff') format('woff') +} + +@font-face { + font-family: 'Mononoki Bold'; + src: url('fonts/mononoki-Bold.eot'); + src: url('fonts/mononoki-Bold.eot') format('embedded-opentype'); +url('fonts/mononoki-Bold.ttf') format('truetype'), +url('fonts/mononoki-Bold.woff2') format('woff2'), +url('fonts/mononoki-Bold.woff') format('woff') +} + +@font-face { + font-family: 'Mononoki'; + src: url('fonts/mononoki-Regular.eot'); + src: url('fonts/mononoki-Regular.eot') format('embedded-opentype'); +url('fonts/mononoki-Regular.ttf') format('truetype'), +url('fonts/mononoki-Regular.woff2') format('woff2'), +url('fonts/mononoki-Regular.woff') format('woff') +} diff --git a/src/css/fonts/mononoki-Bold.eot b/src/css/fonts/mononoki-Bold.eot new file mode 100644 index 0000000..cf2a252 Binary files /dev/null and b/src/css/fonts/mononoki-Bold.eot differ diff --git a/src/css/fonts/mononoki-Bold.ttf b/src/css/fonts/mononoki-Bold.ttf new file mode 100644 index 0000000..407ed3e Binary files /dev/null and b/src/css/fonts/mononoki-Bold.ttf differ diff --git a/src/css/fonts/mononoki-Bold.woff b/src/css/fonts/mononoki-Bold.woff new file mode 100644 index 0000000..a6f5e8a Binary files /dev/null and b/src/css/fonts/mononoki-Bold.woff differ diff --git a/src/css/fonts/mononoki-Bold.woff2 b/src/css/fonts/mononoki-Bold.woff2 new file mode 100644 index 0000000..adb5b15 Binary files /dev/null and b/src/css/fonts/mononoki-Bold.woff2 differ diff --git a/src/css/fonts/mononoki-BoldItalic.eot b/src/css/fonts/mononoki-BoldItalic.eot new file mode 100644 index 0000000..70968d6 Binary files /dev/null and b/src/css/fonts/mononoki-BoldItalic.eot differ diff --git a/src/css/fonts/mononoki-BoldItalic.ttf b/src/css/fonts/mononoki-BoldItalic.ttf new file mode 100644 index 0000000..784c2d0 Binary files /dev/null and b/src/css/fonts/mononoki-BoldItalic.ttf differ diff --git a/src/css/fonts/mononoki-BoldItalic.woff b/src/css/fonts/mononoki-BoldItalic.woff new file mode 100644 index 0000000..f0d6ed7 Binary files /dev/null and b/src/css/fonts/mononoki-BoldItalic.woff differ diff --git a/src/css/fonts/mononoki-BoldItalic.woff2 b/src/css/fonts/mononoki-BoldItalic.woff2 new file mode 100644 index 0000000..3cc80cd Binary files /dev/null and b/src/css/fonts/mononoki-BoldItalic.woff2 differ diff --git a/src/css/fonts/mononoki-Italic.eot b/src/css/fonts/mononoki-Italic.eot new file mode 100644 index 0000000..53c1e62 Binary files /dev/null and b/src/css/fonts/mononoki-Italic.eot differ diff --git a/src/css/fonts/mononoki-Italic.ttf b/src/css/fonts/mononoki-Italic.ttf new file mode 100644 index 0000000..dad4dcc Binary files /dev/null and b/src/css/fonts/mononoki-Italic.ttf differ diff --git a/src/css/fonts/mononoki-Italic.woff b/src/css/fonts/mononoki-Italic.woff new file mode 100644 index 0000000..fb690ec Binary files /dev/null and b/src/css/fonts/mononoki-Italic.woff differ diff --git a/src/css/fonts/mononoki-Italic.woff2 b/src/css/fonts/mononoki-Italic.woff2 new file mode 100644 index 0000000..30cbd0d Binary files /dev/null and b/src/css/fonts/mononoki-Italic.woff2 differ diff --git a/src/css/fonts/mononoki-Regular.eot b/src/css/fonts/mononoki-Regular.eot new file mode 100644 index 0000000..26e5357 Binary files /dev/null and b/src/css/fonts/mononoki-Regular.eot differ diff --git a/src/css/fonts/mononoki-Regular.ttf b/src/css/fonts/mononoki-Regular.ttf new file mode 100644 index 0000000..9510ac8 Binary files /dev/null and b/src/css/fonts/mononoki-Regular.ttf differ diff --git a/src/css/fonts/mononoki-Regular.woff b/src/css/fonts/mononoki-Regular.woff new file mode 100644 index 0000000..939ec2a Binary files /dev/null and b/src/css/fonts/mononoki-Regular.woff differ diff --git a/src/css/fonts/mononoki-Regular.woff2 b/src/css/fonts/mononoki-Regular.woff2 new file mode 100644 index 0000000..2c23a36 Binary files /dev/null and b/src/css/fonts/mononoki-Regular.woff2 differ diff --git a/src/css/logo.scss b/src/css/logo.scss index 7999ae7..a42385b 100644 --- a/src/css/logo.scss +++ b/src/css/logo.scss @@ -1,22 +1,28 @@ .logo--wrapper { display: grid; - font-family: 'Fira Code',monospace, Ubuntu; + font-family: Mononoki, 'Fira Code',monospace, Ubuntu; } .logo-quote { text-align: center; color: var(--foreground); + margin: 10px auto 28px; } .logo{ - margin: 30px auto 15px; + margin: 0 auto ; + margin-top: 30px; display: flex; flex-direction: column; align-items: center; align-content: center; + font-family: Mononoki, 'Fira Code',monospace, Ubuntu; } + .toilet-logo{ color: var(--orange); font-size: 0.9em; - line-height: 1.25em; + line-height: $ascii-line-height; + margin: 0; + font-family: Mononoki, 'Fira Code',monospace, Ubuntu; } \ No newline at end of file diff --git a/src/css/variables.scss b/src/css/variables.scss index 0494d45..e51ac93 100644 --- a/src/css/variables.scss +++ b/src/css/variables.scss @@ -1,3 +1,4 @@ +$ascii-line-height: 1.115em; :root { --background: #282A36 ; --comment: #6272A4 ; @@ -11,3 +12,4 @@ --red: #FF5555 ; --yellow: #F1FA8C; } +