diff --git a/src/app/modules/about/about-changelog.component.ts b/src/app/modules/about/about-changelog.component.ts index d5c62655..56adf4e6 100644 --- a/src/app/modules/about/about-changelog.component.ts +++ b/src/app/modules/about/about-changelog.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -18,6 +18,6 @@ import {Component} from '@angular/core'; @Component({ selector: 'about-changelog', templateUrl: 'about-changelog.html', - styleUrls: ['about-changelog.scss'], + styleUrls: ['about-changelog.scss', './about-page/about-page.scss'], }) export class AboutChangelogComponent {} diff --git a/src/app/modules/about/about-changelog.html b/src/app/modules/about/about-changelog.html index fae21138..e0f1aa09 100644 --- a/src/app/modules/about/about-changelog.html +++ b/src/app/modules/about/about-changelog.html @@ -1,5 +1,5 @@ - - + +
+
+ +
+
diff --git a/src/app/modules/about/about-licenses.component.ts b/src/app/modules/about/about-licenses.component.ts index 48be4fc9..79bab44d 100644 --- a/src/app/modules/about/about-licenses.component.ts +++ b/src/app/modules/about/about-licenses.component.ts @@ -1,16 +1,16 @@ /* - * Copyright (C) 2022 StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ import {Component, OnInit} from '@angular/core'; import {ModalController} from '@ionic/angular'; @@ -31,7 +31,7 @@ export interface License { @Component({ selector: 'about-changelog', templateUrl: 'about-licenses.html', - styleUrls: ['about-licenses.scss'], + styleUrls: ['about-licenses.scss', './about-page/about-page.scss'], }) export class AboutLicensesComponent implements OnInit { licenses: License[]; diff --git a/src/app/modules/about/about-licenses.html b/src/app/modules/about/about-licenses.html index e001a6d5..9b5b2612 100644 --- a/src/app/modules/about/about-licenses.html +++ b/src/app/modules/about/about-licenses.html @@ -1,5 +1,5 @@ - - - - - {{ license.name }} - - + +
+
+ + + + {{ license.name }} + + - - {{ license.authors || license.publisher }} - - - - - - {{ license.licenses }} License - - - - + + {{ license.authors || license.publisher }} + + + + + + {{ license.licenses }} License + + + +
+
+
diff --git a/src/app/modules/about/about-licenses.scss b/src/app/modules/about/about-licenses.scss index 07ce2ede..00c9e63c 100644 --- a/src/app/modules/about/about-licenses.scss +++ b/src/app/modules/about/about-licenses.scss @@ -1,18 +1,22 @@ /*! - * Copyright (C) 2022 StApps - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation, version 3. + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ +ion-content > div { + height: 100%; +} + cdk-virtual-scroll-viewport { height: 100%; width: 100%; diff --git a/src/app/modules/about/about-page/about-page-content.scss b/src/app/modules/about/about-page/about-page-content.scss index 40ab8523..bc381711 100644 --- a/src/app/modules/about/about-page/about-page-content.scss +++ b/src/app/modules/about/about-page/about-page-content.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2021 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. diff --git a/src/app/modules/about/about-page/about-page.html b/src/app/modules/about/about-page/about-page.html index 7c6e0f3a..3a4cc926 100644 --- a/src/app/modules/about/about-page/about-page.html +++ b/src/app/modules/about/about-page/about-page.html @@ -24,7 +24,11 @@ - - {{ appName }} v{{ version }} - + +
+ {{ appName }} v{{ version }} +
+ +
+
diff --git a/src/app/modules/about/about-page/about-page.scss b/src/app/modules/about/about-page/about-page.scss index 2fd45777..a6e50828 100644 --- a/src/app/modules/about/about-page/about-page.scss +++ b/src/app/modules/about/about-page/about-page.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2021 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,8 +12,80 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ +@import 'src/theme/util/_mixins.scss'; -ion-content { - --padding-start: 8px; - --padding-top: 8px; +ion-text { + margin-inline: var(--spacing-md); +} + +:host ::ng-deep { + ion-card { + margin: 0; + box-shadow: none; + ion-card-content { + h1 { + margin: 0; + } + padding-bottom: 8px; + } + ion-card-header { + color: var(--ion-color-dark); + padding-top: 8px; + padding-bottom: 4px; + font-weight: bold; + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + + p, + h3, + h2, + h1 { + margin-inline: var(--spacing-md); + } + + .about-changelog, + .licenses-content, + .page-content { + margin: var(--spacing-md); + display: flex; + flex-direction: column; + gap: var(--spacing-sm); + background: var(--ion-color-primary-contrast); + &.licenses-content { + background: var(--ion-color-light); + } + + padding-block-end: var(--spacing-md); + @include border-radius-in-parallax(var(--border-radius-default)); + + & > * { + ion-card-subtitle { + font-size: var(--font-size-lg); + color: var(--ion-color-light-contrast); + } + + display: block; + @include border-radius-in-parallax(var(--border-radius-default)); + overflow: hidden; + position: relative; + background-color: var(--ion-color-primary-contrast); + margin: 0; + + & > ion-thumbnail { + background: var(--ion-color-primary); + } + } + } } diff --git a/src/app/modules/data/data.module.ts b/src/app/modules/data/data.module.ts index 6c28d405..0b776138 100644 --- a/src/app/modules/data/data.module.ts +++ b/src/app/modules/data/data.module.ts @@ -227,6 +227,7 @@ import {browserFactory, SimpleBrowser} from '../../util/browser.factory'; ArticleContentComponent, BookDetailContentComponent, PeriodicalDetailContentComponent, + TitleCardComponent, ], }) export class DataModule {} diff --git a/src/app/modules/feedback/feedback-page.html b/src/app/modules/feedback/feedback-page.html index 7a45a7ba..280adf40 100644 --- a/src/app/modules/feedback/feedback-page.html +++ b/src/app/modules/feedback/feedback-page.html @@ -21,83 +21,107 @@ {{ 'feedback.page.TITLE' | translate }} - -
- - {{ 'feedback.form.name.label' | translate }} - - - - {{ 'feedback.form.type.label' | translate }} - - {{ - 'feedback.form.type.values.comment' | translate - }} - {{ 'feedback.form.type.values.bug' | translate }} - - - - {{ 'feedback.form.email.label' | translate }} - - - - {{ 'feedback.form.message.label' | translate }} - - - - {{ 'feedback.form.termsAgree.0' | translate }} - {{ 'feedback.form.termsAgree.1' | translate }}. - - - - {{ 'feedback.form.protocolDataAgree' | translate }} - - - - - - {{ - 'feedback.form.protocolData.show' | translate - }} - {{ 'feedback.form.protocolData.hide' | translate }} - - - -
{{ metaData | json }}
-
-
- {{ 'feedback.form.submit' | translate }} -
+ +
+ +
diff --git a/src/app/modules/feedback/feedback-page.scss b/src/app/modules/feedback/feedback-page.scss index 1050af59..8235c41c 100644 --- a/src/app/modules/feedback/feedback-page.scss +++ b/src/app/modules/feedback/feedback-page.scss @@ -1,6 +1,81 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ + pre { white-space: pre-wrap; } ion-button { margin: 10px; } + +@import 'src/theme/util/_mixins.scss'; + +:host ::ng-deep { + ion-card { + margin: 0; + box-shadow: none; + ion-card-content { + h1 { + margin: 0; + } + padding-bottom: 8px; + } + ion-card-header { + color: var(--ion-color-dark); + padding-top: 8px; + padding-bottom: 4px; + font-weight: bold; + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + + .feedback-content { + margin: var(--spacing-md); + display: flex; + flex-direction: column; + gap: var(--spacing-sm); + background: var(--ion-color-light); + @include border-radius-in-parallax(var(--border-radius-default)); + + & > * { + ion-card-subtitle { + font-size: var(--font-size-lg); + color: var(--ion-color-light-contrast); + } + + display: block; + @include border-radius-in-parallax(var(--border-radius-default)); + overflow: hidden; + position: relative; + background-color: var(--ion-color-primary-contrast); + margin: 0; + + & > ion-thumbnail { + background: var(--ion-color-primary); + } + } + } +} diff --git a/src/app/modules/settings/item/settings-item.component.ts b/src/app/modules/settings/item/settings-item.component.ts index b7fcc332..bd5ae2ac 100644 --- a/src/app/modules/settings/item/settings-item.component.ts +++ b/src/app/modules/settings/item/settings-item.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -24,6 +24,7 @@ import {SettingsProvider} from '../settings.provider'; @Component({ selector: 'stapps-settings-item', templateUrl: 'settings-item.html', + styleUrls: ['settings-item.scss'], }) export class SettingsItemComponent { /** diff --git a/src/app/modules/settings/settings.scss b/src/app/modules/settings/item/settings-item.scss similarity index 92% rename from src/app/modules/settings/settings.scss rename to src/app/modules/settings/item/settings-item.scss index 6d67c768..bc381711 100644 --- a/src/app/modules/settings/settings.scss +++ b/src/app/modules/settings/item/settings-item.scss @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -12,6 +12,3 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ - -page-settings { -} diff --git a/src/app/modules/settings/page/settings-page.component.ts b/src/app/modules/settings/page/settings-page.component.ts index 16c6a6e2..4745784e 100644 --- a/src/app/modules/settings/page/settings-page.component.ts +++ b/src/app/modules/settings/page/settings-page.component.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -24,6 +24,7 @@ import {SettingsCache, SettingsProvider} from '../settings.provider'; @Component({ selector: 'stapps-settings-page', templateUrl: 'settings-page.html', + styleUrls: ['settings-page.scss'], }) export class SettingsPageComponent implements OnInit { /** diff --git a/src/app/modules/settings/page/settings-page.html b/src/app/modules/settings/page/settings-page.html index 5b6d608f..cd013bf9 100644 --- a/src/app/modules/settings/page/settings-page.html +++ b/src/app/modules/settings/page/settings-page.html @@ -1,5 +1,5 @@ + + + + + + + + {{ 'settings.resetSettings' | translate }} + + - - - - - - {{ 'settings.resetSettings' | translate }} - - +
diff --git a/src/app/modules/settings/page/settings-page.scss b/src/app/modules/settings/page/settings-page.scss new file mode 100644 index 00000000..bb51ff33 --- /dev/null +++ b/src/app/modules/settings/page/settings-page.scss @@ -0,0 +1,73 @@ +/*! + * Copyright (C) 2023 StApps + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation, version 3. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . + */ +@import 'src/theme/util/_mixins.scss'; + +:host ::ng-deep { + ion-card { + margin: 0; + box-shadow: none; + ion-card-content { + h1 { + margin: 0; + } + padding-bottom: 8px; + } + ion-card-header { + color: var(--ion-color-dark); + padding-top: 8px; + padding-bottom: 4px; + font-weight: bold; + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + } + ion-grid, + ion-col { + padding-inline-start: 0; + padding-top: 0; + padding-bottom: 0; + } + + .settings-content { + margin: var(--spacing-md); + display: flex; + flex-direction: column; + gap: var(--spacing-sm); + background: var(--ion-color-light); + @include border-radius-in-parallax(var(--border-radius-default)); + + & > * { + ion-card-subtitle { + font-size: var(--font-size-lg); + color: var(--ion-color-light-contrast); + } + + display: block; + @include border-radius-in-parallax(var(--border-radius-default)); + overflow: hidden; + position: relative; + background-color: var(--ion-color-primary-contrast); + margin: 0; + + & > ion-thumbnail { + background: var(--ion-color-primary); + } + } + } +} diff --git a/src/app/modules/settings/settings.module.ts b/src/app/modules/settings/settings.module.ts index 04655e54..911f4978 100644 --- a/src/app/modules/settings/settings.module.ts +++ b/src/app/modules/settings/settings.module.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3.