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.

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

💅 fresh UI update #2947

Merged
merged 51 commits into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
72b381e
💅 wip fresh UI
roiLeo May 4, 2022
16774dd
💅 fresh UI landing
roiLeo May 4, 2022
230b6a9
Merge branch 'main' into feature/refresh/ui
roiLeo May 6, 2022
09c9c47
💅 wip fresh design tabs
roiLeo May 6, 2022
174f390
Merge branch 'main' into feature/refresh/ui
roiLeo May 9, 2022
8f5d6c3
💅 fresh landing carousel
roiLeo May 9, 2022
79ba2ea
⚒️ remove unused css
roiLeo May 10, 2022
573f373
💅 profile sharing buttons
roiLeo May 10, 2022
5aeec58
Merge branch 'main' into feature/refresh/ui
roiLeo May 10, 2022
f15bb85
💅 remove css style hell
roiLeo May 10, 2022
a9365f3
Merge branch 'main' into feature/refresh/ui
roiLeo May 12, 2022
facabfe
💅 fix mobile nav
roiLeo May 12, 2022
9a59ca8
⚒ resolve conflict
roiLeo May 13, 2022
de3b46a
⚒ fix galleryItem
roiLeo May 13, 2022
8eda3a2
Merge branch 'main' into feature/refresh/ui
roiLeo May 13, 2022
fe9f517
Merge branch 'main' into feature/refresh/ui
roiLeo May 16, 2022
4cb0a87
⚒ shorthand array map
roiLeo May 16, 2022
6392302
Merge branch 'main' into feature/refresh/ui
roiLeo May 17, 2022
9b3dd06
⚒ navbar has-dropdown
roiLeo May 17, 2022
254f44f
🦑 update query
roiLeo May 17, 2022
19fde1a
Merge branch 'main' into feature/refresh/ui
roiLeo May 23, 2022
fef2ea7
pnpm lock
roiLeo May 23, 2022
4bda8b7
⚒ resolve conflicts & merge main
roiLeo May 31, 2022
218a43d
🌞/🌚 mode
roiLeo Jun 2, 2022
4d20237
Merge branch 'main' into feature/refresh/ui
roiLeo Jun 2, 2022
a203aa7
⚒ pnpm lockfile
roiLeo Jun 2, 2022
f7d1698
🔧 shortend function
roiLeo Jun 6, 2022
02497e6
🔧 resolve conflicts
roiLeo Jun 6, 2022
3162456
🐍 bsx integration
roiLeo Jun 9, 2022
d1816a2
🔧 conflicts & pnpm lock
roiLeo Jun 15, 2022
f65d315
🚀 resolve conflicts
roiLeo Jun 28, 2022
15f2dc9
🚀 minor light ui changes
roiLeo Jul 11, 2022
751c4f8
🧹 remove comments
roiLeo Jul 11, 2022
9b9384e
🧹 modal card light theme
roiLeo Jul 11, 2022
861b624
🌞/🌚 mode revert
roiLeo Jul 11, 2022
2c5f6d7
🔧 resolve pnpm lock conflicts
roiLeo Jul 19, 2022
083c5ef
🔧 resolve conflicts
roiLeo Jul 27, 2022
70d4bed
Merge branch 'main' of github.com:preschian/nft-gallery into feature/…
preschian Aug 11, 2022
adaf03d
fix deepscan and adjust lock-file
preschian Aug 11, 2022
36ba2dd
Merge branch 'main' into feature/refresh/ui
yangwao Aug 12, 2022
5bb3258
🌞 light theme create fix
roiLeo Aug 12, 2022
ffc80dd
🌞 light theme create fix
roiLeo Aug 12, 2022
03b1189
🌞 navbar & tags light theme fix
roiLeo Aug 12, 2022
0bf0928
🌞 searchbar light theme fix
roiLeo Aug 12, 2022
c5f91fe
🌞 teleport & transform fix
roiLeo Aug 12, 2022
b878fc2
🧹 clean unused css
roiLeo Aug 12, 2022
c0d0679
🔧 seo canonical link
roiLeo Aug 12, 2022
a41c4a5
🔧 refactor seo canonical link
roiLeo Aug 12, 2022
18ea812
🔧 remove duplicated scopped code
roiLeo Aug 13, 2022
7bd5f97
🌞 bulma table & loading container fix
roiLeo Aug 14, 2022
aa4180d
Merge branch 'main' into feature/refresh/ui
yangwao Aug 15, 2022
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
101 changes: 28 additions & 73 deletions components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,12 @@
<template #start>
<Search
v-if="!mobileGallery"
:class="{
'nav-search-shrink': !showTopNavbar,
}"
hideFilter
showDefaultSuggestions
class="search-navbar is-flex-grow-1 is-hidden-touch"
class="search-navbar is-flex-grow-1 pb-0 is-hidden-touch"
searchColumnClass="is-flex-grow-1" />
</template>
<template #end v-if="showTopNavbar">
<template #end v-if="showTopNavbar || isBurgerMenuOpened">
<LazyHistoryBrowser
class="custom-navbar-item navbar-link-background is-hidden-touch"
id="NavHistoryBrowser" />
Expand Down Expand Up @@ -140,11 +137,12 @@
</b-navbar-item>
</template>
</b-navbar-dropdown>
<LazyChainSelect class="custom-navbar-item" id="NavChainSelect" />
<LazyChainSelect class="navbar-item has-dropdown" id="NavChainSelect" />
<LazySwitchLocale
class="custom-navbar-item"
class="navbar-item has-dropdown"
id="NavLocaleChanger"
data-cy="localChanger" />
<ColorModeButton />
<NavbarProfileDropdown
:isRmrk="isRmrk"
:isBsx="isBsx"
Expand All @@ -171,6 +169,7 @@ import PrefixMixin from '~/utils/mixins/prefixMixin'
import Identity from '@/components/shared/format/Identity.vue'
import Search from '@/components/rmrk/Gallery/Search/SearchBar.vue'
import BasicImage from '@/components/shared/view/BasicImage.vue'
import ColorModeButton from '@/components/common/ColorModeButton.vue'
import { createVisible } from '@/utils/config/permision.config'

