Merge pull request #731 from nextcloud/fix/25

nextcloud · Aug 17, 2022 · 8c2868a · 8c2868a
2 parents b97275b + 8d2badb
commit 8c2868a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/js/firstrunwizard-main.js b/js/firstrunwizard-main.js
diff --git a/js/firstrunwizard-main.js.map b/js/firstrunwizard-main.js.map
diff --git a/src/App.vue b/src/App.vue
@@ -371,13 +371,19 @@ export default {
 		flex-shrink: 0;
 
 		.firstrunwizard-header {
+			background-size: var(--image-background-size, 275px, contain);
+			background-position: 50% 50%;
+			// Use custom background or plain primary colour if defined
+			// or fallback to default background with gradient
+			background-image: var(--image-background, var(--image-background-plain, url("../../../core/img/background.svg"), linear-gradient(
+		40deg, #0082c9 0%, #30b6ff 100%)));
+			background-color: var(--color-primary);
 			padding: 20px 12px;
-			background: var(--color-primary) var(--image-login-background) no-repeat 50% 50%;
-			background-size: cover;
 			color: var(--color-primary-text);
 			text-align: center;
 			.logo {
-				background: var(--image-logo) no-repeat center;
+				// Use custom logo if defined or fallback to default one
+				background: var(--image-logo, url("../../../core/img/logo/logo.svg")) no-repeat center;
 				background-size: contain;
 				width: 175px;
 				height: 100px;

diff --git a/webpack.js b/webpack.js
@@ -1,3 +1,15 @@
 const webpackConfig = require('@nextcloud/webpack-vue-config')
+const webpackRules = require('@nextcloud/webpack-vue-config/rules')
+
+// Don't inline scss urls
+const cssLoaderIndex = webpackRules.RULE_SCSS.use.findIndex(rule => rule === 'css-loader')
+webpackRules.RULE_SCSS.use[cssLoaderIndex] = {
+	loader: 'css-loader',
+	options: {
+		url: false
+	},
+}
+
+webpackConfig.module.rules = Object.values(webpackRules)
 
 module.exports = webpackConfig