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

Merge pull request #2423 from crazyserver/MOBILE-3401

Browse Source 
Mobile 3401
This commit is contained in:
Juan Leyva 2020-06-22 19:36:31 +02:00 committed by GitHub
commit c59468d502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/calendar/pages/edit-event/edit-event.ts
View File

@ -458,7 +458,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
eventtype: formData.eventtype,
timestart: timeStartDate,
description: {
text: formData.description,
text: formData.description || '',
format: 1
},
location: formData.location,

8
src/addon/mod/forum/components/index/addon-mod-forum-index.html
View File

@ -43,7 +43,7 @@
</div>
<ng-container *ngFor="let discussion of offlineDiscussions">
<a ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion" class="addon-mod-forum-discussion">
<ion-item text-wrap (click)="openNewDiscussion(discussion.timecreated)" [attr.no-lines]="discussion.groupname" [class.core-split-item-selected]="discussion.timecreated == -selectedDiscussion" class="addon-mod-forum-discussion" detail-push>
<div class="addon-mod-forum-discussion-title">
<h2>
<core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
@ -57,10 +57,10 @@
<p><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
</div>
</div>
</a>
</ion-item>
</ng-container>
<ng-container *ngFor="let discussion of discussions">
<a ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion" class="addon-mod-forum-discussion">
<ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion" class="addon-mod-forum-discussion" detail-push>
<div class="addon-mod-forum-discussion-title">
<h2 text-wrap>
<core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
@ -94,7 +94,7 @@
</ion-note>
</ion-col>
</ion-row>
</a>
</ion-item>
</ng-container>
<core-infinite-loading [enabled]="canLoadMore" (action)="fetchMoreDiscussions($event)" [error]="loadMoreError"></core-infinite-loading>

4
src/app/app.scss
View File

@ -98,6 +98,10 @@ ion-app.app-root {
}
}
.item[detail-push] {
cursor: pointer;
}
.core-nav-item-selected, .item.core-nav-item-selected {
@include core-selected-item($core-splitview-selected);
}

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

@ -97,4 +97,12 @@ ion-app.app-root page-core-login-site {
max-width: 300px;
margin: 5px auto;
}
.item.item-block {
background: transparent;
@include darkmode() {
background: transparent;
}
}
}

6
src/core/login/pages/forgotten-password/forgotten-password.scss
View File

@ -1,6 +0,0 @@
ion-app.app-root page-core-login-forgotten-password {
.content {
background: -webkit-radial-gradient(white, $gray-light);
background: radial-gradient(white, $gray-light);
}
}

4
src/core/login/pages/site/site.html
View File

@ -19,7 +19,7 @@
<ng-container *ngIf="!fixedSites">
<ion-item>
<ion-label stacked><h2>{{ 'core.login.siteaddress' | translate }}</h2></ion-label>
<ion-input type="url" name="url" placeholder="https://campus.example.edu" formControlName="siteUrl" [core-auto-focus]="showKeyboard" (ionChange)="searchSite($event, siteForm.value.siteUrl)"></ion-input>
<ion-input name="url" placeholder="https://campus.example.edu" formControlName="siteUrl" [core-auto-focus]="showKeyboard" (ionChange)="searchSite($event, siteForm.value.siteUrl)"></ion-input>
</ion-item>
</ng-container>
@ -59,7 +59,7 @@
<ng-container *ngIf="!fixedSites && showScanQR && !hasSites && !enteredSiteUrl">
<div class="core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
<ion-item>
<ion-item class="core-login-site-qrcode">
<a ion-button block color="light" margin-top icon-start (click)="showInstructionsAndScanQR()">
<core-icon name="fa-qrcode" aria-hidden="true"></core-icon>
{{ 'core.scanqr' | translate }}

12
src/core/login/pages/site/site.scss
View File

@ -11,12 +11,14 @@ ion-app.app-root page-core-login-site {
}
}
.core-login-need-help.item {
background: transparent;
.item.item-block {
&.core-login-need-help.item {
text-decoration: underline;
@include darkmode() {
background: transparent;
}
&.core-login-site-qrcode {
.item-inner {
border-bottom: 0;
}
}
}