Merge branch 'master' into auth

This commit is contained in:
Liyas Thomas
2020-01-23 08:53:03 +05:30
committed by GitHub
3 changed files with 36 additions and 14 deletions

View File

@@ -853,10 +853,7 @@ input[type="radio"]:checked + label + .tab {
} }
@media (max-width: $responsiveWidth) { @media (max-width: $responsiveWidth) {
.content { .content,
flex-flow: column;
}
.columns { .columns {
flex-flow: column; flex-flow: column;
} }

View File

@@ -397,15 +397,7 @@
<div class="flex-wrap"> <div class="flex-wrap">
<span v-if="version.name" class="mono"> <span v-if="version.name" class="mono">
<a <a
href="https://liyasthomas.web.app" class="link"
target="_blank"
rel="noopener"
>
<button class="icon" v-tooltip="'Liyas Thomas'">
🦄
</button>
</a>
<a
:href=" :href="
'https://github.com/liyasthomas/postwoman/releases/tag/' + 'https://github.com/liyasthomas/postwoman/releases/tag/' +
version.name version.name
@@ -416,6 +408,14 @@
> >
{{ version.name }} {{ version.name }}
</a> </a>
<a
class="link"
href="https://www.netlify.com"
target="_blank"
rel="noopener"
>
Powered by Netlify
</a>
<!-- <span v-if="version.hash"> <!-- <span v-if="version.hash">
- -
<a <a
@@ -427,6 +427,15 @@
<!-- <span v-if="version.variant">({{version.variant}})</span> --> <!-- <span v-if="version.variant">({{version.variant}})</span> -->
</span> </span>
<span> <span>
<a
href="https://liyasthomas.web.app"
target="_blank"
rel="noopener"
>
<button class="icon" v-tooltip="'Liyas Thomas'">
🦄
</button>
</a>
<a <a
href="mailto:liyascthomas@gmail.com" href="mailto:liyascthomas@gmail.com"
target="_blank" target="_blank"
@@ -633,7 +642,17 @@
</div> </div>
</template> </template>
<style scoped lang="scss"></style> <style scoped lang="scss">
.link {
margin: 8px 16px;
}
@media (max-width: 768px) {
.link {
display: flex;
flex: 1;
}
}
</style>
<script> <script>
import intializePwa from "../assets/js/pwa"; import intializePwa from "../assets/js/pwa";

View File

@@ -111,6 +111,12 @@ export const mutations = {
}, },
addNewCollection({ collections }, collection) { addNewCollection({ collections }, collection) {
const { name } = collection
const duplicateCollection = collections.some(item => item.name === name)
if (duplicateCollection) {
this.$toast.info('Duplicate collection');
return;
}
collections.push({ collections.push({
name: "", name: "",
folders: [], folders: [],