From 85af85b1ee251fbe196afcda59a7cb2c2b1fe02f Mon Sep 17 00:00:00 2001 From: Filip Rojek Date: Fri, 27 Dec 2024 17:07:09 +0100 Subject: [PATCH] Edited: Dashboard links and global button styles, added new color variables --- app/views/dashboard/index.php | 5 +++- app/views/layouts/base.php | 2 +- public/css/global.css | 45 +++++++++++++++++++++++------------ public/css/vars.css | 5 ++++ 4 files changed, 40 insertions(+), 17 deletions(-) diff --git a/app/views/dashboard/index.php b/app/views/dashboard/index.php index 5cbcaca..ae3273d 100644 --- a/app/views/dashboard/index.php +++ b/app/views/dashboard/index.php @@ -2,7 +2,10 @@

Welcome, !

- Create new habit! +
+ Create new habit! + List all habits +

Upcoming

diff --git a/app/views/layouts/base.php b/app/views/layouts/base.php index 3346b92..5560a6e 100644 --- a/app/views/layouts/base.php +++ b/app/views/layouts/base.php @@ -24,7 +24,7 @@ Log In Sign Up - Sign out + Sign out
diff --git a/public/css/global.css b/public/css/global.css index 3f6bd93..12b07e7 100644 --- a/public/css/global.css +++ b/public/css/global.css @@ -1,32 +1,47 @@ @import url("https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&family=Source+Code+Pro:ital,wght@0,200..900;1,200..900&display=swap"); body { - font-family: "Open Sans", serif; - background-color: var(--clr-primary); - color: white; - font-size: 14px; + font-family: "Open Sans", serif; + background-color: var(--clr-primary); + color: white; + font-size: 14px; } a { - color: white; + color: white; } h1 { - margin-top: .5rem; - margin-bottom: 1rem; + margin-top: .5rem; + margin-bottom: 1rem; } .btn-primary, +.btn-secondary, +.btn-tertiary, +.btn-green, .btn-danger { - background-color: var(--clr-green); - padding: .5rem; - text-decoration: none; - cursor: pointer; - border-radius: var(--border-radious); - border: var(--borderWidth-thin) solid var(--clr-border); + background-color: var(--clr-primary); + padding: .5rem; + text-decoration: none; + cursor: pointer; + border-radius: var(--border-radious); + border: var(--borderWidth-thin) solid var(--clr-border); +} + +.btn-secondary { + background-color: var(--clr-secondary); +} + +.btn-tertiary { + background-color: var(--clr-tertiary); +} + +.btn-green { + background-color: var(--clr-green); } .btn-danger { - background-color: var(--clr-danger-muted) !important; - border: var(--borderWidth-thin) solid var(--clr-border-danger); + background-color: var(--clr-danger-muted); + border: var(--borderWidth-thin) solid var(--clr-border-danger); } diff --git a/public/css/vars.css b/public/css/vars.css index 46fda14..2feb4ee 100644 --- a/public/css/vars.css +++ b/public/css/vars.css @@ -7,6 +7,11 @@ --clr-danger-muted: #f851491a; --clr-link-blue: #4493f8; + --clr-light-blue: #39a2ae; + --clr-light-green: #71f79f; + --clr-red: #9b1d20; + --clr-orange: #e08e45; + --clr-gray-blue: #627c85; --border-radious: 5px; --borderWidth-thin: max(1px, 0.0625rem);