diff --git a/app.py b/app.py index caea439..3eaca17 100644 --- a/app.py +++ b/app.py @@ -50,13 +50,21 @@ def internal_server_error(e): # @app.route('/') def index(): - return render_template('index.html') + msg = ['Some interesting text', 'Balls', 'hiiiiii'] + return render_template('index.html', title=random.choice(msg)) +@app.route('/thankies') +def thankies(): + return render_template('thankies.html') @app.route('/funny') def funny(): return render_template('funny.html') +@app.route('/status') +def status(): + abort(403) + @app.route('/error//') def error(error, msg): try: diff --git a/static/css/_aside.scss b/static/css/_aside.scss index fc0801f..f4fc220 100644 --- a/static/css/_aside.scss +++ b/static/css/_aside.scss @@ -11,12 +11,13 @@ background-color: $black; box-sizing: border-box; + z-index: 68; hr { - margin: 0.5rem 0; + margin: 0.5rem auto; padding: 0; - width: 100%; + width: 80%; height: 1px; background-color: $white; @@ -92,7 +93,13 @@ @include aside-item($purple); } -@media screen and (max-width: 768px) { +@media screen and (max-width: $phone-width) { + @media screen and (min-width: calc(#{$phone-width} * 0.6)) { + .aside { + max-width: 20rem; + } + } + .aside { display: block; @@ -100,15 +107,20 @@ top: 3rem; left: -100vw; - width: calc(100vw - 1rem); + width: 100vw; height: calc(100vh - 3rem); - z-index: 68; + background-color: #121212; + overflow-y: auto; - box-shadow: 0 0 0.5rem 5px rgba($black, 0.5); - transition: left 0.2s ease-in-out, opacity 0.2s ease-in-out; + + hr { + margin: 1rem auto; + + width: 100%; + } } .aside-active { diff --git a/static/css/_footer.scss b/static/css/_footer.scss index 7d896a1..02023a0 100644 --- a/static/css/_footer.scss +++ b/static/css/_footer.scss @@ -17,9 +17,9 @@ } } -@media screen and (max-width: 768px) { +@media screen and (max-width: $phone-width) { .footer { - background-color: $white; - color: $black; + background-color: $black; + color: $white; } } \ No newline at end of file diff --git a/static/css/_nav.scss b/static/css/_nav.scss index e03b07d..96b56e8 100644 --- a/static/css/_nav.scss +++ b/static/css/_nav.scss @@ -42,11 +42,22 @@ } } -@media screen and (max-width: 768px) { +@media screen and (max-width: $phone-width) { .nav { + margin: 0; + padding: 0; + + width: 100vw; + height: 3rem; + + position: fixed; + top: 0; + left: 0; + justify-content: space-between; - background-color: #121212; + background-color: $black; + color: $white; } .nav-toggle { display: flex; diff --git a/static/css/_wrapper.scss b/static/css/_wrapper.scss index c23fef1..796ee6e 100644 --- a/static/css/_wrapper.scss +++ b/static/css/_wrapper.scss @@ -1,37 +1,147 @@ +@mixin btn-hover($color) { + background-color: rgba($color, 0.1); + border: 1px solid rgba($color, 0.5); + color: $color; +} + .wrapper { margin: 0; padding: 0; - background-color: $white; - color: $black; + background-color: #101010; + color: $white; - border-radius: 6px 0 0 0; + border-radius: calc(0.8rem + 3px) 0 0 0; + position: relative; overflow: hidden; + + hr { + margin: 0.5rem 1rem; + padding: 0; + + height: 1px; + + background-color: $white; + border: none; + } } .content { - margin: 0; - padding: 0.5rem; - - height: 100vh; - - display: flex; - flex-direction: column; - gap: 1.5rem; + margin: 1rem; position: relative; - p, .btn { + p { margin: 0; padding: 0; font-size: 1rem; } } +.content-header { + padding: 1rem; -@media screen and (max-width: 768px) { + display: flex; + flex-direction: column; + gap: 1rem; + + background-color: rgba($white, 0.1); + border: 1px solid rgba($white, 0.5); + border-radius: 3px; + + p { + margin: 0; + padding: 0; + + font-size: 2rem; + font-weight: 600; + text-align: center; + } +} +.content-default { + padding: 1rem; + + display: flex; + flex-direction: column; + gap: 1rem; + + background-color: rgba($white, 0.1); + border: 1px solid rgba($white, 0.5); + border-radius: 3px; +} +.content-list { + display: flex; + flex-direction: column; + gap: 1rem; +} +.content-img { + padding: 1rem; + + display: flex; + + background-color: rgba($white, 0.1); + border: 1px solid rgba($white, 0.5); + border-radius: 3px; + + img { + margin: auto; + padding: 0; + + width: 100%; + height: auto; + + border-radius: 3px; + + object-fit: cover; + } +} + +.btn { + margin: 0; + padding: 1.5rem; + + width: auto; + height: auto; + + background-color: transparent; + color: $white; + + text-decoration: none; + font-size: 1rem; + + display: flex; + align-items: center; + justify-content: center; + gap: 0.5rem; + + border: 1px solid transparent; + border-radius: 3px; + + transition: all 0.2s ease-in-out; +} +.btn-red:hover { + @include btn-hover($red); +} +.btn-yellow:hover { + @include btn-hover($yellow); +} +.btn-green:hover { + @include btn-hover($green); +} +.btn-blue:hover { + @include btn-hover($blue); +} +.btn-purple:hover { + @include btn-hover($purple); +} + + +@media screen and (max-width: $phone-width) { .wrapper { + margin: 0; + padding: 3rem 0 0 0; + border-radius: 0; } } \ No newline at end of file diff --git a/static/css/scss/_grid.scss b/static/css/scss/_grid.scss index fb24ddd..edfb40a 100644 --- a/static/css/scss/_grid.scss +++ b/static/css/scss/_grid.scss @@ -23,13 +23,12 @@ body { grid-area: footer; } -@media screen and (max-width: 768px) { +@media screen and (max-width: $phone-width) { body { - grid-template-areas: 'nav' - 'wrapper' + grid-template-areas: 'wrapper' 'footer'; - grid-template-rows: 3rem 1fr 3rem; + grid-template-rows: 1fr 3rem; grid-template-columns: 1fr; } } \ No newline at end of file diff --git a/static/css/scss/_variables.scss b/static/css/scss/_variables.scss index 2a60a42..14badae 100644 --- a/static/css/scss/_variables.scss +++ b/static/css/scss/_variables.scss @@ -8,7 +8,7 @@ $blue: #8DA3B9; //$dblue: #222c45; $purple: #A988B0; -$primary: $green; +$primary: #f5622d; @font-face { font-family: 'Mona-Sans'; @@ -28,6 +28,8 @@ $primary: $green; $font-header: "Mona-Sans", sans-serif; $font-body: "Hubot-Sans", sans-serif; +$phone-width: 900px; + @function hexToRGB($hex) { @return red($hex), green($hex), blue($hex); } diff --git a/static/css/style.scss b/static/css/style.scss index c2f25de..8d642c7 100644 --- a/static/css/style.scss +++ b/static/css/style.scss @@ -33,70 +33,32 @@ h3 { font-weight: 600; } -.title { - margin: 0; - padding: 2rem 0; - - position: relative; - - img { - width: 100%; - height: 100%; - - object-fit: cover; - - filter: grayscale(100%); - - transition: all 0.2s ease-in-out; - - &:hover { - filter: grayscale(0%); - } - } -} - -.btn { +.error { margin: 0; padding: 0; - width: 100%; - height: auto; + width: 80%; - background-color: transparent; - color: $white; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); - text-decoration: none; + h1 { + margin: 0; + padding: 0; - display: flex; - justify-content: left; - align-items: center; - gap: 0.5rem; - - border: none; - - transition: all 0.2s ease-in-out; - cursor: pointer; - - i { - opacity: 0; - transform: translateX(1rem); - transition: all 0.2s ease-in-out; - filter: blur(0.1rem); + font-size: 5rem; + text-align: center; + font-weight: 700; } - &:hover { - i { - opacity: 1; - transform: translateX(0); - filter: blur(0); - } + p { + margin: 0; + padding: 0; + + font-size: 1.5rem; + text-align: center; + font-weight: 400; } -} - -#funny { - margin: 0; - padding: 0; - - width: 100%; - height: 100%; } \ No newline at end of file diff --git a/static/images/landscape.webp b/static/images/landscape.webp new file mode 100644 index 0000000..f34a982 Binary files /dev/null and b/static/images/landscape.webp differ diff --git a/static/images/ny.png b/static/images/ny.png new file mode 100644 index 0000000..00a67ab Binary files /dev/null and b/static/images/ny.png differ diff --git a/static/images/sneak.png b/static/images/sneak.png new file mode 100644 index 0000000..fee8fcc Binary files /dev/null and b/static/images/sneak.png differ diff --git a/templates/error.html b/templates/error.html index 854b1f1..425f5f8 100644 --- a/templates/error.html +++ b/templates/error.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} {% block content %} -
+

{{error}}

{{msg}}

diff --git a/templates/funny.html b/templates/funny.html index d93be61..5dc2b2b 100644 --- a/templates/funny.html +++ b/templates/funny.html @@ -1,4 +1,6 @@ {% extends 'layout.html' %} {% block content %} - Funny +
+ Funny +
{% endblock %} \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index a8c4d6a..31f4486 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,35 +1,33 @@ {% extends 'layout.html' %} {% block content %} -
-

Special Thanks

-

Jeetix: Helping me with learning how to make websites!

-

Carty: Teaching me how to run servers and the networking!

-

mrHDash: For the Ref Sheet and most other art on the page!

-

Zadok: Silly taidum art seen below!

-

Shep: For the free YHC!

+
+

{{title}}

-
-

Stalk me

- - - - -
+ +
+ Fluffy the maned wolf art, line art by Shep, colouring by meeee +
{% endblock %} \ No newline at end of file diff --git a/templates/layout.html b/templates/layout.html index bed68ac..4974a92 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -24,12 +24,12 @@ Home - - Social Media - + + Thankies + - - About + + lol @@ -43,17 +43,6 @@ Server Status - - Gwa Gwa - - - -
- - - lol - -
@@ -67,19 +56,8 @@