Skip to content

Fix theming usage #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Aug 17, 2022
Merged

Fix theming usage #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/firstrunwizard-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/firstrunwizard-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 12 additions & 0 deletions webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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