diff --git a/config.xml b/config.xml index f6eb04930..bc9004833 100644 --- a/config.xml +++ b/config.xml @@ -248,6 +248,11 @@ 3.9.5 + + + en + + YES diff --git a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html index 2ff793fe5..31cf913b0 100644 --- a/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html +++ b/src/addons/block/myoverview/components/myoverview/addon-block-myoverview.html @@ -2,40 +2,42 @@

{{ 'addon.block_myoverview.pluginname' | translate }}

- -
- - - - - {{prefetchCoursesData[selectedFilter].badge}} - - - +
+ +
+ + + + + {{prefetchCoursesData[selectedFilter].badge}} + + + +
+ + + + + + + + +
- - - - - - - - -
diff --git a/src/addons/mod/assign/components/index/addon-mod-assign-index.html b/src/addons/mod/assign/components/index/addon-mod-assign-index.html index d662546c1..ff8b08066 100644 --- a/src/addons/mod/assign/components/index/addon-mod-assign-index.html +++ b/src/addons/mod/assign/components/index/addon-mod-assign-index.html @@ -109,7 +109,8 @@

{{ 'addon.mod_assign.numberofdraftsubmissions' | translate }}

@@ -124,7 +125,8 @@

{{ 'addon.mod_assign.numberofsubmittedassignments' | translate }}

@@ -139,7 +141,9 @@

{{ 'addon.mod_assign.numberofsubmissionsneedgrading' | translate }}

diff --git a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html index e159aa314..bd6f3fa27 100644 --- a/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html +++ b/src/addons/mod/feedback/components/index/addon-mod-feedback-index.html @@ -73,7 +73,9 @@
-

{{ 'addon.mod_feedback.completed_feedbacks' | translate }}

diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html index 776466587..01bcfe080 100644 --- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html +++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.html @@ -63,7 +63,7 @@ - + # diff --git a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.scss b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.scss index 87902ea3e..82ba0a46c 100644 --- a/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.scss +++ b/src/addons/mod/h5pactivity/pages/user-attempts/user-attempts.scss @@ -1,6 +1,5 @@ :host { .addon-mod_h5pactivity-table-header { - --detail-icon-opacity: 0; font-weight: bold; } diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html index 3e3838662..39e77b870 100644 --- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html +++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html @@ -74,7 +74,7 @@ - + diff --git a/src/addons/mod/quiz/components/index/index.scss b/src/addons/mod/quiz/components/index/index.scss index c1958ffb6..abf80309f 100644 --- a/src/addons/mod/quiz/components/index/index.scss +++ b/src/addons/mod/quiz/components/index/index.scss @@ -1,10 +1,6 @@ :host { .addon-mod_quiz-table { - .addon-mod_quiz-table-header { - --detail-icon-opacity: 0; - } - ion-card-content { padding-left: 0; padding-right: 0; diff --git a/src/addons/remotethemes/services/remotethemes-handler.ts b/src/addons/remotethemes/services/remotethemes-handler.ts index b92f7b8d1..5cde27432 100644 --- a/src/addons/remotethemes/services/remotethemes-handler.ts +++ b/src/addons/remotethemes/services/remotethemes-handler.ts @@ -24,7 +24,6 @@ import { CoreStyleHandler, CoreStylesService } from '@features/styles/services/s import { CoreLogger } from '@singletons/logger'; import { CoreUtils } from '@services/utils/utils'; -const SEPARATOR_35 = /\/\*\*? *3\.5(\.0)? *styles? *\*\//i; // A comment like "/* 3.5 styles */". const COMPONENT = 'mmaRemoteStyles'; /** @@ -61,7 +60,7 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler { } // Config received, it's a temp site. - return await this.get35Styles(config.mobilecssurl); + return await this.getRemoteStyles(config.mobilecssurl); } const site = await CoreSites.getSite(siteId); @@ -86,7 +85,7 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler { this.logger.debug('Loading styles from: ', fileUrl); // Get the CSS content using HTTP because we will treat the styles before saving them in the file. - const style = await this.get35Styles(fileUrl); + const style = await this.getRemoteStyles(fileUrl); if (style != '') { // Treat the CSS. @@ -99,24 +98,17 @@ export class AddonRemoteThemesHandlerService implements CoreStyleHandler { } /** - * Check if the CSS code has a separator for 3.5 styles. If it does, get only the styles after the separator. + * Get styles from the url. * * @param url Url to get the code from. - * @return The filtered styles. + * @return The styles. */ - protected async get35Styles(url?: string): Promise { + protected async getRemoteStyles(url?: string): Promise { if (!url) { return ''; } - const cssCode = await CoreWS.getText(url); - - const separatorPos = cssCode.search(SEPARATOR_35); - if (separatorPos > -1) { - return cssCode.substr(separatorPos).replace(SEPARATOR_35, ''); - } - - return cssCode; + return await CoreWS.getText(url); } /** diff --git a/src/theme/components/format-text.scss b/src/theme/components/format-text.scss index b0543d50b..a46570e14 100644 --- a/src/theme/components/format-text.scss +++ b/src/theme/components/format-text.scss @@ -284,7 +284,7 @@ core-format-text { } -core-format-text, +core-format-text .core-format-text-content, core-rich-text-editor .core-rte-editor { @include core-headings(); diff --git a/src/theme/globals.mixins.scss b/src/theme/globals.mixins.scss index 13c691f3e..52031a533 100644 --- a/src/theme/globals.mixins.scss +++ b/src/theme/globals.mixins.scss @@ -148,22 +148,22 @@ @mixin core-headings() { h1 { - font-size: 3rem; + font-size: 26px; } h2, .item-heading { - font-size: 2.8rem; + font-size: 24px; } h3 { - font-size: 2.6rem; + font-size: 22px; } h4 { - font-size: 2.2rem; + font-size: 20px; } h5 { - font-size: 1.8rem; + font-size: 18px; } h6 { - font-size: 1.4rem; + font-size: 16px; } } diff --git a/src/theme/theme.base.scss b/src/theme/theme.base.scss index 41eec733f..adb9cf7f8 100644 --- a/src/theme/theme.base.scss +++ b/src/theme/theme.base.scss @@ -881,6 +881,11 @@ ion-datetime.datetime-disabled { opacity: .8 !important; } +// Hide details on items to align badges. +ion-item.hide-detail { + --detail-icon-opacity: 0; +} + // Make links clickable when inside radio or checkbox items. Style part. @media (hover: hover) { ion-item.item-multiple-inputs:hover::part(native) {