Skip to content

Commit c59468d

Browse files
authored
Merge pull request #2423 from crazyserver/MOBILE-3401
Mobile 3401
2 parents 2ddb8fd + 4eb59c7 commit c59468d

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

src/addon/calendar/pages/edit-event/edit-event.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ export class AddonCalendarEditEventPage implements OnInit, OnDestroy {
458458
eventtype: formData.eventtype,
459459
timestart: timeStartDate,
460460
description: {
461-
text: formData.description,
461+
text: formData.description || '',
462462
format: 1
463463
},
464464
location: formData.location,

src/addon/mod/forum/components/index/addon-mod-forum-index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</div>
4444

4545
<ng-container *ngFor="let discussion of offlineDiscussions">
46-
<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">
46+
<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>
4747
<div class="addon-mod-forum-discussion-title">
4848
<h2>
4949
<core-format-text [text]="discussion.subject" contextLevel="module" [contextInstanceId]="module.id" [courseId]="courseId"></core-format-text>
@@ -57,10 +57,10 @@ <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
5757
<p><ion-icon name="time"></ion-icon> {{ 'core.notsent' | translate }}</p>
5858
</div>
5959
</div>
60-
</a>
60+
</ion-item>
6161
</ng-container>
6262
<ng-container *ngFor="let discussion of discussions">
63-
<a ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion" class="addon-mod-forum-discussion">
63+
<ion-item (click)="openDiscussion(discussion)" [class.core-split-item-selected]="discussion.discussion == selectedDiscussion" class="addon-mod-forum-discussion" detail-push>
6464
<div class="addon-mod-forum-discussion-title">
6565
<h2 text-wrap>
6666
<core-icon name="fa-map-pin" *ngIf="discussion.pinned"></core-icon>
@@ -94,7 +94,7 @@ <h3 *ngIf="discussion.userfullname">{{discussion.userfullname}}</h3>
9494
</ion-note>
9595
</ion-col>
9696
</ion-row>
97-
</a>
97+
</ion-item>
9898
</ng-container>
9999

100100
<core-infinite-loading [enabled]="canLoadMore" (action)="fetchMoreDiscussions($event)" [error]="loadMoreError"></core-infinite-loading>

src/app/app.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ ion-app.app-root {
9898
}
9999
}
100100

101+
.item[detail-push] {
102+
cursor: pointer;
103+
}
104+
101105
.core-nav-item-selected, .item.core-nav-item-selected {
102106
@include core-selected-item($core-splitview-selected);
103107
}

src/core/login/login.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,12 @@ ion-app.app-root page-core-login-site {
9797
max-width: 300px;
9898
margin: 5px auto;
9999
}
100+
101+
.item.item-block {
102+
background: transparent;
103+
104+
@include darkmode() {
105+
background: transparent;
106+
}
107+
}
100108
}

src/core/login/pages/forgotten-password/forgotten-password.scss

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/core/login/pages/site/site.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<ng-container *ngIf="!fixedSites">
2020
<ion-item>
2121
<ion-label stacked><h2>{{ 'core.login.siteaddress' | translate }}</h2></ion-label>
22-
<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>
22+
<ion-input name="url" placeholder="https://campus.example.edu" formControlName="siteUrl" [core-auto-focus]="showKeyboard" (ionChange)="searchSite($event, siteForm.value.siteUrl)"></ion-input>
2323
</ion-item>
2424
</ng-container>
2525

@@ -59,7 +59,7 @@ <h2 text-wrap>{{site.name}}<ng-container *ngIf="site.alias"> ({{site.alias}})</n
5959

6060
<ng-container *ngIf="!fixedSites && showScanQR && !hasSites && !enteredSiteUrl">
6161
<div class="core-login-site-qrcode-separator">{{ 'core.login.or' | translate }}</div>
62-
<ion-item>
62+
<ion-item class="core-login-site-qrcode">
6363
<a ion-button block color="light" margin-top icon-start (click)="showInstructionsAndScanQR()">
6464
<core-icon name="fa-qrcode" aria-hidden="true"></core-icon>
6565
{{ 'core.scanqr' | translate }}

src/core/login/pages/site/site.scss

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@ ion-app.app-root page-core-login-site {
1111
}
1212
}
1313

14-
.core-login-need-help.item {
15-
background: transparent;
16-
text-decoration: underline;
17-
18-
@include darkmode() {
19-
background: transparent;
14+
.item.item-block {
15+
&.core-login-need-help.item {
16+
text-decoration: underline;
17+
}
18+
&.core-login-site-qrcode {
19+
.item-inner {
20+
border-bottom: 0;
21+
}
2022
}
2123
}
2224

0 commit comments

Comments
 (0)