From fbcd0841f0bdc4362e2e4f596e8350506bf28f29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 3 Mar 2022 11:08:19 +0100 Subject: [PATCH 1/3] MOBILE-3814 style: Remove brand color from scss --- .../index/addon-mod-data-index.html | 2 +- .../course-format/course-format.html | 8 ++--- src/theme/theme.dark.scss | 2 +- src/theme/theme.light.scss | 30 +++++++++---------- 4 files changed, 21 insertions(+), 21 deletions(-) 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 12860af6f..b9dab9e0e 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 @@ -87,7 +87,7 @@ -
+
diff --git a/src/core/features/course/components/course-format/course-format.html b/src/core/features/course/components/course-format/course-format.html index b457038b7..7232b31bf 100644 --- a/src/core/features/course/components/course-format/course-format.html +++ b/src/core/features/course/components/course-format/course-format.html @@ -25,21 +25,21 @@
- - - - +
diff --git a/src/theme/theme.dark.scss b/src/theme/theme.dark.scss index e4985f605..57ddeeb61 100644 --- a/src/theme/theme.dark.scss +++ b/src/theme/theme.dark.scss @@ -55,7 +55,7 @@ --background-alternative: var(--gray-900); } - --core-bottom-tabs-badge-text-color: var(--brand-contrast); + --core-bottom-tabs-badge-text-color: var(--primary-contrast); --core-bottom-tabs-background: var(--gray-900); --core-bottom-tabs-color: var(--gray-200); diff --git a/src/theme/theme.light.scss b/src/theme/theme.light.scss index 2c054b588..f55a0c282 100644 --- a/src/theme/theme.light.scss +++ b/src/theme/theme.light.scss @@ -47,9 +47,6 @@ @include generate-color($color-name, $colors); } - --brand-color: var(--primary); - --brand-contrast: var(--primary-contrast); - // Accessibility vars. --a11y-min-target-size: 44px; --a11y-focus-color: var(--primary); @@ -94,12 +91,15 @@ --ion-card-color: var(--text-color); --ion-card-vertical-margin: 10px; --ion-card-horizontal-margin: 10px; + --ion-card-radius: var(--medium-radius); + --ion-card-border-width: 1px; + --ion-card-border-color: var(--stroke); ion-card { - --border-width: 1px; + --border-width: var(--ion-card-border-width); --border-style: solid; - --border-color: var(--stroke); + --border-color: var(--ion-card-border-color); --box-shadow: none; - --border-radius: var(--medium-radius); + --border-radius: var(--ion-card-radius); } --text-hightlight-background-color: #{$core-text-hightlight-background-color}; @@ -113,10 +113,10 @@ --core-bottom-tabs-background: var(--white); --core-bottom-tabs-color: var(--gray-700); - --core-bottom-tabs-color-selected: var(--brand-color); + --core-bottom-tabs-color-selected: var(--primary); --core-bottom-tabs-background-selected: transparent; - --core-bottom-tabs-badge-color: var(--brand-color); - --core-bottom-tabs-badge-text-color: var(--brand-contrast); + --core-bottom-tabs-badge-color: var(--primary); + --core-bottom-tabs-badge-text-color: var(--primary-contrast); --bottom-tabs-size: 48px; --side-tabs-size: 56px; ion-tab-bar.mainmenu-tabs { @@ -203,7 +203,7 @@ ion-action-sheet { --button-color: var(--ion-text-color); --button-color-selected: var(--ion-text-color); - --title-border-color: var(--brand-color); + --title-border-color: var(--primary); .action-sheet-title { --color: var(--ion-text-color); @@ -225,7 +225,7 @@ --core-tab-color: var(--subdued-text-color); --core-tab-border-color: var(--stroke); --core-tab-color-active: var(--dark); - --core-tab-border-color-active: var(--brand-color); + --core-tab-border-color-active: var(--primary); --core-tab-font-weight-active: normal; --core-tabs-height: 48px; core-tabs, core-tabs-outlet { @@ -239,7 +239,7 @@ } } - --core-loading-spinner: var(--brand-color); + --core-loading-spinner: var(--primary); ion-loading { --spinner-color: var(--core-loading-spinner); } @@ -250,9 +250,9 @@ } --core-progressbar-height: 8px; - --core-progressbar-color: var(--brand-color); + --core-progressbar-color: var(--primary); --core-progressbar-text-color: var(--medium); - --core-progressbar-background: var(--brand-tint); + --core-progressbar-background: var(--primary-tint); --ion-item-background: #{$ion-item-background}; --ion-item-detail-icon-color: var(--medium); @@ -304,7 +304,7 @@ --core-login-input-background: var(--white); --core-login-input-color: var(--gray-900); - --core-star-color: var(--brand-color); + --core-star-color: var(--primary); --core-large-avatar-size: 90px; --core-avatar-size: var(--a11y-min-target-size); From 2a20fea590830f38e86bd728a2c91b5b3039bda1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 3 Mar 2022 11:41:39 +0100 Subject: [PATCH 2/3] MOBILE-3814 collapsible: Use 108px as default max height --- src/core/directives/collapsible-item.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/directives/collapsible-item.ts b/src/core/directives/collapsible-item.ts index 3188421e9..b097611a3 100644 --- a/src/core/directives/collapsible-item.ts +++ b/src/core/directives/collapsible-item.ts @@ -20,7 +20,7 @@ import { CoreComponentsRegistry } from '@singletons/components-registry'; import { CoreEventLoadingChangedData, CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreFormatTextDirective } from './format-text'; -const defaultMaxHeight = 56; +const defaultMaxHeight = 64; const buttonHeight = 44; /** From 0b0920876bae3592c3147b9129fe703d608a54ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 3 Mar 2022 12:02:53 +0100 Subject: [PATCH 3/3] MOBILE-3998 imscp: Fix navbar not showing --- src/addons/mod/imscp/pages/view/view.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/addons/mod/imscp/pages/view/view.html b/src/addons/mod/imscp/pages/view/view.html index 309b6b94a..548cf095c 100644 --- a/src/addons/mod/imscp/pages/view/view.html +++ b/src/addons/mod/imscp/pages/view/view.html @@ -33,7 +33,7 @@ -