From ddbe0351dc97e9b709064a2fd104c986a7c77e46 Mon Sep 17 00:00:00 2001 From: amirhossein-haerian Date: Mon, 26 Aug 2024 15:18:16 +0200 Subject: [PATCH 1/3] feat(KUI-1400): upgrade kth/style --- package-lock.json | 8 ++++---- package.json | 2 +- server/views/helpers/index.js | 4 +++- server/views/partials/headerLogotype.handlebars | 5 ++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f745037..4267b611 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@kth/monitor": "^4.3.1", "@kth/server": "^4.1.0", "@kth/session": "^3.0.9", - "@kth/style": "^0.18.12", + "@kth/style": "^1.3.0", "@kth/ug-rest-api-helper": "^1.0.26", "axios": "^1.7.2", "body-parser": "^1.20.2", @@ -3539,9 +3539,9 @@ } }, "node_modules/@kth/style": { - "version": "0.18.12", - "resolved": "https://registry.npmjs.org/@kth/style/-/style-0.18.12.tgz", - "integrity": "sha512-QtRdFEJcpHNgtUdqrpCn9EVXOQw9Iu6tYLsFO0qgCfgbWWMzSq8d52NoV6rJ6JSNeqhA8tnwdXHprhtLTstA/w==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@kth/style/-/style-1.3.0.tgz", + "integrity": "sha512-/3ObH/f+KeolQoFXBhLRCUxcihDGnc1PDSsqsajtABgy4Q5oF45KB4OW7xL1gFQqyMfJfdU1CJfGSLGSKrFjgw==", "peerDependencies": { "react": "*" } diff --git a/package.json b/package.json index 9c41771e..059d5e3b 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@kth/monitor": "^4.3.1", "@kth/server": "^4.1.0", "@kth/session": "^3.0.9", - "@kth/style": "^0.18.12", + "@kth/style": "^1.3.0", "@kth/ug-rest-api-helper": "^1.0.26", "axios": "^1.7.2", "body-parser": "^1.20.2", diff --git a/server/views/helpers/index.js b/server/views/helpers/index.js index 66658a90..ee1d44ff 100644 --- a/server/views/helpers/index.js +++ b/server/views/helpers/index.js @@ -1,5 +1,5 @@ 'use strict' - +const handlebars = require('handlebars') const registerHeaderContentHelper = require('@kth/kth-node-web-common/lib/handlebars/helpers/headerContent') const { registerBreadcrumbHelper } = require('@kth/kth-node-web-common/lib/handlebars/helpers/breadcrumbs') const { registerLanguageLinkHelper } = require('@kth/kth-node-web-common/lib/handlebars/helpers/languageLink') @@ -41,3 +41,5 @@ require('@kth/kth-node-web-common/lib/handlebars/helpers/contentedit') const i18n = require('../../../i18n') require('@kth/kth-node-web-common/lib/handlebars/helpers/createI18nHelper')(i18n) require('@kth/kth-node-web-common/lib/handlebars/helpers/safe') + +handlebars.registerHelper('eq', (var1, var2) => var1.toString() === var2.toString()) diff --git a/server/views/partials/headerLogotype.handlebars b/server/views/partials/headerLogotype.handlebars index f9e8d7b7..6239219e 100644 --- a/server/views/partials/headerLogotype.handlebars +++ b/server/views/partials/headerLogotype.handlebars @@ -1,6 +1,9 @@
- Till KTH:s startsida + {{#if (eq theme "external")}} Till KTH:s startsida + {{else}} + Till KTH:s startsida + {{/if}}
\ No newline at end of file From 7f5b794964c994332a6fa4e9fa4aa90c34b1ad43 Mon Sep 17 00:00:00 2001 From: amirhossein-haerian Date: Tue, 27 Aug 2024 08:52:19 +0200 Subject: [PATCH 2/3] feat(KUI-1400): upgrade kth/style local-navigation --- public/css/_shared.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/public/css/_shared.scss b/public/css/_shared.scss index e3581ddc..8861cf5b 100644 --- a/public/css/_shared.scss +++ b/public/css/_shared.scss @@ -4,6 +4,15 @@ #app { padding-top: 30px; padding-bottom: 30px; + .kth-local-navigation--mobile { + display: block; + width: auto; + padding: 0; + + @media (min-width: 992px) { + display: none; + } + } & > .row { margin: 0; From d3effd50bd98cde2a4da8e82fd47f8f0fc31c5e6 Mon Sep 17 00:00:00 2001 From: amirhossein-haerian Date: Tue, 27 Aug 2024 20:20:13 +0200 Subject: [PATCH 3/3] feat(KUI-1400): revert local-navigation changes --- package-lock.json | 8 ++++---- package.json | 2 +- public/css/_shared.scss | 9 --------- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4267b611..f3f7c209 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@kth/monitor": "^4.3.1", "@kth/server": "^4.1.0", "@kth/session": "^3.0.9", - "@kth/style": "^1.3.0", + "@kth/style": "^1.4.2", "@kth/ug-rest-api-helper": "^1.0.26", "axios": "^1.7.2", "body-parser": "^1.20.2", @@ -3539,9 +3539,9 @@ } }, "node_modules/@kth/style": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@kth/style/-/style-1.3.0.tgz", - "integrity": "sha512-/3ObH/f+KeolQoFXBhLRCUxcihDGnc1PDSsqsajtABgy4Q5oF45KB4OW7xL1gFQqyMfJfdU1CJfGSLGSKrFjgw==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/@kth/style/-/style-1.4.2.tgz", + "integrity": "sha512-Z6EhjUVzhw+QITpnFsdLu51xogsgEXQiB1E+hEI2HsaFxTOrxkq6qbnN/uK1WWeTuKfi+A6szaVubPXswWRtyw==", "peerDependencies": { "react": "*" } diff --git a/package.json b/package.json index 059d5e3b..07a4a1c8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@kth/monitor": "^4.3.1", "@kth/server": "^4.1.0", "@kth/session": "^3.0.9", - "@kth/style": "^1.3.0", + "@kth/style": "^1.4.2", "@kth/ug-rest-api-helper": "^1.0.26", "axios": "^1.7.2", "body-parser": "^1.20.2", diff --git a/public/css/_shared.scss b/public/css/_shared.scss index 8861cf5b..e3581ddc 100644 --- a/public/css/_shared.scss +++ b/public/css/_shared.scss @@ -4,15 +4,6 @@ #app { padding-top: 30px; padding-bottom: 30px; - .kth-local-navigation--mobile { - display: block; - width: auto; - padding: 0; - - @media (min-width: 992px) { - display: none; - } - } & > .row { margin: 0;