From 5fc8ea5b0aacd520046bb7211981ef3e9d97c112 Mon Sep 17 00:00:00 2001 From: "jo.kuehner" Date: Tue, 7 Nov 2023 12:29:15 +0000 Subject: [PATCH] revert a2f61c5a1ca7206bd8258b3f223fa8b1cd22ca25 revert add actionbar --- layouts/Actionbar.vue | 159 +----------------- layouts/Navigationbar.vue | 45 ++--- ...tachments-Icon.svg => Attachment-Icon.svg} | 0 .../{ => actionbar-icons}/Dropdown-Icon.svg | 0 .../{Archive-Icon.svg => Mark-Done-Icon.svg} | 0 .../icons/{ => actionbar-icons}/Save-Icon.svg | 0 .../{ => actionbar-icons}/Settings-Icon.svg | 0 7 files changed, 29 insertions(+), 175 deletions(-) rename public/icons/actionbar-icons/{Attachments-Icon.svg => Attachment-Icon.svg} (100%) rename public/icons/{ => actionbar-icons}/Dropdown-Icon.svg (100%) rename public/icons/actionbar-icons/{Archive-Icon.svg => Mark-Done-Icon.svg} (100%) rename public/icons/{ => actionbar-icons}/Save-Icon.svg (100%) rename public/icons/{ => actionbar-icons}/Settings-Icon.svg (100%) diff --git a/layouts/Actionbar.vue b/layouts/Actionbar.vue index cab0087..414087c 100644 --- a/layouts/Actionbar.vue +++ b/layouts/Actionbar.vue @@ -1,156 +1,5 @@ - - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/layouts/Navigationbar.vue b/layouts/Navigationbar.vue index d68f354..e16773e 100644 --- a/layouts/Navigationbar.vue +++ b/layouts/Navigationbar.vue @@ -1,5 +1,5 @@ @@ -72,24 +72,23 @@ export default { } .sidebar { - display: flex; - flex-direction: column; - align-items: stretch; - justify-content: center; - width: 200px; - border-radius: 10px; - padding: 10px; - gap: 10px; + align-items: flex-start; box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); background-color: #2c2c2c; + width: 200px; + display: flex; + flex-direction: column; + border-radius: 10px; + gap: 10px; + padding: 10px; } .toggle { - display: flex; - flex-direction: row; - align-items: center; justify-content: space-between; + align-items: center; + align-self: stretch; + display: flex; height: 40px; padding: 10px; } @@ -97,19 +96,20 @@ export default { .menus { + align-items: flex-start; + align-self: stretch; display: flex; flex-direction: column; - align-items: stretch; - justify-content: center; padding: 40px 0; gap: 30px; } nav { + justify-content: center; + align-items: center; + align-self: stretch; display: flex; flex-direction: column; - align-items: stretch; - justify-content: center; padding: 10px; gap: 30px; } @@ -120,14 +120,14 @@ export default { button { display: flex; - flex-direction: row; align-items: center; + align-self: stretch; justify-content: flex-start; height: 35px; + border: none; border-radius: 5px; padding: 5px; gap: 10px; - border: none; background-color: #2c2c2c; transition-duration: 0.5s; } @@ -151,6 +151,8 @@ export default { transition-duration: 0.5s; } #indicator-icon:hover, #back-icon:hover { + width: 30px; + height: 30px; background-color: #444444; } @@ -166,9 +168,12 @@ export default { .label { color: #fff; + /*leading-trim: both; + text-edge: cap;*/ letter-spacing: 0.7px; - align-self: stretch; + align-self: center; white-space: nowrap; + margin: auto 0; font: 700 14px/20px Overpass, sans-serif; } diff --git a/public/icons/actionbar-icons/Attachments-Icon.svg b/public/icons/actionbar-icons/Attachment-Icon.svg similarity index 100% rename from public/icons/actionbar-icons/Attachments-Icon.svg rename to public/icons/actionbar-icons/Attachment-Icon.svg diff --git a/public/icons/Dropdown-Icon.svg b/public/icons/actionbar-icons/Dropdown-Icon.svg similarity index 100% rename from public/icons/Dropdown-Icon.svg rename to public/icons/actionbar-icons/Dropdown-Icon.svg diff --git a/public/icons/actionbar-icons/Archive-Icon.svg b/public/icons/actionbar-icons/Mark-Done-Icon.svg similarity index 100% rename from public/icons/actionbar-icons/Archive-Icon.svg rename to public/icons/actionbar-icons/Mark-Done-Icon.svg diff --git a/public/icons/Save-Icon.svg b/public/icons/actionbar-icons/Save-Icon.svg similarity index 100% rename from public/icons/Save-Icon.svg rename to public/icons/actionbar-icons/Save-Icon.svg diff --git a/public/icons/Settings-Icon.svg b/public/icons/actionbar-icons/Settings-Icon.svg similarity index 100% rename from public/icons/Settings-Icon.svg rename to public/icons/actionbar-icons/Settings-Icon.svg