From 6fe22e8b2d75bb4a80c1edf5fb7340595b281b69 Mon Sep 17 00:00:00 2001 From: rajatchauhanyti Date: Wed, 6 Apr 2022 17:36:54 +0530 Subject: [PATCH 1/7] increase the logo size and remove the background color from the image --- client/components/login.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/client/components/login.vue b/client/components/login.vue index f74a4744..e6b2d0bb 100644 --- a/client/components/login.vue +++ b/client/components/login.vue @@ -4,7 +4,7 @@ .login-sd .d-flex.mb-5 .login-logo - v-avatar(tile, size='34') + v-avatar(tile, size='44') v-img(:src='logoUrl') .login-title .text-h6.grey--text.text--darken-4 {{ siteTitle }} @@ -723,8 +723,8 @@ export default { padding: 12px 0 0 12px; width: 58px; height: 58px; - background-color: #222; - margin-left: 12px; + // background-color: #222; + // margin-left: 12px; border-bottom-left-radius: 7px; border-bottom-right-radius: 7px; } @@ -732,6 +732,7 @@ export default { &-title { height: 58px; padding-left: 12px; + padding-top: 8px; display: flex; align-items: center; text-shadow: .5px .5px #FFF; From 6e8b50507f010f6bd9d5fc2bc8ce98f7681d0f41 Mon Sep 17 00:00:00 2001 From: rajatchauhanyti Date: Thu, 7 Apr 2022 17:50:26 +0530 Subject: [PATCH 2/7] If the host, title, company, contentLicense, logoUrl is empty then the old value is updated on Administrator General setting. fix the issue --- server/graph/resolvers/site.js | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/server/graph/resolvers/site.js b/server/graph/resolvers/site.js index c325706c..b94caa85 100644 --- a/server/graph/resolvers/site.js +++ b/server/graph/resolvers/site.js @@ -38,30 +38,25 @@ module.exports = { SiteMutation: { async updateConfig(obj, args, context) { try { - if (args.host) { + if (args.hasOwnProperty('host')) { let siteHost = _.trim(args.host) if (siteHost.endsWith('/')) { siteHost = siteHost.slice(0, -1) } WIKI.config.host = siteHost } - - if (args.title) { + if (args.hasOwnProperty('title')) { WIKI.config.title = _.trim(args.title) } - - if (args.company) { + if (args.hasOwnProperty('company')) { WIKI.config.company = _.trim(args.company) } - - if (args.contentLicense) { + if (args.hasOwnProperty('contentLicense')) { WIKI.config.contentLicense = args.contentLicense } - - if (args.logoUrl) { + if (args.hasOwnProperty('logoUrl')) { WIKI.config.logoUrl = _.trim(args.logoUrl) } - WIKI.config.seo = { description: _.get(args, 'description', WIKI.config.seo.description), robots: _.get(args, 'robots', WIKI.config.seo.robots), From 8a15fc1b379eef2766218110784de24349c0144d Mon Sep 17 00:00:00 2001 From: rajatchauhanyti Date: Thu, 7 Apr 2022 17:55:31 +0530 Subject: [PATCH 3/7] revert and add empty line --- server/graph/resolvers/site.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server/graph/resolvers/site.js b/server/graph/resolvers/site.js index b94caa85..f36b2f7f 100644 --- a/server/graph/resolvers/site.js +++ b/server/graph/resolvers/site.js @@ -45,18 +45,23 @@ module.exports = { } WIKI.config.host = siteHost } + if (args.hasOwnProperty('title')) { WIKI.config.title = _.trim(args.title) } + if (args.hasOwnProperty('company')) { WIKI.config.company = _.trim(args.company) } + if (args.hasOwnProperty('contentLicense')) { WIKI.config.contentLicense = args.contentLicense } + if (args.hasOwnProperty('logoUrl')) { WIKI.config.logoUrl = _.trim(args.logoUrl) } + WIKI.config.seo = { description: _.get(args, 'description', WIKI.config.seo.description), robots: _.get(args, 'robots', WIKI.config.seo.robots), From a659494eab95d3eab24475c5292961f33a9eab20 Mon Sep 17 00:00:00 2001 From: rajatchauhanyti Date: Thu, 7 Apr 2022 18:43:40 +0530 Subject: [PATCH 4/7] intent the span, as this was exclude by the template if condition --- client/themes/default/components/nav-footer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/themes/default/components/nav-footer.vue b/client/themes/default/components/nav-footer.vue index 08e44fcd..91add8d1 100644 --- a/client/themes/default/components/nav-footer.vue +++ b/client/themes/default/components/nav-footer.vue @@ -4,7 +4,7 @@ template(v-if='company && company.length > 0 && contentLicense !== ``') span(v-if='contentLicense === `alr`') {{ $t('common:footer.copyright', { company: company, year: currentYear, interpolation: { escapeValue: false } }) }} |  span(v-else) {{ $t('common:footer.license', { company: company, license: $t('common:license.' + contentLicense), interpolation: { escapeValue: false } }) }} |  - span {{ $t('common:footer.poweredBy') }} #[a(href='https://wiki.js.org', ref='nofollow') Wiki.js] + span {{ $t('common:footer.poweredBy') }} #[a(href='https://wiki.js.org', ref='nofollow') Wiki.js]