From f78f3cddc7946d7673954b5c7c055108b8b08e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 25 Feb 2019 17:11:42 +0100 Subject: [PATCH 1/4] MOBILE-1973 quiz: Make the navigation modal lateral --- src/addon/mod/quiz/pages/player/player.ts | 2 +- src/app/app.scss | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/addon/mod/quiz/pages/player/player.ts b/src/addon/mod/quiz/pages/player/player.ts index 669445fbc..83fb1dca3 100644 --- a/src/addon/mod/quiz/pages/player/player.ts +++ b/src/addon/mod/quiz/pages/player/player.ts @@ -94,7 +94,7 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy { // Create the navigation modal. this.navigationModal = modalCtrl.create('AddonModQuizNavigationModalPage', { page: this - }); + }, { cssClass: 'core-modal-lateral' }); } /** diff --git a/src/app/app.scss b/src/app/app.scss index eb0aad801..63d415519 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -721,13 +721,22 @@ ion-app.app-root { width: 100%; } - .core-modal-fullscreen { - .modal-wrapper { - position: absolute; - @include position(0 !important, null, null, 0 !important); - display: block; - width: 100% !important; - height: 100% !important; + .core-modal-fullscreen .modal-wrapper { + position: absolute; + @include position(0 !important, null, null, 0 !important); + display: block; + width: 100% !important; + height: 100% !important; + } + + @media only screen and (min-height: 600px) and (min-width: 768px) { + .core-modal-lateral .modal-wrapper { + position: absolute; + @include position(0 !important, 0 !important, 0 !important, auto); + display: block; + height: 100% !important; + width: auto; + min-width: 400px; } } From c048c6f9bf3c4d482a6a0afda596844521e0b9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 25 Feb 2019 17:12:16 +0100 Subject: [PATCH 2/4] MOBILE-1973 feedback: Solve item input feedback styles --- src/app/app.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/app/app.scss b/src/app/app.scss index 63d415519..679a902f5 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -664,6 +664,22 @@ ion-app.app-root { } } + .core-#{$color-name}-item.item-input { + border-bottom: 0 !important; + + &.item-md .item-inner { + @include md-input-highlight($color-base); + } + + &.item-ios .item-inner { + @include ios-input-highlight($color-base); + } + + &.item-wp .item-inner { + border-color: $color-base; + } + } + .core-#{$color-name}-selected-item { @include safe-area-border-start(5px, solid, $color-base); From 04bc8fd81bee9312d7e1f83b36e83a4207fb9f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 25 Feb 2019 17:12:47 +0100 Subject: [PATCH 3/4] MOBILE-1973 sync: Do not sync logged out sites --- src/classes/base-sync.ts | 2 +- src/providers/sites.ts | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/classes/base-sync.ts b/src/classes/base-sync.ts index 2d1106973..f4a2bb436 100644 --- a/src/classes/base-sync.ts +++ b/src/classes/base-sync.ts @@ -243,7 +243,7 @@ export class CoreSyncBaseProvider { if (!siteId) { // No site ID defined, sync all sites. this.logger.debug(`Try to sync '${syncFunctionLog}' in all sites.`); - promise = this.sitesProvider.getSitesIds(); + promise = this.sitesProvider.getLoggedInSitesIds(); } else { this.logger.debug(`Try to sync '${syncFunctionLog}' in site '${siteId}'.`); promise = Promise.resolve([siteId]); diff --git a/src/providers/sites.ts b/src/providers/sites.ts index 759b89372..9ae995e8b 100644 --- a/src/providers/sites.ts +++ b/src/providers/sites.ts @@ -1050,6 +1050,19 @@ export class CoreSitesProvider { }); } + /** + * Get the list of IDs of sites stored and not logged out. + * + * @return {Promise} Promise resolved when the sites IDs are retrieved. + */ + getLoggedInSitesIds(): Promise { + return this.appDB.getRecords(this.SITES_TABLE, {loggedOut : 0}).then((sites) => { + return sites.map((site) => { + return site.id; + }); + }); + } + /** * Get the list of IDs of sites stored. * From b2fc4ae0952f10909a53e91988563f5dba56c807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 25 Feb 2019 17:13:13 +0100 Subject: [PATCH 4/4] MOBILE-1973 folder: Change folder icon --- .../mod/folder/components/index/addon-mod-folder-index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/addon/mod/folder/components/index/addon-mod-folder-index.html b/src/addon/mod/folder/components/index/addon-mod-folder-index.html index f9ccdcf31..62cda2e8e 100644 --- a/src/addon/mod/folder/components/index/addon-mod-folder-index.html +++ b/src/addon/mod/folder/components/index/addon-mod-folder-index.html @@ -18,8 +18,8 @@ - -

{{file.name}}

+ +

{{file.name}}