diff --git a/src/addon/block/myoverview/component/myoverview.ts b/src/addon/block/myoverview/component/myoverview.ts index c6876b019..ae339862f 100644 --- a/src/addon/block/myoverview/component/myoverview.ts +++ b/src/addon/block/myoverview/component/myoverview.ts @@ -168,7 +168,13 @@ export class AddonBlockMyOverviewComponent extends AddonBlockComponent implement this.courses.filter = ''; this.showFilter = false; - this.showSelectorFilter = (this.courses.past.length + this.courses.future.length) > 0; + this.showSelectorFilter = this.courses.past.length > 0 || this.courses.future.length > 0 || courses.some((course) => { + return typeof course.enddate != 'undefined'; + }); + if (!this.showSelectorFilter) { + // No selector, show all. + this.selectedFilter = 'all'; + } this.filteredCourses = this.courses[this.selectedFilter]; this.initPrefetchCoursesIcons(); diff --git a/src/components/progress-bar/progress-bar.scss b/src/components/progress-bar/progress-bar.scss index cdab090cc..a385388e0 100644 --- a/src/components/progress-bar/progress-bar.scss +++ b/src/components/progress-bar/progress-bar.scss @@ -1,4 +1,4 @@ -$core-progress-bar-height: 10px !default; +$core-progress-bar-height: 8px !default; ion-app.app-root core-progress-bar { @include padding(null, 55px, null, null); @@ -11,7 +11,7 @@ ion-app.app-root core-progress-bar { line-height: 40px; font-size: 1.4rem; color: $gray-darker; - @include position(-15px, 10px, null, null); + @include position(-16px, 10px, null, null); position: absolute; } @@ -19,7 +19,7 @@ ion-app.app-root core-progress-bar { -webkit-appearance: none; appearance: none; height: $core-progress-bar-height; - margin: 15px 0; + margin: 16px 0; padding: 0; display: block; width: 100%; @@ -27,15 +27,15 @@ ion-app.app-root core-progress-bar { .progress-bar-fallback, &[value]::-webkit-progress-bar { background-color: $gray-lighter; - border-radius: 999px; - border: 1px solid $gray-light; + border-radius: 0; + border:0; box-shadow: none; } .progress-bar-fallback span, &[value]::-webkit-progress-value { background-color: $core-progressbar-color; - border-radius: 999px; + border-radius: 0; } .progress-bar-fallback { diff --git a/src/core/courses/components/course-progress/course-progress.scss b/src/core/courses/components/course-progress/course-progress.scss index 259eac524..ce16ecd9b 100644 --- a/src/core/courses/components/course-progress/course-progress.scss +++ b/src/core/courses/components/course-progress/course-progress.scss @@ -8,11 +8,6 @@ ion-app.app-root core-courses-course-progress { .core-course-thumb { background: nth($core-course-image-background, $i + 1); } - - progress .progress-bar-fallback span, - progress[value]::-webkit-progress-value { - background-color: nth($core-course-image-background, $i + 1); - } } }