diff --git a/src/addons/mod/data/components/index/addon-mod-data-index.html b/src/addons/mod/data/components/index/addon-mod-data-index.html index 26c2e3ec2..bf89fd47c 100644 --- a/src/addons/mod/data/components/index/addon-mod-data-index.html +++ b/src/addons/mod/data/components/index/addon-mod-data-index.html @@ -37,118 +37,115 @@ + - - + + - - + + + + + {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} + + - - - - - {{ 'core.hasdatatosync' | translate: {$a: moduleName} }} - - + + + {{'core.groupsseparate' | translate }} + {{'core.groupsvisible' | translate }} + + + + {{groupOpt.name}} + + + - - - {{'core.groupsseparate' | translate }} - {{'core.groupsvisible' | translate }} + + + + {{ 'addon.mod_data.notopenyet' | translate:{$a: timeAvailableFromReadable} }} + + + + + + + {{ 'addon.mod_data.expired' | translate:{$a: timeAvailableToReadable} }} + + + + > + + + + {{ 'addon.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: access.entrieslefttoview} } }} + + + + + > + + + + {{ 'addon.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }} + + + + + + + + + {{ 'addon.mod_data.resetsettings' | translate}} - - - {{groupOpt.name}} - - - - - - {{ 'addon.mod_data.notopenyet' | translate:{$a: timeAvailableFromReadable} }} - + + +

+
+
- - - - {{ 'addon.mod_data.expired' | translate:{$a: timeAvailableToReadable} }} - - +
+ - > - - - - {{ 'addon.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: access.entrieslefttoview} } }} - - - + +
- > - - - - {{ 'addon.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }} - - - + + + + + + {{ 'core.previous' | translate }} + + + + + {{ 'core.next' | translate }} + + + + + - - - - - {{ 'addon.mod_data.resetsettings' | translate}} - - + + - - -

-
-
-
+ + {{ 'addon.mod_data.resetsettings' | translate}} + -
- + - -
- - - - - - - {{ 'core.previous' | translate }} - - - - - {{ 'core.next' | translate }} - - - - - - - - - - - {{ 'addon.mod_data.resetsettings' | translate}} - - -
- - - - - - -
+ + + + + diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html index 4885fe49c..3466dfb92 100644 --- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html +++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html @@ -46,52 +46,50 @@ - - -
- +
+ + + + + + + + + {{ 'core.hasdatatosync' | translate:{$a: pageStr} }} + {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} + + + + + + + + + {{ pageWarning }} + + +
+
+
+ - + + + +
- - - - - - {{ 'core.hasdatatosync' | translate:{$a: pageStr} }} - {{ 'core.hasdatatosync' | translate:{$a: moduleName} }} - - - - - - - - - {{ pageWarning }} - - +
+ {{ 'core.tag.tags' | translate }}: +
-
-
- - - - -
+
+ -
- {{ 'core.tag.tags' | translate }}: - -
-
- - - - - - - - + + + + + diff --git a/src/core/directives/fab.ts b/src/core/directives/fab.ts index 433d16bf5..838c0b9c2 100644 --- a/src/core/directives/fab.ts +++ b/src/core/directives/fab.ts @@ -29,7 +29,7 @@ export class CoreFabDirective implements OnDestroy { protected static readonly PADDINGBOTTOM = 56; - protected element?: HTMLElement; + protected scrollElement?: HTMLElement; protected done = false; constructor(protected content: IonContent) { @@ -41,10 +41,10 @@ export class CoreFabDirective implements OnDestroy { */ async asyncInit(): Promise { if (this.content) { - this.element = await this.content.getScrollElement(); + this.scrollElement = await this.content.getScrollElement(); if (!this.done) { - const bottom = parseInt(this.element.style.paddingBottom, 10) || 0; - this.element.style.paddingBottom = (bottom + CoreFabDirective.PADDINGBOTTOM) + 'px'; + const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0; + this.scrollElement.style.paddingBottom = (bottom + CoreFabDirective.PADDINGBOTTOM) + 'px'; this.done = true; } } @@ -54,9 +54,9 @@ export class CoreFabDirective implements OnDestroy { * Destroy component. */ ngOnDestroy(): void { - if (this.done && this.element) { - const bottom = parseInt(this.element.style.paddingBottom, 10) || 0; - this.element.style.paddingBottom = (bottom + CoreFabDirective.PADDINGBOTTOM) + 'px'; + if (this.done && this.scrollElement) { + const bottom = parseInt(this.scrollElement.style.paddingBottom, 10) || 0; + this.scrollElement.style.paddingBottom = (bottom - CoreFabDirective.PADDINGBOTTOM) + 'px'; } } diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 17809b66b..e83caa979 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -496,3 +496,11 @@ ion-button.core-button-select { textarea:not([core-auto-rows]) { height: 200px; } + +ion-fab[core-fab] { + position: fixed; +} + +ion-content > ion-fab[core-fab] { + position: absolute; +}