diff --git a/website/client/assets/svg/for-css/confetti.svg b/website/client/assets/svg/for-css/confetti.svg
new file mode 100644
index 0000000000..82016786f3
--- /dev/null
+++ b/website/client/assets/svg/for-css/confetti.svg
@@ -0,0 +1,295 @@
+
+
\ No newline at end of file
diff --git a/website/client/components/appMenu.vue b/website/client/components/appMenu.vue
index 41d7052758..22cb752eca 100644
--- a/website/client/components/appMenu.vue
+++ b/website/client/components/appMenu.vue
@@ -96,6 +96,32 @@ div
}
}
+ @media only screen and (max-width : 1224px) and (min-width: 1200px) {
+ #nav_collapse {
+ margin-top: 37em !important;
+
+ a {
+ width: 100%;
+ }
+ }
+
+ .navbar-collapse.collapse {
+ display: none !important;
+ }
+
+ .navbar-collapse.collapse.show {
+ display: block !important;
+ }
+
+ .navbar-toggler, .navbar-nav {
+ display: block;
+ }
+
+ .navbar-toggleable-lg .navbar-collapse {
+ display: block;
+ }
+ }
+
nav.navbar {
background: $purple-100 url(~assets/svg/for-css/bits.svg) right no-repeat;
padding-left: 25px;
diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue
index c85fc222a8..3e4d34856c 100644
--- a/website/client/components/groups/group.vue
+++ b/website/client/components/groups/group.vue
@@ -131,7 +131,7 @@
.toggle-down(@click="sections.summary = !sections.summary", v-if="!sections.summary")
.svg-icon(v-html="icons.downIcon")
.section(v-if="sections.summary")
- p {{ group.summary }}
+ p(v-markdown='group.summary')
.section-header
.row
diff --git a/website/client/components/groups/publicGuildItem.vue b/website/client/components/groups/publicGuildItem.vue
index 49db639037..88b5ea8d58 100644
--- a/website/client/components/groups/publicGuildItem.vue
+++ b/website/client/components/groups/publicGuildItem.vue
@@ -13,7 +13,7 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
.col-md-8
router-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
h3 {{ guild.name }}
- p(v-if='guild.summary') {{ guild.summary }}
+ p(v-if='guild.summary', v-markdown='guild.summary')
p(v-else) {{ guild.name }}
.col-md-2.cta-container
button.btn.btn-danger(v-if='isMember && displayLeave' @click='leave()', v-once) {{ $t('leave') }}
@@ -111,6 +111,7 @@ router-link.card-link(:to="{ name: 'guild', params: { groupId: guild._id } }")
import moment from 'moment';
import { mapState } from 'client/libs/store';
import groupUtilities from 'client/mixins/groupsUtilities';
+import markdown from 'client/directives/markdown';
import findIndex from 'lodash/findIndex';
import gemIcon from 'assets/svg/gem.svg';
import goldGuildBadgeIcon from 'assets/svg/gold-guild-badge-large.svg';
@@ -119,6 +120,9 @@ import bronzeGuildBadgeIcon from 'assets/svg/bronze-guild-badge-large.svg';
export default {
mixins: [groupUtilities],
+ directives: {
+ markdown,
+ },
props: ['guild', 'displayLeave', 'displayGemBank'],
computed: {
...mapState({user: 'user.data'}),
diff --git a/website/client/components/groups/tavern.vue b/website/client/components/groups/tavern.vue
index 18bc57243b..1962718819 100644
--- a/website/client/components/groups/tavern.vue
+++ b/website/client/components/groups/tavern.vue
@@ -527,7 +527,7 @@ export default {
},
async sendMessage () {
let response = await this.$store.dispatch('chat:postChat', {
- groupId: TAVERN_ID,
+ group: this.group,
message: this.newMessage,
});
this.group.chat.unshift(response.message);
diff --git a/website/client/components/notifications.vue b/website/client/components/notifications.vue
index 7703af4653..ff034cdc8e 100644
--- a/website/client/components/notifications.vue
+++ b/website/client/components/notifications.vue
@@ -27,6 +27,62 @@ div
quest-invitation
+
+