From 14ad044633671d10ab8cccad3ad317bd2b8d58b9 Mon Sep 17 00:00:00 2001 From: Angel Fernando Quiroz Campos Date: Fri, 10 Jun 2022 19:28:11 -0500 Subject: [PATCH] UI: Move sidebar to organisms directory --- assets/css/scss/index.scss | 3 ++- .../scss/{layout => organisms}/_sidebar.scss | 26 ++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) rename assets/css/scss/{layout => organisms}/_sidebar.scss (81%) diff --git a/assets/css/scss/index.scss b/assets/css/scss/index.scss index 238bfc4f85..433c9f97a4 100755 --- a/assets/css/scss/index.scss +++ b/assets/css/scss/index.scss @@ -12,12 +12,13 @@ @import "molecules/course_tool"; +@import "organisms/sidebar"; + @import "components/badges"; @import "components/forms"; //@import 'announcement'; @import "layout/topbar"; -@import 'layout/sidebar'; @import "layout/breadcrumb"; @import 'layout/main_container'; diff --git a/assets/css/scss/layout/_sidebar.scss b/assets/css/scss/organisms/_sidebar.scss similarity index 81% rename from assets/css/scss/layout/_sidebar.scss rename to assets/css/scss/organisms/_sidebar.scss index 1334dc22fe..011b740ff0 100644 --- a/assets/css/scss/layout/_sidebar.scss +++ b/assets/css/scss/organisms/_sidebar.scss @@ -17,18 +17,18 @@ } &__bottom { - @apply border-b border-solid border-gray-25 p-6 text-tiny; + @apply border-b border-solid border-gray-25 p-6 text-tiny-bold; } &__logout-link { - @apply block font-semibold whitespace-nowrap mt-5 mx-6 mb-3.5 px-4 py-2 text-body-2; + @apply block font-semibold whitespace-nowrap mt-5 mx-6 mb-3.5 px-4 py-2; .pi { - @apply leading-normal; + @apply leading-normal text-body-2; } .logout-text { - @apply ml-2; + @apply ml-2 text-body-2; } &:hover { @@ -37,7 +37,7 @@ } &__button { - @apply hidden bg-white border border-solid border-gray-25 rounded-full absolute top-7 -right-5 text-tiny text-primary + @apply hidden bg-white border border-solid border-gray-25 rounded-full absolute top-7 -right-4 text-tiny text-primary sm:inline-flex; z-index: 11; @@ -45,6 +45,10 @@ &:active { @apply border-primary; } + + &.p-button.p-button-icon-only { + @apply h-8 p-0 w-8; + } } .p-panelmenu { @@ -52,18 +56,18 @@ .p-panelmenu-header { > a { - @apply gap-4 pl-8 py-3 pr-6 mb-1 font-semibold flex-nowrap; + @apply gap-4 pl-8 py-3 pr-6 mb-1 flex-nowrap; .p-panelmenu-icon { - @apply order-3 rotate-90; + @apply order-3 rotate-90 text-body-2-bold; } .p-menuitem-icon { - @apply order-1; + @apply order-1 text-body-2-bold; } .p-menuitem-text { - @apply order-2 grow whitespace-nowrap; + @apply order-2 grow text-body-2-bold whitespace-nowrap; } &.router-link-active, @@ -85,6 +89,10 @@ .p-menuitem-link { @apply pl-8 py-3 pr-6; + .p-menuitem-text { + @apply text-body-2; + } + &.router-link-active-exact, &:hover { @apply text-primary;