diff --git a/src/app/components/observation/observation/observation.component.css b/src/app/components/observation/observation/observation.component.css index f07ae8fc1..17115e639 100644 --- a/src/app/components/observation/observation/observation.component.css +++ b/src/app/components/observation/observation/observation.component.css @@ -1,7 +1,7 @@ :host { display: block; - margin-left: 0; - margin-right: 0; + max-width: var(--desktop-max-width); + margin: 0 auto; margin-top: 16px; background-color: white; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); diff --git a/src/app/modules/login/pages/user-information/user-information.page.scss b/src/app/modules/login/pages/user-information/user-information.page.scss index 6aee7f3fd..36803dbfd 100644 --- a/src/app/modules/login/pages/user-information/user-information.page.scss +++ b/src/app/modules/login/pages/user-information/user-information.page.scss @@ -10,6 +10,7 @@ background: var(--background-color-menu); border-radius: var(--border-radius-large); --ion-grid-padding: 32px; + max-width: var(--desktop-max-width); } .profile-icon { diff --git a/src/app/modules/registration/components/registration-content-wrapper/registration-content-wrapper.component.scss b/src/app/modules/registration/components/registration-content-wrapper/registration-content-wrapper.component.scss index 23a5afe00..97d47ba3b 100644 --- a/src/app/modules/registration/components/registration-content-wrapper/registration-content-wrapper.component.scss +++ b/src/app/modules/registration/components/registration-content-wrapper/registration-content-wrapper.component.scss @@ -1,4 +1,9 @@ ion-col { - max-width: 600px; + max-width: var(--desktop-max-width); + margin: 0 auto; +} + +ion-grid { + max-width: var(--form-max-width); margin: 0 auto; } diff --git a/src/app/modules/registration/pages/overview/overview.page.scss b/src/app/modules/registration/pages/overview/overview.page.scss index 657807552..ef5141299 100644 --- a/src/app/modules/registration/pages/overview/overview.page.scss +++ b/src/app/modules/registration/pages/overview/overview.page.scss @@ -7,7 +7,7 @@ ion-list { } .content-wrapper { - max-width: 960px; + max-width: var(--form-max-width); margin: auto; ion-item { diff --git a/src/app/modules/shared/components/images-grid/images-grid.ts/images-grid.component.scss b/src/app/modules/shared/components/images-grid/images-grid.ts/images-grid.component.scss index 9f25f9265..472330fa1 100644 --- a/src/app/modules/shared/components/images-grid/images-grid.ts/images-grid.component.scss +++ b/src/app/modules/shared/components/images-grid/images-grid.ts/images-grid.component.scss @@ -1,5 +1,5 @@ :host { - max-width: 960px; + max-width: var(--desktop-max-width); margin: auto; display: flex; flex-wrap: wrap; diff --git a/src/app/pages/my-observations/components/draft-list/draft-list.component.scss b/src/app/pages/my-observations/components/draft-list/draft-list.component.scss index 7dfabf483..529fdc157 100644 --- a/src/app/pages/my-observations/components/draft-list/draft-list.component.scss +++ b/src/app/pages/my-observations/components/draft-list/draft-list.component.scss @@ -1,3 +1,7 @@ ion-item-divider { margin-bottom: 10px; } + +ion-list { + width: 100%; +} diff --git a/src/app/pages/my-observations/components/sent-list/sent-list.component.html b/src/app/pages/my-observations/components/sent-list/sent-list.component.html index 92e84acae..d6f521007 100644 --- a/src/app/pages/my-observations/components/sent-list/sent-list.component.html +++ b/src/app/pages/my-observations/components/sent-list/sent-list.component.html @@ -1,4 +1,3 @@ - diff --git a/src/app/pages/my-observations/my-observations.page.html b/src/app/pages/my-observations/my-observations.page.html index cdff7391f..c2413dc5c 100644 --- a/src/app/pages/my-observations/my-observations.page.html +++ b/src/app/pages/my-observations/my-observations.page.html @@ -8,21 +8,23 @@ - - - - - - - - - - - -

{{ "MY_OBSERVATIONS.NO_OBSERVATIONS" | translate }}

-

{{ "MY_OBSERVATIONS.NO_OBSERVATIONS_TEXT" | translate }}

-
-
-
+
+ + + + + + + + + + + +

{{ "MY_OBSERVATIONS.NO_OBSERVATIONS" | translate }}

+

{{ "MY_OBSERVATIONS.NO_OBSERVATIONS_TEXT" | translate }}

+
+
+
+
diff --git a/src/app/pages/my-observations/my-observations.page.scss b/src/app/pages/my-observations/my-observations.page.scss index a880bc487..1f81a4bf7 100644 --- a/src/app/pages/my-observations/my-observations.page.scss +++ b/src/app/pages/my-observations/my-observations.page.scss @@ -7,3 +7,8 @@ ion-spinner { margin-top: 10px; margin-bottom: 10px; } + +main { + max-width: var(--desktop-max-width); + margin: 0 auto; +} diff --git a/src/app/pages/observation-list/empty-state/empty-state.component.scss b/src/app/pages/observation-list/empty-state/empty-state.component.scss index 30508eafb..b460525be 100644 --- a/src/app/pages/observation-list/empty-state/empty-state.component.scss +++ b/src/app/pages/observation-list/empty-state/empty-state.component.scss @@ -8,7 +8,7 @@ } ion-row { - max-width: 960px; + max-width: var(--desktop-max-width); margin: 10px auto; gap: 10px; } diff --git a/src/app/pages/observation-list/error-state/error-state.component.css b/src/app/pages/observation-list/error-state/error-state.component.css index af4a55260..286c031a3 100644 --- a/src/app/pages/observation-list/error-state/error-state.component.css +++ b/src/app/pages/observation-list/error-state/error-state.component.css @@ -8,7 +8,7 @@ } ion-row { - max-width: 960px; + max-width: var(--desktop-max-width); margin: 10px auto; gap: 10px; } diff --git a/src/app/pages/observation-list/image-list/image-list.component.css b/src/app/pages/observation-list/image-list/image-list.component.css index 0cf44f1fe..c522a678b 100644 --- a/src/app/pages/observation-list/image-list/image-list.component.css +++ b/src/app/pages/observation-list/image-list/image-list.component.css @@ -1,7 +1,6 @@ :host { display: block; height: 100%; - --max-width: var(--list-search-max-width, 960px); } ion-content { @@ -14,7 +13,7 @@ ion-content::part(scroll) { } .list-header { - max-width: var(--max-width); + max-width: var(--desktop-max-width); margin: 0 auto; } diff --git a/src/app/pages/observation-list/observation-list/observation-list.component.css b/src/app/pages/observation-list/observation-list/observation-list.component.css index 8a91fa2e4..cf13da887 100644 --- a/src/app/pages/observation-list/observation-list/observation-list.component.css +++ b/src/app/pages/observation-list/observation-list/observation-list.component.css @@ -2,19 +2,17 @@ display: block; height: 100%; width: 100%; - - --max-width: var(--list-search-max-width, 960px); } .list-header { - max-width: var(--max-width); + max-width: var(--desktop-max-width); margin: 0 auto; } .list { height: 100%; width: 100%; - max-width: var(--max-width); + max-width: var(--desktop-max-width); margin: 0 auto; } diff --git a/src/app/pages/user-settings/user-settings.page.html b/src/app/pages/user-settings/user-settings.page.html index 7d7f24269..0151410af 100644 --- a/src/app/pages/user-settings/user-settings.page.html +++ b/src/app/pages/user-settings/user-settings.page.html @@ -7,57 +7,59 @@ - - - - {{ "SETTINGS.APP_VERSION" | translate }} - - - {{ version.version }} ({{ version.buildNumber }}) - - - {{ version.revision }} - {{ version.date | formatDate | async }} - - +
+ + + + {{ "SETTINGS.APP_VERSION" | translate }} + + + {{ version.version }} ({{ version.buildNumber }}) + + + {{ version.revision }} - {{ version.date | formatDate | async }} + + - - + + - - - {{ "SETTINGS.USE_RETINA_MAP" | translate }} - - + + + {{ "SETTINGS.USE_RETINA_MAP" | translate }} + + - - - GPS debug - - - - + + + GPS debug + + + + - - - - {{ "SETTINGS.UPDATE_DROPDOWNS" | translate }} - - @if (isNativePlatform) { - - - {{ "SETTINGS.SEND_LOGS" | translate }} + + + + {{ "SETTINGS.UPDATE_DROPDOWNS" | translate }} - } - - - {{ "SETTINGS.RESET" | translate }} - - + @if (isNativePlatform) { + + + {{ "SETTINGS.SEND_LOGS" | translate }} + + } + + + {{ "SETTINGS.RESET" | translate }} + + +
diff --git a/src/app/pages/user-settings/user-settings.page.scss b/src/app/pages/user-settings/user-settings.page.scss index 5cfc641aa..531d17f52 100644 --- a/src/app/pages/user-settings/user-settings.page.scss +++ b/src/app/pages/user-settings/user-settings.page.scss @@ -23,3 +23,8 @@ ion-item { } } } + +main { + max-width: var(--desktop-max-width); + margin: 0 auto; +} diff --git a/src/global.scss b/src/global.scss index ab2c4debd..4cc5dfa91 100644 --- a/src/global.scss +++ b/src/global.scss @@ -93,6 +93,11 @@ --ion-color-danger-contrast-rgb: 255, 255, 255; --ion-color-danger-shade: #b40000; --ion-color-danger-tint: #d11a1a; + + /*Setter maks bredde på innhold på store skjermer. Foreløpig bør den brukes på hver side, men + vi kan vurdere å ha en felles kilde for layoutens maksimale bredde som settes et sted. */ + --desktop-max-width: 960px; + --form-max-width: 650px; } html { @@ -954,6 +959,7 @@ ion-select-popover ion-list ion-item ion-radio { // These styles needs to be applied globally according to ionic docs: https://ionicframework.com/docs/api/popover#styling ion-popover.select-popover { --width: fit-content(90vw); + --min-width: 150px; --max-width: 90vw; }