diff --git a/src/addon/calendar/pages/edit-event/edit-event.ts b/src/addon/calendar/pages/edit-event/edit-event.ts
index 5de3c1fe2..e68d4b362 100644
--- a/src/addon/calendar/pages/edit-event/edit-event.ts
+++ b/src/addon/calendar/pages/edit-event/edit-event.ts
@@ -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,
diff --git a/src/addon/mod/forum/components/index/addon-mod-forum-index.html b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
index 7e7935ae6..31e15b3e0 100644
--- a/src/addon/mod/forum/components/index/addon-mod-forum-index.html
+++ b/src/addon/mod/forum/components/index/addon-mod-forum-index.html
@@ -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>
diff --git a/src/app/app.scss b/src/app/app.scss
index d4568cb7d..ff148ca9c 100644
--- a/src/app/app.scss
+++ b/src/app/app.scss
@@ -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);
}
diff --git a/src/core/login/login.scss b/src/core/login/login.scss
index ea34c1161..5b5ba112a 100644
--- a/src/core/login/login.scss
+++ b/src/core/login/login.scss
@@ -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;
+ }
+ }
}
diff --git a/src/core/login/pages/forgotten-password/forgotten-password.scss b/src/core/login/pages/forgotten-password/forgotten-password.scss
deleted file mode 100644
index 1e881494a..000000000
--- a/src/core/login/pages/forgotten-password/forgotten-password.scss
+++ /dev/null
@@ -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);
- }
-}
diff --git a/src/core/login/pages/site/site.html b/src/core/login/pages/site/site.html
index 7af8d4a0e..d5dc5c1d9 100644
--- a/src/core/login/pages/site/site.html
+++ b/src/core/login/pages/site/site.html
@@ -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 }}
diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss
index 5649acc51..cff2ef02e 100644
--- a/src/core/login/pages/site/site.scss
+++ b/src/core/login/pages/site/site.scss
@@ -11,12 +11,14 @@ ion-app.app-root page-core-login-site {
}
}
- .core-login-need-help.item {
- background: transparent;
- text-decoration: underline;
-
- @include darkmode() {
- background: transparent;
+ .item.item-block {
+ &.core-login-need-help.item {
+ text-decoration: underline;
+ }
+ &.core-login-site-qrcode {
+ .item-inner {
+ border-bottom: 0;
+ }
}
}