diff --git a/app/app.vue b/app/app.vue index 3c43621..f343fde 100644 --- a/app/app.vue +++ b/app/app.vue @@ -1,6 +1,6 @@ diff --git a/layers/components/atoms/icons/ArrowDownFill.vue b/layers/components/atoms/icons/ArrowDownFill.vue index 2a05a8c..a457130 100644 --- a/layers/components/atoms/icons/ArrowDownFill.vue +++ b/layers/components/atoms/icons/ArrowDownFill.vue @@ -16,7 +16,6 @@ withDefaults(defineProps(), { :width="size" :height="size" viewBox="0 0 12 12" - :fill="color" > +interface Props { + size?: number | string + color?: string +} + +withDefaults(defineProps(), { + size: 20, + color: 'var(--foreground-gray-500)', +}) + + + + + + + diff --git a/layers/components/atoms/icons/MenuCloseLine.vue b/layers/components/atoms/icons/MenuCloseLine.vue deleted file mode 100644 index d91d45e..0000000 --- a/layers/components/atoms/icons/MenuCloseLine.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/layers/components/blocks/VisualContent.vue b/layers/components/blocks/VisualContent.vue index fcca19c..f78489b 100644 --- a/layers/components/blocks/VisualContent.vue +++ b/layers/components/blocks/VisualContent.vue @@ -29,7 +29,6 @@ const sanitizedContent = computed(() => { { @@ -193,7 +193,7 @@ onBeforeUnmount(() => { @@ -215,13 +215,21 @@ onBeforeUnmount(() => { {{ gnbItem.menu_name }} + @@ -322,7 +330,6 @@ onBeforeUnmount(() => { colorCode: gnb1depthButtonData?.btn_info?.color_code_txt, }) " - class="nav-1depth" > {{ gnb1depthButtonData?.btn_info?.txt_btn_name }} @@ -337,7 +344,11 @@ onBeforeUnmount(() => { - + menu close @@ -426,6 +437,9 @@ onBeforeUnmount(() => { .nav-1depth.active { @apply bg-theme-foreground-reversal-8 md:bg-transparent; } +.nav-1depth.has-link { + @apply hover:bg-theme-foreground-reversal-4 active:bg-theme-foreground-reversal-10 md:hover:bg-transparent md:active:bg-transparent; +} .nav-2depth { @apply text-[15px] md:hidden md:absolute md:top-[64px] md:left-[-28px] md:pt-1; @@ -480,15 +494,16 @@ onBeforeUnmount(() => { .btn-start:hover .nav-2depth { @apply md:block; } -.btn-start:deep(.nav-1depth) { - @apply w-full h-[48px] px-10 md:w-auto; +.btn-start:deep(> .btn-base) { + @apply w-full h-[48px] px-10; } -.btn-start:deep(.nav-1depth) .icon-platform { +.btn-start:deep(> .btn-base) .icon-platform { @apply hidden; } -.btn-start:deep(.nav-1depth) .btn-content { - @apply justify-center text-center; +.btn-start:deep(> .btn-base) .btn-content { + @apply justify-center; } + .btn-start .nav-2depth { @apply left-[unset] right-[-40px]; } diff --git a/layers/composables/useBreakpoints.ts b/layers/composables/useBreakpoints.ts index 9c476fc..8f9c7c1 100644 --- a/layers/composables/useBreakpoints.ts +++ b/layers/composables/useBreakpoints.ts @@ -14,12 +14,13 @@ export const BREAKPOINTS = { */ export const useResponsiveBreakpoints = () => { const breakpoints = useBreakpoints(BREAKPOINTS) - const isXs = breakpoints.smaller('sm') // < 768px - const isSm = breakpoints.smaller('md') // < 1024px - const isMd = breakpoints.smaller('lg') // < 1440px - const isLg = breakpoints.greater('lg') // >= 1440px - const isMobile = isXs || isSm - const isDesktop = isLg || isMd + const isXs = breakpoints.smaller('sm') // < 768 + const isSm = breakpoints.between('sm', 'md') // 768 <= x < 1024 + const isMd = breakpoints.between('md', 'lg') // 1024 <= x < 1440 + const isLg = breakpoints.greaterOrEqual('lg') // >= 1440 + + const isMobile = breakpoints.smaller('md') // < 1024 + const isDesktop = breakpoints.greaterOrEqual('md') // >= 1024 return computed(() => ({ isXs: isXs.value, diff --git a/layers/templates/GrBoard01/index.vue b/layers/templates/GrBoard01/index.vue index 8bae09b..6836bc6 100644 --- a/layers/templates/GrBoard01/index.vue +++ b/layers/templates/GrBoard01/index.vue @@ -131,7 +131,7 @@ const onArrowClick = (direction, targetIndex) => { :description=" formatTimestamp(item.create_datetime, 'YYYY.MM.DD') " - :img-path="getResolvedHost(item.media_thumbnail_url)" + :img-path="getImageHost(item.media_thumbnail_url)" :url="getArticleUrl(item.article_id)" link-target="_blank" /> diff --git a/layers/templates/GrDetail01/index.vue b/layers/templates/GrDetail01/index.vue index b6abd52..624a05b 100644 --- a/layers/templates/GrDetail01/index.vue +++ b/layers/templates/GrDetail01/index.vue @@ -41,7 +41,7 @@ const handleSplideMove = (_splide: SplideType, newIndex: number) => { - + { - + { - + { - + { - + {