Skip to content

Commit

Permalink
Merge pull request #663 from geonetwork/org-scale
Browse files Browse the repository at this point in the history
Datahub: fine tuning
  • Loading branch information
fgravin authored Nov 3, 2023
2 parents 95ebc52 + 44f34f8 commit 48ffc34
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion apps/metadata-editor/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class AppModule {
ThemeService.applyCssVariables(
getThemeConfig().PRIMARY_COLOR,
getThemeConfig().SECONDARY_COLOR,
getThemeConfig().MAIN_COLOR || '#475569',
getThemeConfig().MAIN_COLOR || '#555',
getThemeConfig().BACKGROUND_COLOR,
getThemeConfig().MAIN_FONT || "'Rubik', sans-serif",
getThemeConfig().TITLE_FONT || "'Readex Pro', sans-serif",
Expand Down
2 changes: 1 addition & 1 deletion conf/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ proxy_path = ""
[theme]
primary_color = "#c82850"
secondary_color = "#001638"
main_color = "#212029" # All-purpose text color
main_color = "#555" # All-purpose text color
background_color = "#fdfbff"

# These optional parameters indicate which background should be used for the main header and the text color used
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[title]="organisation.name"
>
<div
class="flex-shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36 group-hover:shadow-xl group-hover:border-0"
class="flex-shrink-0 bg-gray-100 rounded-lg overflow-hidden w-full border border-gray-300 h-36"
>
<gn-ui-thumbnail
class="relative h-full w-full"
Expand All @@ -15,7 +15,7 @@
</div>
<div class="px-3 pb-2 capitalize flex flex-col flex-grow overflow-hidden">
<span
class="flex-shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2"
class="flex-shrink-0 mb-3 mt-5 font-title text-21 text-title group-hover:text-primary line-clamp-2 sm:mt-2 transition-colors"
data-cy="organizationName"
>
{{ organisation.name }}</span
Expand Down
4 changes: 2 additions & 2 deletions libs/ui/dataviz/src/lib/figure/figure.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
{{ icon }}
</mat-icon>
<div class="shrink overflow-hidden">
<div class="figure-block text-[1.5em] text-main">
<div class="figure-block text-[1.5em] text-black">
<span class="figure font-medium mr-[0.3em]">{{ figure }}</span>
<span class="unit text-[0.665em]">{{ unit }}</span>
</div>
<div class="title text-gray-900 truncate">{{ title }}</div>
<div class="title truncate">{{ title }}</div>
</div>
</div>
4 changes: 2 additions & 2 deletions libs/ui/dataviz/src/lib/figure/figure.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ describe('FigureComponent', () => {
'bg-primary'
)
})
it('label is main text color', () => {
it('label is black text color', () => {
expect(compiled.querySelector('.figure-block')?.className).toContain(
'text-main'
'text-black'
)
})
it('has a tooltip containing the information', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@
>
<div *ngIf="metadata.recordUpdated">
<p class="text-sm" translate>record.metadata.updatedOn</p>
<p class="text-primary font-medium mt-[4px]">
<p class="text-primary font-medium mt-1">
{{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}
</p>
</div>
<div *ngIf="metadata.updateFrequency">
<p class="text-sm" translate>record.metadata.updateFrequency</p>
<p class="text-primary font-medium mt-[4px]" translate>
<p class="text-primary font-medium mt-1" translate>
domain.record.updateFrequency.{{ metadata.updateFrequency }}
</p>
</div>
<div *ngIf="metadata.status">
<p class="text-sm" translate>record.metadata.updateStatus</p>
<p class="text-primary font-medium mt-[4px]" translate>
<p class="text-primary font-medium mt-1" translate>
domain.record.status.{{ metadata.status }}
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</div>
</div>
<div
class="content duration-250 overflow-hidden transition-[max-height]"
class="content overflow-hidden transition-[max-height] duration-300"
[ngClass]="collapsed ? 'ease-out' : 'ease-in'"
[style.maxHeight]="maxHeight"
#contentDiv
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
>
{{ contact.firstName }} {{ contact.lastName }}
</span>
<p class="text-gray-900">
<p class="">
<span translate [translateParams]="{ time }"
>record.was.created.time</span
>
Expand All @@ -55,12 +55,12 @@
></ng-container>
</div>
<h1
class="font-title text-[21px] font-medium mb-3 pr-8"
class="font-title text-black text-[21px] font-medium mb-3 pr-8"
data-cy="recordTitle"
>
{{ record.title }}
</h1>
<p class="text-gray-900 line-clamp-3">{{ abstract }}</p>
<p class="line-clamp-3">{{ abstract }}</p>
<gn-ui-thumbnail
*ngIf="record.overviews?.[0]"
class="block mt-3 w-full h-[136px] border border-gray-100 rounded-lg overflow-hidden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
>
<div class="mb-3 mt-5 sm:mt-2">
<div
class="font-title text-21 text-title line-clamp-2 col-start-1 col-span-2 sm:line-clamp-1 group-hover:text-primary"
class="font-title text-21 text-title line-clamp-2 col-start-1 col-span-2 sm:line-clamp-1 group-hover:text-primary transition-colors"
data-cy="recordTitle"
>
{{ record.title }}
Expand Down

0 comments on commit 48ffc34

Please sign in to comment.