EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2842 from crazyserver/MOBILE-3320

Browse Source 
Mobile 3320
This commit is contained in:
Dani Palou 2021-06-21 13:06:11 +02:00 committed by GitHub
commit ead5aba4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/addons/messageoutput/airnotifier/pages/devices/devices.html
View File

@ -12,10 +12,13 @@
</ion-refresher> </ion-refresher>
<core-loading [hideUntil]="devicesLoaded"> <core-loading [hideUntil]="devicesLoaded">
<ion-list> <ion-list>
<ion-item class="ion-text-wrap" *ngFor="let device of devices"> <ion-item class="ion-text-wrap" *ngFor="let device of devices" [class.item-current]="device.current">
<ion-label [class.core-bold]="device.current"> <ion-label [class.core-bold]="device.current">
{{ device.name }} {{ device.model }} {{ device.platform }} {{ device.version }} <p class="item-heading">
<span *ngIf="device.current">({{ 'core.currentdevice' | translate }})</span> {{ device.name }} {{ device.model }}
<span *ngIf="device.current">({{ 'core.currentdevice' | translate }})</span>
</p>
<p>{{ device.platform }} {{ device.version }}</p>
</ion-label> </ion-label>
<core-button-with-spinner [loading]="device.updating" slot="end"> <core-button-with-spinner [loading]="device.updating" slot="end">
<ion-toggle <ion-toggle

7
src/addons/messageoutput/airnotifier/pages/devices/devices.ts
View File

