diff --git a/webpack/webpack.dev.conf.js b/webpack/webpack.dev.conf.js index 16e9d116c3..75d6741d08 100644 --- a/webpack/webpack.dev.conf.js +++ b/webpack/webpack.dev.conf.js @@ -7,7 +7,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin'); // add hot-reload related code to entry chunks Object.keys(baseWebpackConfig.entry).forEach((name) => { - baseWebpackConfig.entry[name] = ['./webpack/dev-client'].concat(baseWebpackConfig.entry[name]); + baseWebpackConfig.entry[name] = baseWebpackConfig.entry[name].concat('./webpack/dev-client'); }); module.exports = merge(baseWebpackConfig, { diff --git a/website/client/app.vue b/website/client/app.vue index 33c6e36efd..3db19cdda8 100644 --- a/website/client/app.vue +++ b/website/client/app.vue @@ -49,6 +49,10 @@ div margin-bottom: 1em; } + .row { + width: 100%; + } + h2 { color: #fff; font-size: 32px; diff --git a/website/client/assets/scss/task.scss b/website/client/assets/scss/task.scss index 174b2691bd..408b15b15b 100644 --- a/website/client/assets/scss/task.scss +++ b/website/client/assets/scss/task.scss @@ -223,6 +223,7 @@ .svg-icon { width: 10px; + height: 10px; margin: 0 auto; } diff --git a/website/client/components/groups/createPartyModal.vue b/website/client/components/groups/createPartyModal.vue index 5860a3441c..74beb78f0c 100644 --- a/website/client/components/groups/createPartyModal.vue +++ b/website/client/components/groups/createPartyModal.vue @@ -57,6 +57,7 @@ b-modal#create-party-modal(title="Empty", size='lg', hide-footer=true) .header-wrap { padding: 0; color: #4e4a57; + width: 100%; .quest_screen { background-image: url('~client/assets/images/quest_screen.png'); diff --git a/website/client/components/groups/group.vue b/website/client/components/groups/group.vue index 9854858da7..34f705ca44 100644 --- a/website/client/components/groups/group.vue +++ b/website/client/components/groups/group.vue @@ -146,6 +146,7 @@ .svg-icon.shield, .svg-icon.gem { width: 28px; + height: 28px; margin: 0 auto; display: inline-block; vertical-align: bottom; diff --git a/website/client/components/snackbars/notification.vue b/website/client/components/snackbars/notification.vue index b31c5a9f9e..ed3d59e137 100644 --- a/website/client/components/snackbars/notification.vue +++ b/website/client/components/snackbars/notification.vue @@ -64,6 +64,7 @@ transition(name="fade") .svg-icon { width: 20px; + height: 20px; margin-right: .5em; } diff --git a/website/client/components/tasks/spells.vue b/website/client/components/tasks/spells.vue index de3390f990..3f8c620c48 100644 --- a/website/client/components/tasks/spells.vue +++ b/website/client/components/tasks/spells.vue @@ -103,6 +103,7 @@ div(v-if='user.stats.lvl > 10') .svg-icon { width: 16px; + height: 16px; margin-right: .2em; } } diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue index 93a72d56cb..f65439ecb1 100644 --- a/website/client/components/tasks/taskModal.vue +++ b/website/client/components/tasks/taskModal.vue @@ -492,8 +492,13 @@ border-top-left-radius: 8px; border-top-right-radius: 8px; margin-top: 50px; + width: 100%; - + span { + display: block; + margin: 0 auto; + width: 50px; + } .delete-task-btn { color: $red-50; diff --git a/website/client/components/userMenu/profile.vue b/website/client/components/userMenu/profile.vue index 435eebeed2..b57e16a1bc 100644 --- a/website/client/components/userMenu/profile.vue +++ b/website/client/components/userMenu/profile.vue @@ -1,7 +1,7 @@