import { identityStore } from '@/utils/idbStore'
Expand All @@ -182,12 +181,14 @@ import { get } from 'idb-keyval'
Search,
Identity,
BasicImage,
ColorModeButton,
},
})
export default class NavbarMenu extends mixins(PrefixMixin) {
private mobileGallery = false
protected mobileGallery = false
protected showTopNavbar = true
private isGallery: boolean = this.$route.path.includes('tab=GALLERY')
private showTopNavbar = true
private fixedTitleNavAppearDistance = 200
private lastScrollPosition = 0
private artistName = ''
private showMobileSearchBar = false
Expand Down Expand Up @@ -220,6 +221,7 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
}

get isTargetPage(): boolean {
// why?
return (
this.inCollectionPage ||
this.inGalleryDetailPage ||
Expand Down Expand Up @@ -265,9 +267,8 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
if (Math.abs(currentScrollPosition - this.lastScrollPosition) < 30) {
return
}
const fixedTitleNavAppearDistance = 200
this.showTopNavbar =
currentScrollPosition < fixedTitleNavAppearDistance || !this.isTargetPage
currentScrollPosition < this.fixedTitleNavAppearDistance
this.lastScrollPosition = currentScrollPosition
}

Expand Down Expand Up @@ -299,38 +300,8 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
<style lang="scss">
@import '@/styles/variables';

@include tablet {
.navbar-shrink {
box-shadow: none;
max-height: 70px;
padding-top: 6px !important;
padding-bottom: 6px !important;
}
.nav-search-shrink {
padding-bottom: 0 !important;
}
}

// Reserved for future adjustments

// @media only screen and (min-width: 1215px) and (max-width: 1140px) {
// a#NavProfile {
// display: none;
// }
// }

// @media only screen and (min-width: 1215px) and (max-width: 1160px) {
// a#NavStats {
// display: none;
// }
// }

//@media only screen and (min-width: 1024px) and (max-width: 1100px) {
// div#NavHistoryBrowser {
// display: none;
// }
//}

//@media only screen and (min-width: 1024px) and (max-width: 1200px) {
// a#NavCreate {
// display: none;
Expand All @@ -351,7 +322,6 @@ export default class NavbarMenu extends mixins(PrefixMixin) {

@include touch {
.navbar {
.navbar-item,
.custom-navbar-item {
margin-left: 0 !important;
}
Expand All @@ -373,7 +343,7 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
}

.navbar {
background: rgba(12, 12, 12, 0.7);
background-color: inherit;
backdrop-filter: blur(20px);
transform: translateZ(0px);
transition: 0.3s ease;
Expand All @@ -389,38 +359,24 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
}
}

.navbar-link {
&:hover {
background-color: $primary !important;
color: $text !important;
}
&.navbar-shrink {
box-shadow: none;
max-height: 70px;
padding-top: 6px !important;
padding-bottom: 6px !important;
background-color: rgba(12, 12, 12, 0.7) !important;
}

.navbar-item {
text-transform: uppercase;
text-transform: capitalize;
font-weight: 500;
border-top: 1px solid $primary;
margin-left: 0.5em;
transition: 0.3s;
background: rgba(9, 9, 9, 0.55);
&:hover {
background-color: $primary;
color: $text;
}
margin: 0.5em;
}

.custom-navbar-item {
margin-left: 0.5em;
}

.logo {
border: none !important;
background: transparent;
@include tablet {
margin-left: 0;
}
}

.navbar-brand {
align-items: center;
}
Expand All @@ -433,10 +389,6 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
.navbar-dropdown {
border: 2px solid $primary-light !important;
box-shadow: $dropdown-content-shadow !important;
.navbar-item {
border: none !important;
margin-left: 0 !important;
}
}

.search-navbar {
Expand All @@ -445,11 +397,14 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
width: min-content;
min-width: 140px;
margin: 0 1rem;
.icon {
color: $placeholder-color !important;
}
input {
border: inherit;
background-color: rgba(41, 41, 47, 0.5);
background-color: #e5e5e5;
&::placeholder {
color: #898991 !important;
color: $placeholder-color !important;
}
&:focus {
box-shadow: none !important;
Expand All @@ -463,13 +418,13 @@ export default class NavbarMenu extends mixins(PrefixMixin) {
width: 100%;

input {
background-color: rgba(41, 41, 47);
background-color: $search-navbar-background-color;
padding: 0;
z-index: 1;
&:focus {
box-shadow: none !important;
border-top: 2px solid $primary;
background: rgba(41, 41, 47);
background: $search-navbar-background-color;
}
}
}
Expand Down
82 changes: 34 additions & 48 deletions components/base/CarouselCardList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
:breakpoints="options.breakpoints"
class="carousel-card-list">
<template #item="list">
<div class="card mx-4">
<div class="card-image">
<div class="card mx-2">
<div class="card-image p-4">
<nuxt-link :to="urlOf(list.id)">
<PreviewMediaResolver
v-if="list.animationUrl"
Expand All @@ -24,19 +24,19 @@
custom-class="carousel__image-wrapper" />
</nuxt-link>
</div>
<div class="card-content">
<div class="card-content px-4">
<div class="media">
<div class="media-content">
<div class="title is-5 is-ellipsis">
<div class="title is-5 is-ellipsis has-text-weight-bold">
<nuxt-link :to="urlOf(list.id)">
{{ list.name }}
</nuxt-link>
</div>
<b-field grouped>
<p class="control ml-auto" v-if="list.price">
<Money :value="list.price" inline />
</p>
</b-field>
<div class="subtitle is-6 is-ellipsis" v-if="list.collection">
<nuxt-link :to="`/rmrk/collection/${list.collection.id}`">
{{ list.collection.name }}
</nuxt-link>
</div>
<nuxt-link
:to="{ name: profileUrl, params: { id: list.issuer } }">
<div class="is-size-7 icon-text">
Expand All @@ -63,13 +63,18 @@
class="force-clip is-ellipsis" />
</div>
</nuxt-link>
<time class="is-size-7 icon-text" v-if="list.timestamp">
<b-icon icon="clock" />
<span>{{ list.timestamp }}</span>
</time>
</div>
</div>
</div>
<div class="card-footer is-flex p-2">
<time class="is-size-7 icon-text" v-if="list.timestamp">
<b-icon icon="clock" />
<span>{{ list.timestamp }}</span>
</time>
<p class="control ml-auto" v-if="list.price">
<Money :value="list.price" inline />
</p>
</div>
</div>
</template>
</b-carousel-list>
Expand All @@ -83,7 +88,6 @@ import type { CarouselNFT } from './types'
import PrefixMixin from '~/utils/mixins/prefixMixin'

const components = {
// Identicon,
Loader: () => import('@/components/shared/Loader.vue'),
Money: () => import('@/components/shared/format/Money.vue'),
Identity: () => import('@/components/shared/format/Identity.vue'),
Expand Down Expand Up @@ -120,22 +124,19 @@ export default class CarouselList extends mixins(AuthMixin, PrefixMixin) {
itemsToShow: 1,
},
600: {
itemsToShow: 2,
itemsToShow: 1.5,
},
800: {
itemsToShow: 2.5,
itemsToShow: 2,
},
900: {
itemsToShow: 3,
itemsToShow: 2.5,
},
1000: {
itemsToShow: 3.5,
},
1200: {
itemsToShow: 4,
itemsToShow: 3,
},
1400: {
itemsToShow: 4.5,
itemsToShow: 3.5,
},
1800: {
itemsToShow: 5,
Expand All @@ -161,36 +162,21 @@ export default class CarouselList extends mixins(AuthMixin, PrefixMixin) {
}

.card {
background-color: #0e0e10;
.media-content {
width: 100%;
}
}

/* move to global */
.is-ellipsis {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}

.force-clip {
max-width: 85%;
max-height: 24px;
}

.card-image {
overflow: hidden;
}
</style>

<style lang="scss">
.card {
&:hover .carousel__image-wrapper img {
transform: scale(1.1);
transition: transform 0.3s linear;
.card-image {
overflow: hidden;
figure {
transition: transform 0.2s;
}
figure:hover {
transform: scale(1.1);
}
}
.carousel__image-wrapper img {
transition: all 0.3s;
.card-footer {
border-top-color: hsla(0, 0%, 60%, 1);
}
}
</style>
2 changes: 1 addition & 1 deletion components/bsx/Gallery/Item/ActionList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<b-tooltip
v-for="action in actions"
:key="action"
class="w-100"
append-to-body
:active="disableButton(action)"
position="is-left"
:label="disabledToolTips[action]">
Expand Down
2 changes: 1 addition & 1 deletion components/bsx/Offer/OffersUserTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@input="updateList"
:label="$t('offer.burnedToggle')"
size="is-medium"
labelColor="is-success" />
labelColor="has-text-success" />
<b-table :data="displayOffers(offers)">
<b-table-column
cell-class="is-vcentered is-narrow"
Expand Down
2 changes: 1 addition & 1 deletion components/bsx/Offer/StatsOverview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
{{ `${data.totalCount} /` }}
<Money :value="data.totalPrice" inline />
</p>
<p class="heading text-bold mb-5">
<p class="heading has-text-weight-bold mb-5">
{{
`${data.status} ${$t('statsOverview.offers')} / ${$t(
'statsOverview.values'
Expand Down
Loading