From 88ddd664a944fb6732248027ca4e278c3fd9520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 12 Dec 2018 09:59:50 +0100 Subject: [PATCH 1/3] MOBILE-2629 dashboard: Balance course cards width --- .../addon-block-recentlyaccesseditems.html | 4 ++-- .../recentlyaccesseditems/recentlyaccesseditems.scss | 2 +- .../courses/components/course-progress/course-progress.scss | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html index b61015674..2f419264f 100644 --- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html +++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/addon-block-recentlyaccesseditems.html @@ -3,7 +3,7 @@
- +
@@ -11,7 +11,7 @@

- +
diff --git a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss index 0ae7043f0..83c2695ce 100644 --- a/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss +++ b/src/addon/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.scss @@ -1,3 +1,3 @@ -ion-app.app-root addon-block-recentlyaccesseditems .core-horizontal-scroll .card { +ion-app.app-root addon-block-recentlyaccesseditems .core-horizontal-scroll > div { @include horizontal_scroll_item(80%, 250px, 300px); } \ No newline at end of file diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss index cf0b3bc4c..e79f1dcac 100644 --- a/src/core/courses/components/course-progress/course-progress.scss +++ b/src/core/courses/components/course-progress/course-progress.scss @@ -96,12 +96,11 @@ ion-app.app-root core-courses-course-progress { ion-app.app-root .core-horizontal-scroll core-courses-course-progress { - @include horizontal_scroll_item(45%, 210px, 300px); - + @include horizontal_scroll_item(80%, 250px, 300px); ion-card.card { .core-course-thumb { - padding-top: 40%; + padding-top: 30%; } .core-course-link { From cf1ff4c9aff9547b743e1bad147a3b2cd7ba5e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 Dec 2018 11:34:55 +0100 Subject: [PATCH 2/3] MOBILE-2629 styles: Changes on variables to improve customization --- src/components/ion-tabs/ion-tabs.scss | 3 +++ src/components/tabs/tabs.scss | 2 +- src/core/login/pages/reconnect/reconnect.scss | 21 ++++++++++++------- src/core/login/pages/site/site.scss | 2 +- src/theme/variables.scss | 4 ++++ 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss index 5fcdfc79a..22cf41ef9 100644 --- a/src/components/ion-tabs/ion-tabs.scss +++ b/src/components/ion-tabs/ion-tabs.scss @@ -16,7 +16,10 @@ ion-app.app-root core-ion-tabs { } } } + } + .tab-badge.badge { + background-color: $ion-tabs-badge-color; } } diff --git a/src/components/tabs/tabs.scss b/src/components/tabs/tabs.scss index d4dc1e7d2..89f7b3e8f 100644 --- a/src/components/tabs/tabs.scss +++ b/src/components/tabs/tabs.scss @@ -44,7 +44,7 @@ ion-app.app-root .core-tabs-bar { &[aria-selected=true] { color: $core-top-tabs-color-active !important; border: 0 !important; - border-bottom: 2px solid $core-top-tabs-color-active !important; + border-bottom: 2px solid $core-top-tabs-border-active !important; } } diff --git a/src/core/login/pages/reconnect/reconnect.scss b/src/core/login/pages/reconnect/reconnect.scss index 0d3098368..ae0e7ea16 100644 --- a/src/core/login/pages/reconnect/reconnect.scss +++ b/src/core/login/pages/reconnect/reconnect.scss @@ -18,6 +18,16 @@ ion-app.app-root page-core-login-reconnect { background: $core-login-box-background-color; border: 1px solid $core-login-box-background-border; color: $core-login-box-text-color; + + .item { + background: $core-login-item-background-color; + @include padding-horizontal(0); + } + + .item-inner { + background: $core-login-item-inner-background-color; + @include padding-horizontal(0); + } } .core-sitename, .core-siteurl { @@ -41,14 +51,11 @@ ion-app.app-root page-core-login-reconnect { } .list .core-username { - &.item-md { - @include padding-horizontal($item-md-padding-start, $content-padding); + &.item { + @include padding-horizontal(0); } - &.item-ios { - @include padding-horizontal($item-ios-padding-start, $content-padding); - } - &.item-wp { - @include padding-horizontal($item-wp-padding-start, $content-padding); + .item-heading { + margin-top: 0; } .item-inner { diff --git a/src/core/login/pages/site/site.scss b/src/core/login/pages/site/site.scss index cf296f1a4..86f94e8f7 100644 --- a/src/core/login/pages/site/site.scss +++ b/src/core/login/pages/site/site.scss @@ -1,6 +1,6 @@ ion-app.app-root page-core-login-site { .scroll-content { - background: $core-login-page-background-color; + background-color: $core-login-page-background-color; } img.login-logo { diff --git a/src/theme/variables.scss b/src/theme/variables.scss index cc584668c..29b5087ce 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -107,6 +107,7 @@ $tabs-background: $gray-darker !default; $tabs-border-color: #b2b2b2 !default; $tabs-tab-color-active: $core-color !default; $tabs-tab-color-inactive: $white !default; +$ion-tabs-badge-color: $tabs-tab-color-active !default; $text-input-highlight-color-valid: $green !default; $text-input-highlight-color-invalid: $red !default; @@ -147,6 +148,8 @@ $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-login-item-inner-background-color: $white !default; +$core-login-item-background-color: $white !default; // App iOS Variables // -------------------------------------------------- @@ -241,6 +244,7 @@ $core-top-tabs-background: $white !default; $core-top-tabs-color: $gray-dark !default; $core-top-tabs-border: $gray !default; $core-top-tabs-color-active: $core-color !default; +$core-top-tabs-border-active: $core-top-tabs-color-active !default; $core-splitview-selected: $core-color-light !default; $core-progressbar-color: $core-color-light !default; From 6931391fb44cd78c79de54f85874d42b31f790d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Thu, 13 Dec 2018 16:50:10 +0100 Subject: [PATCH 3/3] MOBILE-2629 login: Hide oAuth provider image on error --- src/core/login/pages/credentials/credentials.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/login/pages/credentials/credentials.html b/src/core/login/pages/credentials/credentials.html index affc119e6..84a2e5c8a 100644 --- a/src/core/login/pages/credentials/credentials.html +++ b/src/core/login/pages/credentials/credentials.html @@ -43,7 +43,7 @@ {{ 'core.login.potentialidps' | translate }}