diff --git a/src/app/core/components/cookie-banner/cookie-banner.component.html b/src/app/core/components/cookie-banner/cookie-banner.component.html index 9986bc7dcfc4007b91f96208d0bbb9bb68f206c1..13467410fef9fa99c91b243ecbc3b8fee750e03d 100644 --- a/src/app/core/components/cookie-banner/cookie-banner.component.html +++ b/src/app/core/components/cookie-banner/cookie-banner.component.html @@ -48,9 +48,6 @@ <p i18n="@@cookieModal.tab1title">Why do we use cookies?</p> </div> <div class="tab" (click)='toggleTab(1)' [ngClass]="{'tab-active' : tab === 1}"> - <svg class="circle" width="11" height="11" viewBox="0 0 11 11" fill="none" xmlns="http://www.w3.org/2000/svg"> - <circle cx="5.5" cy="5.5" r="5.5" fill="#3C8225" /> - </svg> <p i18n="@@cookieModal.tab2title">Necessary cookies</p> </div> </div> diff --git a/src/app/core/components/cookie-banner/cookie-banner.component.scss b/src/app/core/components/cookie-banner/cookie-banner.component.scss index 423dd8c69d28d47918b424c21ae74dc6b7ce7e47..8eae3a3cc1922eca8008a6904082ef8961d67934 100644 --- a/src/app/core/components/cookie-banner/cookie-banner.component.scss +++ b/src/app/core/components/cookie-banner/cookie-banner.component.scss @@ -110,13 +110,15 @@ .box { width: 100%; max-width: 600px; - min-height: 360px; + min-height: 400px; background: #FFFFFF; box-shadow: 0px 4px 28px rgba(0, 0, 0, 0.55); position: relative; @media screen and(max-width: $tablet) { - margin: 95%; + width: calc(100% - 50px); + height: 450px; + max-width: unset; } .title { @@ -139,7 +141,7 @@ .content { display: flex; - height: 100%; + height: calc(450px - 53px); // minus the height of the popup header @media screen and(max-width: $tablet) { flex-direction: column; @@ -152,6 +154,7 @@ @media screen and(max-width: $tablet) { width: 100%; + display: flex; } .tab { @@ -160,6 +163,14 @@ border-bottom: 1px solid #B4B4B4; position: relative; + @media screen and(max-width: $tablet) { + width: 50%; + + &:not(:last-of-type) { + border-right: 1px solid $grey-super-light-color; + } + } + p { display: inline-block; } @@ -173,15 +184,32 @@ .tab-active { background: white; - //remove border - &:after { - content: ''; - height: 100%; - width: 2px; - position: absolute; - right: -2px; - top: 0; - background: white; + @media screen and(max-width: $tablet) { + + //remove border + &:after { + content: ''; + height: 2px; + width: 100%; + position: absolute; + bottom: -2px; + left: 0; + background: white; + } + } + + @media screen and(min-width: $tablet) { + + //remove border + &:after { + content: ''; + height: 100%; + width: 2px; + position: absolute; + right: -2px; + top: 0; + background: white; + } } } } @@ -191,6 +219,7 @@ border-left: 1px solid #B4B4B4; padding: 1.3rem 1rem; background-color: #fff; + overflow: auto; @media screen and(max-width: $tablet) { width: 100%; diff --git a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html index b4090f1b9ae5459e53d39a55c175fb2a663ee3e9..23ce465077a6d19a538209ad06a4b43e160e8058 100644 --- a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html +++ b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.html @@ -207,7 +207,7 @@ </svg> </button> <div class="resource-download-icon"> - <app-download-button [url]="queryableUrl" [fileName]="getFileName()"> + <app-download-button [url]="downloadUrl" [fileName]="getFileName()"> </app-download-button> </div> diff --git a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts index 405aaa50fd2ebabcb924f9315a20b77a12be4f96..0a57279dd22c34bd0e599856ecbf2fa19fef7b67 100644 --- a/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts +++ b/src/app/dataset-detail/components/dataset-api/resources-queryable/resource-queryable/resource-queryable.component.ts @@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; import { communeInsee } from '../../../../../../assets/resources/commune-insee'; import { geosource } from '../../../../../../i18n/traductions'; +import { APP_CONFIG } from '../../../../../core/services/app-config.service'; import { linkFormats, Metadata } from '../../../../../shared/models'; import { Format, Projection, Resource } from '../../../../models'; import { DatasetDetailService } from '../../../../services'; @@ -500,4 +501,11 @@ export class ResourceQueryableComponent implements OnInit { } } + + get downloadUrl() { + return this.queryableUrl.replace( + 'https://download.data.grandlyon.com', + `${APP_CONFIG.backendUrls.proxyQuery}/download`, + ); + } }