@ -74,7 +74,12 @@ export class AddonMessageOutputAirnotifierDevicesPage implements OnInit, OnDestr
device.current = !!(pushId && pushId == device.pushid); device.current = !!(pushId && pushId == device.pushid);
}); });
return formattedDevices; return formattedDevices.sort((a, b) => {
const compareA = a.name.toLowerCase();
const compareB = b.name.toLowerCase();
return compareA.localeCompare(compareB);
});
} }
/** /**

16
src/core/components/tabs-outlet/core-tabs-outlet.html
View File

@ -28,13 +28,15 @@
[tabindex]="selected == tab.id ? 0 : -1" [tabindex]="selected == tab.id ? 0 : -1"
> >
<ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon> <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
<ion-label>{{ tab.title | translate}}</ion-label> <ion-label>
<ion-badge *ngIf="tab.badge"> {{ tab.title | translate}}
<span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span> <ion-badge *ngIf="tab.badge">
<span *ngIf="tab.badgeA11yText" class="sr-only"> <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
{{ tab.badgeA11yText | translate: {$a : tab.badge } }} <span *ngIf="tab.badgeA11yText" class="sr-only">
</span> {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
</ion-badge> </span>
</ion-badge>
</ion-label>
</ion-tab-button> </ion-tab-button>
</ion-slide> </ion-slide>
</ng-container> </ng-container>

16
src/core/components/tabs/core-tabs.html
View File

@ -27,13 +27,15 @@
[tabindex]="selected == tab.id ? 0 : -1" [tabindex]="selected == tab.id ? 0 : -1"
> >
<ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon> <ion-icon *ngIf="tab.icon" [name]="tab.icon" aria-hidden="true"></ion-icon>
<ion-label>{{ tab.title | translate}}</ion-label> <ion-label>
<ion-badge *ngIf="tab.badge"> {{ tab.title | translate}}
<span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span> <ion-badge *ngIf="tab.badge">
<span *ngIf="tab.badgeA11yText" class="sr-only"> <span [attr.aria-hidden]="!!tab.badgeA11yText">{{ tab.badge }}</span>
{{ tab.badgeA11yText | translate: {$a : tab.badge } }} <span *ngIf="tab.badgeA11yText" class="sr-only">
</span> {{ tab.badgeA11yText | translate: {$a : tab.badge } }}
</ion-badge> </span>
</ion-badge>
</ion-label>
</ion-tab-button> </ion-tab-button>
</ion-slide> </ion-slide>
</ng-container> </ng-container>

2
src/theme/components/format-text.scss
View File

@ -366,7 +366,7 @@ core-rich-text-editor .core-rte-editor {
input[type=checkbox] { input[type=checkbox] {
position: relative; position: relative;
--color: var(--brand-color-contrast); --color: var(--text-color);
--color-checked: var(--color); --color-checked: var(--color);
width: var(--size); width: var(--size);

4
src/theme/globals.variables.scss
View File

@ -37,12 +37,12 @@ $text-color-dark-rgb: color-to-rgb-list($text-color-dark) !default;
$background-color: $gray-light !default; $background-color: $gray-light !default;
$background-color-rgb: color-to-rgb-list($background-color) !default; $background-color-rgb: color-to-rgb-list($background-color) !default;
$background-color-dark: mix(#ffffff, #000000, 90%) !default; // #1a1a1a $background-color-dark: mix(#ffffff, #000000, 10%) !default; // #1a1a1a
$background-color-dark-rgb: color-to-rgb-list($background-color-dark) !default; $background-color-dark-rgb: color-to-rgb-list($background-color-dark) !default;
$ion-item-background: $white !default; $ion-item-background: $white !default;
$ion-item-background-rgb: color-to-rgb-list($ion-item-background) !default; $ion-item-background-rgb: color-to-rgb-list($ion-item-background) !default;
$ion-item-background-dark: mix(#ffffff, #000000, 80%) !default; // #333333 $ion-item-background-dark: mix(#ffffff, #000000, 20%) !default; // #333333
$ion-item-background-dark-rgb: color-to-rgb-list($ion-item-background-dark) !default; $ion-item-background-dark-rgb: color-to-rgb-list($ion-item-background-dark) !default;
$primary: $brand-color !default; $primary: $brand-color !default;

13
src/theme/theme.base.scss
View File

@ -273,7 +273,7 @@ button,
// Clear buttons will be black. // Clear buttons will be black.
ion-button.button-clear { ion-button.button-clear {
--ion-color-primary: var(--brand-color-contrast); --ion-color-primary: var(--brand-color);
} }
[role="button"], [role="button"],
@ -357,7 +357,7 @@ ion-alert .alert-message {
} }
ion-alert .alert-wrapper button.alert-button { ion-alert .alert-wrapper button.alert-button {
color: var(--brand-color-contrast); color: var(--brand-color);
} }
// Ionic list. // Ionic list.
@ -423,7 +423,8 @@ ion-toolbar {
} }
// Item styles // Item styles
[aria-current="page"] { [aria-current="page"],
.item.item-current {
// TODO: Add safe area to border and RTL // TODO: Add safe area to border and RTL
--ion-safe-area-left: calc(-1 * var(--selected-item-border-width)); --ion-safe-area-left: calc(-1 * var(--selected-item-border-width));
border-inline-start: var(--selected-item-border-width) solid var(--selected-item-color); border-inline-start: var(--selected-item-border-width) solid var(--selected-item-color);
@ -583,7 +584,7 @@ ion-toolbar h1 .core-bar-button-image img {
// Radio. // Radio.
ion-radio, ion-radio,
input[type=radio] { input[type=radio] {
--color: var(--brand-color-contrast); --color: var(--text-color);
--color-checked: var(--color); --color-checked: var(--color);
--border-radius: 50%; --border-radius: 50%;
--border-width: 2px; --border-width: 2px;
@ -637,8 +638,8 @@ input[type=radio] {
ion-checkbox, ion-checkbox,
input[type=checkbox] { input[type=checkbox] {
--border-radius: 2px; --border-radius: 2px;
--border-color-checked: var(--brand-color-contrast); --border-color-checked: var(--text-color);
--background-checked: var(--brand-color-contrast); --background-checked: var(--text-color);
--checkmark-color: var(--contrast-background); --checkmark-color: var(--contrast-background);
--border-width: 2px; --border-width: 2px;
--outer-border-width: 2px; --outer-border-width: 2px;

6
src/theme/theme.dark.scss
View File

@ -76,6 +76,8 @@
--core-header-toolbar-color: var(--white); --core-header-toolbar-color: var(--white);
--core-tabs-background: var(--ion-color-step-200); --core-tabs-background: var(--ion-color-step-200);
--core-tab-background: var(--core-tabs-background);
--core-tab-color: var(--subdued-text-color);
--core-tab-border-color: var(--gray-light); --core-tab-border-color: var(--gray-light);
--core-tab-color-active: var(--dark); --core-tab-color-active: var(--dark);
@ -84,8 +86,10 @@
--ion-item-background: #{$ion-item-background-dark}; --ion-item-background: #{$ion-item-background-dark};
--ion-item-detail-icon-color: var(--white); --ion-item-detail-icon-color: var(--white);
--item-divider-background: var(--ion-color-step-200); --item-divider-background: var(--ion-color-step-200);
--spacer-background: var(--ion-color-step-1000); --item-divider-color: var(--text-color);
--spacer-background: var(--ion-color-step-0);
--core-combobox-background: var(--ion-item-background);
--core-combobox-color: var(--white); --core-combobox-color: var(--white);
--core-login-background: var(--black); --core-login-background: var(--black);