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

Jump to bottom

[Snyk] Upgrade xlsx from 0.17.5 to 0.18.5 #14

Open
wants to merge 2 commits into
base: geocat
Choose a base branch
from
Open

[Snyk] Upgrade xlsx from 0.17.5 to 0.18.5 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2072ba1
geocat: adapt UI to latest geocat mockups (#12)
tkohr Mar 22, 2024
4e509dd
fix: upgrade xlsx from 0.17.5 to 0.18.5
snyk-bot Apr 10, 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
2 changes: 1 addition & 1 deletion apps/datahub/src/app/home/navigation-menu/navigation-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
? 'decoration-primary'
: 'decoration-transparent hover:decoration-primary transition-colors'
"
class="hidden sm:block sm:py-4 uppercase truncate underline decoration-4 underline-offset-[19px]"
class="hidden sm:block sm:py-4 uppercase truncate font-title text-sm underline decoration-4 underline-offset-[19px]"
[style.color]="foregroundColor"
translate
>
Expand Down
4 changes: 2 additions & 2 deletions apps/datahub/src/app/home/navigation-menu/navigation-menu.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
ROUTER_ROUTE_NEWS,
ROUTER_ROUTE_ORGANISATIONS,
} from '../../router/constants'
import { getThemeConfig } from '@geonetwork-ui/util/app-config'
// import { getThemeConfig } from '@geonetwork-ui/util/app-config'

marker('datahub.header.news')
marker('datahub.header.datasets')
Expand All @@ -21,7 +21,7 @@ marker('datahub.header.organisations')
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class NavigationMenuComponent {
foregroundColor = getThemeConfig().HEADER_FOREGROUND_COLOR || '#ffffff'
foregroundColor = /*getThemeConfig().HEADER_FOREGROUND_COLOR ||*/ '#ffffff'
displayMobileMenu = false
tabLinks = [
{
Expand Down
9 changes: 5 additions & 4 deletions apps/datahub/src/app/record/header-record/header-record.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
[label]="'datahub.search.back' | translate"
[icon]="'arrow_back'"
[style.--navigation-button-color]="foregroundColor"
[style.--color-background]="'#ffffff'"
>
</gn-ui-navigation-button>
</div>
Expand All @@ -17,17 +18,17 @@
*ngIf="metadata?.uniqueIdentifier"
[record]="metadata"
[displayCount]="false"
class="flex text-background content-center"
class="flex text-background content-center bg-white rounded px-2 items-center justify-center font-semibold text-sm leading-5"
[style.color]="foregroundColor"
[style.--star-toggle-enabled-color]="foregroundColor"
[style.--star-toggle-disabled-color]="foregroundColor"
></gn-ui-favorite-star>
<gn-ui-language-switcher
<!-- <gn-ui-language-switcher
*ngIf="showLanguageSwitcher"
class="language-switcher text-[13px] mt-0.5"
[style.--color-main]="foregroundColor"
[style.--color-gray-300]="foregroundColor"
></gn-ui-language-switcher>
></gn-ui-language-switcher> -->
</div>
</div>
<div
Expand All @@ -39,7 +40,7 @@
</div>
<div
class="flex flex-row flex-wrap gap-2 mb-4 ml-4 sm:mr-[332px]"
[style.color]="foregroundColor"
[style.color]="'#ffffff'"
>
<div
*ngIf="(isGeodata$ | async) === true"
Expand Down
9 changes: 5 additions & 4 deletions libs/ui/inputs/src/lib/navigation-button/navigation-button.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<button
class="group flex items-center justify-center gap-1 backdrop-blur p-1 bg-primary-opacity-30 rounded content-center"
class="bg-white text-xs font-semibold group flex items-center justify-center gap-1 backdrop-blur py-1.5 px-2 bg-primary-opacity-30 rounded content-center"
>
<mat-icon class="material-symbols-outlined align-middle w-[18px]">{{
icon
}}</mat-icon>
<mat-icon
class="material-symbols-outlined align-middle w-[18px] text-primary"
>{{ icon }}</mat-icon
>
<span
class="mx-2 mt-0.5 text-[16px] tracking-widest content-center opacity-75"
>{{ label.toUpperCase() }}</span
Expand Down
2 changes: 1 addition & 1 deletion package/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
"tslib": "^2.3.0",
"typeorm": "^0.3.14",
"whatwg-fetch": "^3.6.2",
"xlsx": "^0.17.3"
"xlsx": "^0.18.5"
}
}
4 changes: 4 additions & 0 deletions tailwind.base.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ module.exports = {
'var(--font-family-title, ui-serif, Georgia, Cambria, "Times New Roman", Times, serif)', // alias for serif
mono: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
},
// specific for geocat
fontWeight: {
title: '600',
},
fontSize: {
13: '13px',
21: [
Expand Down
Loading