Skip to content

Commit

Permalink
Merge branch 'main' into issue-6466
Browse files Browse the repository at this point in the history
  • Loading branch information
vikiival authored Aug 14, 2023
2 parents cc0d9d7 + b123f32 commit d3102c9
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
2 changes: 2 additions & 0 deletions components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<div
class="fixed-stack is-flex is-align-items-center is-justify-content-space-between p-2">
<Search
v-if="isMobile"
ref="mobilSearchRef"
hide-filter
class="is-flex-grow-1 mt-3" />
Expand Down Expand Up @@ -71,6 +72,7 @@
<div class="navbar-start">
<div v-if="showSearchOnNavbar" class="navbar-item is-expanded">
<Search
v-if="!isMobile"
class="search-navbar is-flex-grow-1 pb-0 is-hidden-touch"
hide-filter
search-column-class="is-flex-grow-1" />
Expand Down
22 changes: 7 additions & 15 deletions components/accounts/AddressParser.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,16 @@
</div>
</template>

<script lang="ts">
import { Component, Emit, Prop, Vue } from 'vue-property-decorator'
<script setup lang="ts">
import { parseBatchAddresses } from './utils'
import { NeoField, NeoInput } from '@kodadot1/brick'
@Component({
components: {
NeoField,
NeoInput,
},
})
export default class AddressParser extends Vue {
@Prop({ type: Array, default: () => [], required: true }) value!: string[]
@Emit('input')
handleInput(event: string): string[] {
return parseBatchAddresses(event)
}
const emit = defineEmits(['input'])
defineProps<{ value: string[] }>()
function handleInput(event: string): string[] {
const address = parseBatchAddresses(event)
emit('input', address)
return address
}
</script>

Expand Down
3 changes: 2 additions & 1 deletion layouts/error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
alt="Internal error cat"
class="mb-5" />
<p class="subtitle">
If you think this should't happen, report it to us by
If you think this shouldn't happen, report it to us by
<a
target="_blank"
class="is-underlined has-text-k-orange"
rel="nofollow noopener noreferrer"
href="https://github.com/kodadot/nft-gallery/issues/new?assignees=&labels=bug&template=bug_report.md&title="
>creating a bug issue with steps and screenshot to reproduce.</a
Expand Down

0 comments on commit d3102c9

Please sign in to comment.