From d1076eb7948eec1f69abcbe082203e05aee9a16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Mon, 11 Jun 2018 11:00:41 +0200 Subject: [PATCH] MOBILE-2430 core: Add fab-icons to add actions --- src/addon/files/pages/list/list.html | 2 +- .../data/components/index/addon-mod-data-index.html | 7 ++++++- .../components/index/addon-mod-forum-index.html | 13 +++++++------ src/app/app.scss | 10 ++++++++++ src/components/empty-box/empty-box.scss | 1 + .../core-course-module-description.html | 4 +++- src/core/login/pages/sites/sites.html | 2 +- 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/src/addon/files/pages/list/list.html b/src/addon/files/pages/list/list.html index b55f063db..43dca09bd 100644 --- a/src/addon/files/pages/list/list.html +++ b/src/addon/files/pages/list/list.html @@ -3,7 +3,7 @@ - + diff --git a/src/addon/mod/data/components/index/addon-mod-data-index.html b/src/addon/mod/data/components/index/addon-mod-data-index.html index ce67bfa94..b87184715 100644 --- a/src/addon/mod/data/components/index/addon-mod-data-index.html +++ b/src/addon/mod/data/components/index/addon-mod-data-index.html @@ -95,5 +95,10 @@ {{ 'addon.mod_data.resetsettings' | translate}} - + + + + 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 f7eb42ee1..8b8164d34 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 @@ -12,7 +12,7 @@ - + @@ -25,11 +25,6 @@ -
- -
@@ -97,5 +92,11 @@ + + + +
diff --git a/src/app/app.scss b/src/app/app.scss index 5891c94ff..5dcc0a919 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -677,6 +677,16 @@ canvas[core-chart] { } } +.has-fab .scroll-content{ + padding-bottom: 56px; +} + +.scroll-content ion-fab { + position: fixed; + margin-bottom: 56px; +} + + // For some reason, in iOS the pages don't inherit the background-color from ion-app, set it explicitly. .ion-page { background-color: $background-color; diff --git a/src/components/empty-box/empty-box.scss b/src/components/empty-box/empty-box.scss index 6c379ea4c..4f4e90575 100644 --- a/src/components/empty-box/empty-box.scss +++ b/src/components/empty-box/empty-box.scss @@ -19,6 +19,7 @@ core-empty-box { display: table-cell; text-align: center; vertical-align: middle; + pointer-events: auto; } &.core-empty-box-inline { diff --git a/src/core/course/components/module-description/core-course-module-description.html b/src/core/course/components/module-description/core-course-module-description.html index 8ccd37fc2..412d5bf3b 100644 --- a/src/core/course/components/module-description/core-course-module-description.html +++ b/src/core/course/components/module-description/core-course-module-description.html @@ -1,6 +1,8 @@ - {{ note }} + + + {{ note }} \ No newline at end of file diff --git a/src/core/login/pages/sites/sites.html b/src/core/login/pages/sites/sites.html index 4e57f2aa5..22cae12bf 100644 --- a/src/core/login/pages/sites/sites.html +++ b/src/core/login/pages/sites/sites.html @@ -9,7 +9,7 @@ - +