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

Merge pull request #2342 from crazyserver/MOBILE-3363 

Mobile 3363
main
Juan Leyva 2020-04-27 17:43:24 +02:00 committed by GitHub
parent dc3d0d7138 1eb8a045af
commit 7385cf9dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app.scss
View File

@ -666,11 +666,12 @@ ion-app.app-root {
overflow: auto; overflow: auto;
} }
.action-sheet-wrapper { ion-action-sheet .action-sheet-wrapper .action-sheet-container {
.action-sheet-button.action-sheet-cancel { .action-sheet-button.action-sheet-cancel {
color: $core-action-sheet-cancel-color; color: $core-action-sheet-cancel-color;
@include darkmode() { @include darkmode() {
color: $core-dark-action-sheet-cancel-color; color: $core-dark-action-sheet-cancel-color;
background-color: $black;
} }
} }
.action-sheet-selected { .action-sheet-selected {

6
src/core/login/login.scss
View File

@ -30,6 +30,12 @@ ion-app.app-root page-core-login-site {
border-color: $core-dark-login-box-background-border; border-color: $core-dark-login-box-background-border;
color: $core-dark-login-box-text-color; color: $core-dark-login-box-text-color;
} }
.item {
@include darkmode() {
background: $core-dark-login-box-background-color;
}
}
} }
.core-sitename, .core-siteurl { .core-sitename, .core-siteurl {

18
src/core/settings/pages/general/general.ts
View File

@ -14,7 +14,6 @@
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { IonicPage, Segment } from 'ionic-angular'; import { IonicPage, Segment } from 'ionic-angular';
import { CoreAppProvider } from '@providers/app';
import { CoreConstants } from '@core/constants'; import { CoreConstants } from '@core/constants';
import { CoreConfigProvider } from '@providers/config'; import { CoreConfigProvider } from '@providers/config';
import { CoreFileProvider } from '@providers/file'; import { CoreFileProvider } from '@providers/file';
@ -49,10 +48,14 @@ export class CoreSettingsGeneralPage {
selectedScheme: string; selectedScheme: string;
colorSchemeDisabled: boolean; colorSchemeDisabled: boolean;
constructor(private appProvider: CoreAppProvider, private configProvider: CoreConfigProvider, fileProvider: CoreFileProvider, constructor(protected configProvider: CoreConfigProvider,
private eventsProvider: CoreEventsProvider, private langProvider: CoreLangProvider, fileProvider: CoreFileProvider,
private domUtils: CoreDomUtilsProvider, private pushNotificationsProvider: CorePushNotificationsProvider, protected eventsProvider: CoreEventsProvider,
localNotificationsProvider: CoreLocalNotificationsProvider, private settingsHelper: CoreSettingsHelper) { protected langProvider: CoreLangProvider,
protected domUtils: CoreDomUtilsProvider,
protected pushNotificationsProvider: CorePushNotificationsProvider,
localNotificationsProvider: CoreLocalNotificationsProvider,
protected settingsHelper: CoreSettingsHelper) {
// Get the supported languages. // Get the supported languages.
const languages = CoreConfigConstants.languages; const languages = CoreConfigConstants.languages;
@ -72,9 +75,8 @@ export class CoreSettingsGeneralPage {
} else { } else {
let defaultColorScheme = 'light'; let defaultColorScheme = 'light';
// Auto is not working on iOS right now until we update Webkit. if (window.matchMedia('(prefers-color-scheme: dark)').matches ||
if (!this.appProvider.isIOS() && (window.matchMedia('(prefers-color-scheme: dark)').matches || window.matchMedia('(prefers-color-scheme: light)').matches) {
window.matchMedia('(prefers-color-scheme: light)').matches)) {
this.colorSchemes.push('auto'); this.colorSchemes.push('auto');
defaultColorScheme = 'auto'; defaultColorScheme = 'auto';
} }

1
src/theme/dark.scss
View File

@ -23,6 +23,7 @@ ion-app.app-root {
&.action-sheet-selected { &.action-sheet-selected {
color: $core-color; color: $core-color;
background-color: $black;
} }
&.activated { &.activated {
background-color: $black; background-color: $black;

2
src/theme/variables.scss
View File

@ -90,7 +90,7 @@ $inverted-contrast: $primary !default;
$primary-dark: lighten($primary, 10%) !default; $primary-dark: lighten($primary, 10%) !default;
$secondary-dark: mix($secondary, white, 20%) !default; $secondary-dark: mix($secondary, white, 20%) !default;
$danger-dark: mix($danger, white, 20%) !default; $danger-dark: mix($danger, white, 80%) !default;
$warning-dark: mix($warning, white, 20%) !default; $warning-dark: mix($warning, white, 20%) !default;
$success-dark: mix($success, white, 20%) !default; $success-dark: mix($success, white, 20%) !default;
$info-dark: mix($info, white, 20%) !default; $info-dark: mix($info, white, 20%) !default;