From 15dac04d8d2657437967c9c377d68c329161070b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 4 Sep 2018 13:28:13 +0200 Subject: [PATCH] MOBILE-2567 ux: Style select --- src/app/app.scss | 22 ++++++++++++++++--- .../pages/my-overview/my-overview.html | 4 ++-- src/theme/variables.scss | 4 ++++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/app/app.scss b/src/app/app.scss index 08adcea53..3a4cf162f 100644 --- a/src/app/app.scss +++ b/src/app/app.scss @@ -374,6 +374,13 @@ ion-app.app-root { @include core-headings(); } + .item core-format-text, + core-format-text { + p { + margin-bottom: 1rem; + } + } + // Images in ion-card have width 100% and display block. Remove that when the image is in core-format-text. ion-card core-format-text img { width: min-content; @@ -417,10 +424,19 @@ ion-app.app-root { } } - :not(.item) > * > * > ion-select, + ion-select { + color: $core-select-placeholder-color; + align-self: start; + + .select-icon .select-icon-inner { + color: $core-select-placeholder-color; + } + } + + ion-select.core-button-select, .core-button-select { background-color: white; - color: $core-color; + color: $core-select-placeholder-color; white-space: normal; align-self: start; max-width: none; @@ -452,7 +468,7 @@ ion-app.app-root { } .select-icon .select-icon-inner { - color: $core-color; + color: $core-select-placeholder-color; } ion-icon:last-child { diff --git a/src/core/courses/pages/my-overview/my-overview.html b/src/core/courses/pages/my-overview/my-overview.html index 095ac7eff..4055e823b 100644 --- a/src/core/courses/pages/my-overview/my-overview.html +++ b/src/core/courses/pages/my-overview/my-overview.html @@ -37,7 +37,7 @@
- + {{ 'core.courses.inprogress' | translate }} {{ 'core.courses.future' | translate }} {{ 'core.courses.past' | translate }} @@ -82,7 +82,7 @@
- + {{ 'core.courses.sortbydates' | translate }} {{ 'core.courses.sortbycourses' | translate }} diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 10e70f4b2..4f5b43224 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -135,6 +135,7 @@ $core-login-box-background-border: $gray !default; $core-login-box-text-color: $text-color !default; $core-login-button-outline: false !default; $core-login-loading-color: false !default; +$core-select-placeholder-color: $core-color; // App iOS Variables // -------------------------------------------------- @@ -149,6 +150,7 @@ $tabs-ios-tab-color-inactive: $tabs-tab-color-inactive; $button-ios-outline-background-color: $core-button-outline-background-color; $toolbar-ios-height: 44px + 8; // Avoid toolbar with different heights. $checkbox-ios-icon-border-radius: 0px !default; +$select-ios-placeholder-color: $core-select-placeholder-color; $radio-ios-disabled-opacity: .5 !default; $checkbox-ios-disabled-opacity: .5 !default; $toggle-ios-disabled-opacity: .5 !default; @@ -166,6 +168,7 @@ $spinner-md-crescent-color: $core-spinner-color; $tabs-md-tab-color-inactive: $tabs-tab-color-inactive; $button-md-outline-background-color: $core-button-outline-background-color; $font-family-md-base: "Roboto", "Noto Sans", "Helvetica Neue", sans-serif !default; +$select-md-placeholder-color: $core-select-placeholder-color; $radio-md-disabled-opacity: .5 !default; $checkbox-md-disabled-opacity: .5 !default; $toggle-md-disabled-opacity: .5 !default; @@ -181,6 +184,7 @@ $loading-wp-spinner-color: $core-loading-spinner-color; $spinner-wp-circles-color: $core-spinner-color; $tabs-wp-tab-color-inactive: $tabs-tab-color-inactive; $button-wp-outline-background-color: $core-button-outline-background-color; +$select-wp-placeholder-color: $core-select-placeholder-color; $radio-wp-disabled-opacity: .5 !default; $checkbox-wp-disabled-opacity: .5 !default; $toggle-wp-disabled-opacity: .5 !default;