Skip to content
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

feat(KUI-1401): upgrade kth/style #392

Merged
merged 3 commits into from
Aug 28, 2024
Merged

feat(KUI-1401): upgrade kth/style #392

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
056c193
feat(KUI-1401): upgrade kth/style
amirhossein-haerian Aug 26, 2024
e8f7deb
feat(KUI-1401): upgrade kth/style local-navigation
amirhossein-haerian Aug 27, 2024
a561143
feat(KUI-1401): revert local-navigation changes
amirhossein-haerian Aug 27, 2024
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
8 changes: 4 additions & 4 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@kth/monitor": "^4.2.1",
"@kth/server": "^4.1.0",
"@kth/session": "^3.0.9",
"@kth/style": "^0.18.6",
"@kth/style": "^1.3.0",
"axios": "^1.6.7",
"body-parser": "^1.20.2",
"cookie-parser": "^1.4.6",
Expand Down
9 changes: 9 additions & 0 deletions public/css/_shared.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion server/views/helpers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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')
Expand Down Expand Up @@ -44,3 +44,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())
5 changes: 4 additions & 1 deletion server/views/partials/headerLogotype.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<a href="/student" class="kth-logotype">
<figure>
<img class="blue" alt="Till KTH:s startsida" width="64" height="64" src="{{{proxyPrefix}}}/assets/logotype/logotype-blue.svg">
{{#if (eq theme "external")}}
<img class="white" alt="Till KTH:s startsida" width="64" height="64" src="{{{proxyPrefix}}}/assets/logotype/logotype-white.svg">
{{else}}
<img class="blue" alt="Till KTH:s startsida" width="64" height="64" src="{{{proxyPrefix}}}/assets/logotype/logotype-blue.svg">
{{/if}}
</figure>
</a>
Loading