Skip to content

Commit

Permalink
Merge pull request #298 from geonetwork/fix-datahub-layout
Browse files Browse the repository at this point in the history
Datahub / layout fixes
  • Loading branch information
jahow authored Aug 30, 2022
2 parents b82a771 + c5729d5 commit c092f77
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<datahub-home-header [expandRatio]="expandRatio"></datahub-home-header>
</ng-template>
</gn-ui-sticky-header>
<main>
<main class="px-5">
<router-outlet></router-outlet>
</main>
</div>
6 changes: 4 additions & 2 deletions apps/datahub/src/app/home/news-page/news-page.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
--full-width: 100%;
--container-width: min(1024px, var(--full-width));
--right-col-width: 320px;
--padding: -20px; /* compensate from router outlet padding */
}

.backdrop {
position: absolute;
height: 100%;
top: 0;
right: 0;
right: var(--padding);
width: calc(
var(--right-col-width) + (var(--full-width) - var(--container-width)) / 2
var(--right-col-width) - var(--padding) +
(var(--full-width) - var(--container-width)) / 2
);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="relative">
<div class="backdrop bg-gray-50"></div>
<div class="relative pt-[44px] container-lg mx-auto flex">
<div class="pr-[61px] overflow-hidden flex-grow">
<div class="pr-0 lg:pr-[61px] overflow-hidden flex-grow">
<h2
class="text-2xl font-title text-primary leading-7 text-left mb-8"
translate
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div>
<div class="container-lg mx-auto">
<gn-ui-organisations></gn-ui-organisations>
</div>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="flex cursor-pointer flex-wrap sm:flex-nowrap">
<div class="container-lg mx-auto flex cursor-pointer flex-wrap sm:flex-nowrap">
<div class="flex-shrink-0 w-full sm:w-52">
<div
class="overflow-hidden bg-gray-100 rounded-lg w-full border border-gray-300 h-36"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div class="px-3 sm:p-7 sm:my-8 sm:shadow-primary-light sm:rounded-2xl">
<datahub-search-summary></datahub-search-summary>
</div>
<div>
<gn-ui-results-list-container
[scrollableOptions]="scrollableOptions"
(mdSelect)="onMetadataSelection($event)"
></gn-ui-results-list-container>
<div class="container-lg mx-auto">
<div class="px-3 sm:p-7 sm:my-8 sm:shadow-primary-light sm:rounded-2xl">
<datahub-search-summary></datahub-search-summary>
</div>
<div>
<gn-ui-results-list-container
[scrollableOptions]="scrollableOptions"
(mdSelect)="onMetadataSelection($event)"
></gn-ui-results-list-container>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{ metadata.title }}
</div>

<div class="absolute" style="top: 20px">
<div class="absolute" style="left: 16px; top: 16px">
<gn-ui-navigation-button
(click)="back()"
[label]="'datahub.search.back' | translate"
Expand Down

0 comments on commit c092f77

Please sign in to comment.