Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#6387 alignment fix #6401

Merged
merged 5 commits into from
Jul 13, 2023
Merged

#6387 alignment fix #6401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
829fd55
#6387 alignment fix
prachi00 Jul 5, 2023
b190ed4
Merge branch 'main' into feat-search-alignment
prachi00 Jul 7, 2023
3ea82ed
css changes
prachi00 Jul 8, 2023
cd3f184
css update
prachi00 Jul 11, 2023
ed42c73
Merge branch 'main' into feat-search-alignment
prachi00 Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions components/search/SearchSuggestion.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@
v-model="activeSearchTab"
expanded
class="touch-mt-20"
nav-tabs-class="pt-6 pl-6 pr-6"
@input="resetSelectedIndex">
<NeoTabItem label="Collections" value="Collections">
<NeoTabItem
label="Collections"
value="Collections"
item-header-class="has-text-left is-block mb-0 pb-4 px-0 pt-0">
<div v-if="isCollectionResultLoading">
<SearchResultItem
v-for="item in searchSuggestionEachTypeMaxNum"
Expand Down Expand Up @@ -87,7 +91,10 @@
</div>
</nuxt-link>
</NeoTabItem>
<NeoTabItem label="NFTs" value="NFTs">
<NeoTabItem
label="NFTs"
value="NFTs"
item-header-class="has-text-left is-block mb-0 pb-4 px-0 pt-0">
<div v-if="isNFTResultLoading">
<SearchResultItem
v-for="item in searchSuggestionEachTypeMaxNum"
Expand Down Expand Up @@ -148,7 +155,10 @@
</div>
</nuxt-link>
</NeoTabItem>
<NeoTabItem disabled value="User">
<NeoTabItem
disabled
value="User"
item-header-class="has-text-left is-block mb-0 pb-4 px-0 pt-0">
<template #header>
{{ $t('user') }}
<span class="small-soon-text">
Expand Down
1 change: 1 addition & 0 deletions libs/ui/src/components/NeoAutocomplete/NeoAutocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
}
&__menu {
margin-top: 1rem;
padding: 0;
@include ktheme() {
box-shadow: theme('primary-shadow');
border: 1px solid theme('border-color');
Expand Down
5 changes: 2 additions & 3 deletions libs/ui/src/components/NeoTabs/NeoTabs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ $tabs-font-size: 1rem;
@include ktheme() {
color: theme('text-color');
margin-bottom: 1.5rem;
border-bottom-color: theme('k-shade');

&--active {
border-bottom-color: theme('k-primary');
color: theme('k-primary');
font-weight: 700;
}

&:hover:not(.o-tabs__nav-item-default--active) {
background-color: unset;
border-bottom-color: theme('k-primary');

.o-tabs__nav-item-text,
span,
Expand Down