diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue index 6f8508a5..cb73f166 100644 --- a/src/components/SearchBar/SearchBar.vue +++ b/src/components/SearchBar/SearchBar.vue @@ -280,10 +280,13 @@ function handleKeyDown() { } #search-wrap { + --b-search-bar-color: var(--bew-content-1); + --b-search-bar-color-hover: var(--bew-content-1-hover); + --b-search-bar-color-focus: var(--b-search-bar-color); @mixin card-content { --at-apply: text-base outline-none w-full - bg-$bew-content-1 shadow-$bew-shadow-2; + bg-$b-search-bar-color shadow-$bew-shadow-2; backdrop-filter: var(--bew-filter-glass); } @@ -292,7 +295,12 @@ function handleKeyDown() { @include card-content; --at-apply: shadow-$bew-shadow-2; + &:hover { + --at-apply: bg-$b-search-bar-color-hover; + } + &:focus { + --at-apply: bg-$b-search-bar-color-focus; box-shadow: 0 6px 16px var(--bew-theme-color-40), inset 0 0 6px var(--bew-theme-color-30) } } diff --git a/src/components/Topbar/Topbar.vue b/src/components/Topbar/Topbar.vue index a0211061..3a1ef0ff 100644 --- a/src/components/Topbar/Topbar.vue +++ b/src/components/Topbar/Topbar.vue @@ -4,7 +4,6 @@ import { onMounted, watch } from 'vue' import type { UnReadDm, UnReadMessage, UserInfo } from './types' import { updateInterval } from './notify' import { getUserID } from '~/utils/main' -import { settings } from '~/logic' interface Props { showSearchBar?: boolean @@ -95,12 +94,12 @@ async function initData() { } function showLogoMenuDropdown() { - logo.value.classList.add('hover') + logo.value.classList.add('activated') showChannelsPop.value = true } function closeLogoMenuDropdown() { - logo.value.classList.remove('hover') + logo.value.classList.remove('activated') showChannelsPop.value = false } @@ -203,65 +202,62 @@ async function getTopbarNewMomentsCount() { p="lg:x-20 md:x-16 x-14" h="70px" > - +
- - -
- - - + + + + + - - - + + + +
- +
@@ -536,31 +532,17 @@ async function getTopbarNewMomentsCount() { after:transform after:-translate-x-1/2; } -.left-side { - --at-apply: relative ; - .logo { - --at-apply: flex items-center; +.logo.activated { + --at-apply: bg-$bew-theme-color dark:bg-white; - &.hover { - svg:nth-child(2) { - --at-apply: transform rotate-180; - } - } - - svg { - --at-apply: w-60px h-auto filter; - filter: drop-shadow(0 4px 6px rgba(0,0,0,0.3)); - - &:nth-child(2) { - --at-apply: duration-300; - } - } + svg { + --at-apply: fill-white dark:fill-$bew-theme-color; } } .right-side { --at-apply: flex h-55px items-center rounded-full p-2 backdrop-glass - bg-$bew-content-1 text-$bew-text-1 border-1 border-$bew-border-color + bg-$bew-elevated-1 text-$bew-text-1 border-1 border-$bew-border-color box-border; box-shadow: var(--bew-shadow-2);