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

#6223 double stroke issues #6263

Merged
merged 12 commits into from
Jul 11, 2023
Merged

#6223 double stroke issues #6263

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5925da0
#6223 double stroke issues
prachi00 Jun 17, 2023
b1c8066
Merge branch 'main' into feat-double-stroke
prachi00 Jun 17, 2023
b561686
Merge branch 'main' into feat-double-stroke
prachi00 Jun 20, 2023
8259f94
Merge branch 'main' into feat-double-stroke
prachi00 Jun 20, 2023
233917a
conflicts
prachi00 Jun 22, 2023
17c5d50
Merge branch 'main' into feat-double-stroke
prachi00 Jun 24, 2023
8c530f9
Merge branch 'main' into feat-double-stroke
prachi00 Jun 27, 2023
fa66cb6
conflicts
prachi00 Jul 5, 2023
64a9d8c
Update components/collection/unlockable/UnlockableLoader.vue
prachi00 Jul 5, 2023
209836a
common css
prachi00 Jul 5, 2023
c7fc389
Merge branch 'main' into feat-double-stroke
prachi00 Jul 7, 2023
a97fd31
Merge branch 'main' into feat-double-stroke
prachi00 Jul 10, 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
8 changes: 8 additions & 0 deletions components/explore/ExploreGrid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:active="gridSize === 'large'"
@click.native="changeGridLayout(smallGridLayout, 'large')" />
<NeoButton
class="middle-icon"
icon-left="grid"
:active="gridSize === 'medium'"
@click.native="changeGridLayout(smallGridLayout, 'medium')" />
Expand Down Expand Up @@ -33,3 +34,10 @@ const changeGridLayout = (layout: string, grid: string) => {
preferencesStore.setGridSize(grid)
}
</script>

<style lang="scss" scoped>
.middle-icon {
border-left: 0 !important;
border-right: 0 !important;
}
</style>
4 changes: 2 additions & 2 deletions components/gallery/GalleryItemAction/GalleryItemActionSlides.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ defineProps<{
}

&-content {
border-left: initial;
border-left: initial !important;
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -64,7 +64,7 @@ defineProps<{
}

input {
border-left: 0;
border-left: 0 !important;
height: 54px;
outline: none;
width: 100%;
Expand Down
10 changes: 10 additions & 0 deletions components/massmint/Massmint.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
:active="tab === 'Mass Mint'"
:text="tab"
:to="route.path"
:class="{ 'tab-nft': tab === 'NFT' }"
class="mobile-width" />
</div>
</section>
Expand Down Expand Up @@ -266,3 +267,12 @@ const onDescriptionLoaded = (entries: Record<string, Entry>) => {
max-width: 45rem;
}
</style>

<style lang="scss">
.tab-nft {
.explore-tabs-button {
border-left: 0 !important;
border-right: 0 !important;
}
}
</style>
47 changes: 24 additions & 23 deletions components/navbar/CreateDropdown.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@
{{ $t('create') }}
</div>
</template>
<b-dropdown-item has-link>
<NeoTooltip
v-if="chain !== 'stmn'"
position="left"
:label="$t('createDropdown.start')"
multiline>
<nuxt-link data-cy="classic" :to="`/${urlPrefix}/create`">
{{ $t('classic') }}
</nuxt-link>
</NeoTooltip>
</b-dropdown-item>

<b-dropdown-item has-link>
<NeoTooltip
v-if="chain === 'stmn'"
position="left"
:label="$t('createDropdown.waifu')"
multiline>
<nuxt-link data-cy="waifu" :to="`/${urlPrefix}/waifu`">
{{ $t('navbar.create.waifu') }}
</nuxt-link>
</NeoTooltip>
</b-dropdown-item>
<template v-if="chain !== 'stmn'">
<b-dropdown-item has-link>
<NeoTooltip
position="left"
:label="$t('createDropdown.start')"
multiline>
<nuxt-link data-cy="classic" :to="`/${urlPrefix}/create`">
{{ $t('classic') }}
</nuxt-link>
</NeoTooltip>
</b-dropdown-item>
</template>
<template v-if="chain === 'stmn'">
<b-dropdown-item has-link>
<NeoTooltip
position="left"
:label="$t('createDropdown.waifu')"
multiline>
<nuxt-link data-cy="waifu" :to="`/${urlPrefix}/waifu`">
{{ $t('navbar.create.waifu') }}
</nuxt-link>
</NeoTooltip>
</b-dropdown-item>
</template>
<template v-if="chain === 'rmrk'">
<b-dropdown-item has-link>
<NeoTooltip
Expand Down