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

Merge pull request #1621 from crazyserver/MOBILE-2741 

Mobile 2741
main
Juan Leyva 2018-11-23 10:43:48 +01:00 committed by GitHub
parent a95659eda6 33d877a6be
commit 0eeab33ecf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/addon/notes/components/list/addon-notes-list.html
View File

@ -11,11 +11,13 @@
</ion-refresher>
<core-loading [hideUntil]="notesLoaded" class="core-loading-center">
<ion-select [(ngModel)]="type" (ngModelChange)="typeChanged()" interface="popover">
<ion-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-option>
<ion-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-option>
<ion-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-option>
</ion-select>
<div padding>
<ion-select [(ngModel)]="type" (ngModelChange)="typeChanged()" interface="popover" class="core-button-select">
<ion-option value="site">{{ 'addon.notes.sitenotes' | translate }}</ion-option>
<ion-option value="course">{{ 'addon.notes.coursenotes' | translate }}</ion-option>
<ion-option value="personal">{{ 'addon.notes.personalnotes' | translate }}</ion-option>
</ion-select>
</div>
<div class="core-warning-card" icon-start *ngIf="hasOffline">
<ion-icon name="warning"></ion-icon>

11
src/app/app.scss
View File

@ -377,6 +377,17 @@ ion-app.app-root {
}
@include core-headings();
img.icon {
font-size: 16px;
width: 16px;
height: 16px;
margin: 0;
padding: 0;
-webkit-box-sizing: content-box;
box-sizing: content-box;
margin-right: .5rem;
}
}
.item core-format-text {

4
src/components/empty-box/empty-box.scss
View File

@ -40,9 +40,11 @@ ion-app.app-root core-empty-box {
}
}
@include media-breakpoint-down(sm) {
@media (max-width: 350px) {
.core-empty-box {
position: relative;
height: auto;
margin-top: 50px;
.icon {
font-size: 100px;

2
src/directives/format-text.ts
View File

@ -382,7 +382,7 @@ export class CoreFormatTextDirective implements OnChanges {
images.forEach((img: HTMLElement) => {
this.addMediaAdaptClass(img);
this.addExternalContent(img);
if (this.utils.isTrueOrOne(this.adaptImg)) {
if (this.utils.isTrueOrOne(this.adaptImg) && !img.classList.contains('icon')) {
this.adaptImage(elWidth, img);
}
});