From addeb852200688170654d9bd687de75bc5d30a85 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 13 May 2019 21:54:25 +0300
Subject: [PATCH] fix prod build
---
.eslintrc.js | 1 +
build/webpack.prod.conf.js | 8 +++--
src/components/login_form/login_form.vue | 29 +++++++++++++++++--
.../post_status_form/post_status_form.vue | 2 +-
src/components/status/status.vue | 2 +-
5 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/.eslintrc.js b/.eslintrc.js
index 8c95cfb92..b526df679 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -27,6 +27,7 @@ module.exports = {
'vue/use-v-on-exact': 1,
'vue/no-parsing-error': 1,
'vue/require-v-for-key': 1,
+ 'vue/valid-v-for': 1,
'vue/require-prop-types': 1,
'vue/no-use-v-if-with-v-for': 1,
'indent': 1,
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 85ea1bee9..e7d25bfe3 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -17,17 +17,21 @@ let commitHash = require('child_process')
console.log(commitHash)
var webpackConfig = merge(baseWebpackConfig, {
+ mode: 'production',
module: {
rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, extract: true })
},
devtool: config.build.productionSourceMap ? '#source-map' : false,
optimization: {
- minimize: true
+ minimize: true,
+ splitChunks: {
+ chunks: 'all'
+ }
},
output: {
path: config.build.assetsRoot,
filename: utils.assetsPath('js/[name].[chunkhash].js'),
- chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+ chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
},
plugins: [
// http://vuejs.github.io/vue-loader/workflow/production.html
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 27a8e48aa..c6be2e00e 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -50,6 +50,10 @@
@import '../../_variables.scss';
.login-form {
+ display: flex;
+ flex-direction: column;
+ padding: 0.6em;
+
.btn {
min-height: 28px;
width: 10em;
@@ -66,9 +70,30 @@
align-items: center;
justify-content: space-between;
}
-}
-.login {
+ .form-group {
+ display: flex;
+ flex-direction: column;
+ padding: 0.3em 0.5em 0.6em;
+ line-height:24px;
+ }
+
+ .form-bottom {
+ display: flex;
+ padding: 0.5em;
+ height: 32px;
+
+ button {
+ width: 10em;
+ }
+
+ p {
+ margin: 0.35em;
+ padding: 0.35em;
+ display: flex;
+ }
+ }
+
.error {
text-align: center;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index b8b939366..4f014cc58 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -155,7 +155,7 @@
}
}
-.post-status-form, .login {
+.post-status-form {
.form-bottom {
display: flex;
padding: 0.5em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 02715253d..490e167bc 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -627,7 +627,7 @@ a.unmute {
flex: 1;
}
-.timeline > {
+.timeline :not(.panel-disabled) > {
.status-el:last-child {
border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
--
GitLab