Skip to content

Mobile 3523 #2575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2020
Merged

Mobile 3523 #2575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e76f0d6
MOBILE-3523 login: Fix and simplify login style personalization
crazyserver Oct 2, 2020
f5d11a0
MOBILE-3523 database: Fix database invalidate after autosync
crazyserver Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/addon/mod/data/providers/sync.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ export class AddonModDataSyncProvider extends CoreSyncBaseProvider {
}).then(() => {
if (result.updated) {
// Data has been sent to server. Now invalidate the WS calls.
return this.dataProvider.invalidateContent(data.cmid, courseId, siteId).catch(() => {
return this.dataProvider.invalidateContent(data.coursemodule, courseId, siteId).catch(() => {
// Ignore errors.
});
}
Expand Down
33 changes: 29 additions & 4 deletions src/core/login/login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ $core-login-page-background-color: $white !default;
$core-login-page-text-color: $text-color !default;
$core-login-button-outline: false !default;
$core-login-loading-color: false !default;
$core-login-item-inner-background-color: $white !default;
$core-login-item-background-color: $white !default;
$core-login-input-item-background-color: $core-login-page-background-color !default;
$core-login-input-item-text-color: $core-login-page-text-color !default;

// Dark.
$core-dark-login-page-background-color: $black !default;
$core-dark-login-page-text-color: $core-dark-text-color !default;
$core-dark-login-item-inner-background-color: $core-dark-login-page-background-color !default;
$core-dark-login-item-background-color: $core-dark-login-page-background-color !default;
$core-dark-login-button-outline: $core-login-button-outline !default;
$core-dark-login-loading-color: $core-dark-text-color !default;
$core-dark-input-login-item-background-color: $core-dark-login-page-background-color !default;
$core-dark-input-login-item-text-color: $core-dark-login-page-text-color !default;

ion-app.app-root page-core-login-credentials,
ion-app.app-root page-core-login-reconnect,
Expand All @@ -26,6 +26,13 @@ ion-app.app-root page-core-login-site {
}
}

.item p, .item h2, .item h3, .list .item.core-oauth-icon .label, .text-input {
color: $core-login-page-text-color;
@include darkmode() {
color: $core-dark-login-page-text-color;
}
}

img {
max-width: 100%;
}
Expand Down Expand Up @@ -78,6 +85,22 @@ ion-app.app-root page-core-login-site {
margin-bottom: 20px;
}


.core-login-form .item,
.core-login-form .item-inner {
background-color: $core-login-input-item-background-color;
@include darkmode() {
background-color: $core-dark-input-login-item-background-color;
}

p, input {
color: $core-login-input-item-text-color;
@include darkmode() {
color: $core-dark-input-login-item-text-color;
}
}
}

ion-list.core-login-forgotten-password {
margin-top: 0;
margin-bottom: 0;
Expand All @@ -89,6 +112,8 @@ ion-app.app-root page-core-login-site {
@include darkmode() {
background: transparent;
}

color: $core-login-page-text-color;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/core/login/pages/credentials/credentials.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3 *ngIf="siteName" padding class="core-sitename"><core-format-text [text]="sit
</form>

<!-- Forgotten password button. -->
<ion-list no-lines *ngIf="showForgottenPassword" class="core-login-forgotten-password">
<ion-list no-lines *ngIf="showForgottenPassword" class="core-login-forgotten-password core-login-link">
<a ion-item text-center text-wrap (click)="forgottenPassword()" detail-none>
{{ 'core.login.forgotten' | translate }}
</a>
Expand Down
2 changes: 1 addition & 1 deletion src/core/login/pages/reconnect/reconnect.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ <h3 *ngIf="siteName" padding class="core-sitename"><core-format-text [text]="sit
</form>

<!-- Forgotten password button. -->
<ion-list no-lines *ngIf="showForgottenPassword && !isOAuth" class="core-login-forgotten-password">
<ion-list no-lines *ngIf="showForgottenPassword && !isOAuth" class="core-login-forgotten-password core-login-link">
<a ion-item text-center text-wrap (click)="forgottenPassword()" detail-none>
{{ 'core.login.forgotten' | translate }}
</a>
Expand Down
25 changes: 8 additions & 17 deletions src/core/login/pages/reconnect/reconnect.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
ion-app.app-root page-core-login-reconnect {
.box {
.core-login-form .item {
background-color: $core-login-item-background-color;
@include darkmode() {
background-color: $core-dark-login-item-background-color;
}
}

.core-login-form .item-inner {
background-color: $core-login-item-inner-background-color;
@include darkmode() {
background-color: $core-dark-login-item-inner-background-color;
}
}
}
$core-login-reconnect-warning: $red !default;
$core-dark-login-reconnect-warning: mix($red, white, 20%) !default;

ion-app.app-root page-core-login-reconnect {
form .core-username.item p {
@include padding-horizontal(8px);
font-size: 16px;
Expand All @@ -31,6 +18,10 @@ ion-app.app-root page-core-login-reconnect {
}

.core-login-reconnect-warning {
color: $red;
color: $core-login-reconnect-warning;

@include darkmode() {
background-color: $core-dark-login-reconnect-warning;
}
}
}
4 changes: 2 additions & 2 deletions src/core/login/pages/site/site.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ <h2 *ngIf="site.title" text-wrap>{{site.title}}</h2>
</ng-container>

<!-- Help. -->
<ion-list no-lines margin-top>
<a ion-item text-center text-wrap class="core-login-need-help" (click)="showHelp()" detail-none>
<ion-list no-lines margin-top class="core-login-need-help core-login-link">
<a ion-item text-center text-wrap (click)="showHelp()" detail-none>
{{ 'core.needhelp' | translate }}
</a>
</ion-list>
Expand Down
20 changes: 19 additions & 1 deletion src/core/login/pages/site/site.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ ion-app.app-root page-core-login-site {
}

.item.item-block {
&.core-login-need-help.item {
&.core-login-need-help .item {
color: $core-login-page-text-color;
text-decoration: underline;
}
&.core-login-site-qrcode {
Expand Down Expand Up @@ -97,6 +98,19 @@ ion-app.app-root page-core-login-site {
text-align: center;
}

.core-login-site-list-loading,
.core-login-site-nolist-loading {
.spinner circle, .spinner line {
stroke: $core-login-loading-color;
}

@include darkmode() {
.spinner circle, .spinner line {
stroke: $core-dark-login-loading-color;
}
}
}

.item.core-login-site-list-title {
ion-label, ion-label h2.item-heading {
margin-top: 0;
Expand All @@ -123,6 +137,10 @@ ion-app.app-root page-core-login-site {
ion-thumbnail {
box-shadow: 0 0 4px #ddd;
}
color: $core-login-page-text-color;
@include darkmode() {
color: $core-dark-login-page-text-color;
}
}


Expand Down