From 2f080efb74e40b7397591c6f81c933c19bca3904 Mon Sep 17 00:00:00 2001 From: fakihap <fakih.anugerah@gmail.com> Date: Mon, 2 Oct 2023 07:34:12 +0700 Subject: [PATCH] chore: fix layout and color --- src/app/components/templates/sidebar.php | 2 +- src/public/styles/home/home.css | 4 ++-- src/public/styles/styles.css | 3 +++ src/public/styles/templates/navbar.css | 6 ++++-- src/public/styles/templates/sidebar.css | 5 +++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/app/components/templates/sidebar.php b/src/app/components/templates/sidebar.php index 44a5676..2bd988f 100644 --- a/src/app/components/templates/sidebar.php +++ b/src/app/components/templates/sidebar.php @@ -5,7 +5,7 @@ <sidebar> <div id="spacer"></div> <ul> - <li>1</li> + <li>awaalll</li> <li>2</li> <li>1</li> <li>2</li> diff --git a/src/public/styles/home/home.css b/src/public/styles/home/home.css index 3abbd23..e5d3737 100644 --- a/src/public/styles/home/home.css +++ b/src/public/styles/home/home.css @@ -7,7 +7,7 @@ body { div#wrapper { position: absolute; - top: 10%; + top: var(--navbar-height); display: grid; grid-template-columns: 1fr 5fr; @@ -25,7 +25,7 @@ div#card-container { width: 100%; max-height: 100%; - background-color: green; + background-color: var(--color-theme-base); overflow-y: scroll; } \ No newline at end of file diff --git a/src/public/styles/styles.css b/src/public/styles/styles.css index 8233883..d74c86b 100644 --- a/src/public/styles/styles.css +++ b/src/public/styles/styles.css @@ -4,8 +4,11 @@ --color-theme-3: #EFD595; --color-theme-base: #FFFFFF; --color-text: #000000; + --color-border: #d9d9d9; margin: 0; box-sizing: border-box; + + --navbar-height: 5%; } \ No newline at end of file diff --git a/src/public/styles/templates/navbar.css b/src/public/styles/templates/navbar.css index 92bf796..820b540 100644 --- a/src/public/styles/templates/navbar.css +++ b/src/public/styles/templates/navbar.css @@ -5,11 +5,13 @@ navbar { left: 0; width: 100%; - height: 10%; + height: var(--navbar-height); float: left; z-index: 10; + + border: 0.1px solid var(--color-border); } navbar nav { @@ -24,7 +26,7 @@ navbar nav { } navbar #background { - background-color: var(--color-theme-2); + background-color: var(--color-theme-base); position: relative; top: -100%; diff --git a/src/public/styles/templates/sidebar.css b/src/public/styles/templates/sidebar.css index fee4c35..9411a8b 100644 --- a/src/public/styles/templates/sidebar.css +++ b/src/public/styles/templates/sidebar.css @@ -1,18 +1,19 @@ sidebar { position: fixed; - top: 10%; float: left; width: calc(1/6*100%); height:100%; - background-color: var(--color-theme-3); + background-color: var(--color-theme-base); overflow-y: scroll; -ms-overflow-style: none; scrollbar-width: none; + + border-right: 0.1px solid var(--color-border); } sidebar::-webkit-scrollbar { -- GitLab