Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #527 from coding-blocks/revamp-UI-fixes
Revamp ui fixes
- Loading branch information
Showing
11 changed files
with
61 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
app/pods/components/my-courses-list/expired-courses/content/template.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 4 additions & 2 deletions
6
app/pods/components/my-courses-list/progress-bar/template.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| <progress value={{percent}} max="100" class="d-inline-block w-80 {{progressBarClass}}"></progress> | ||
| <span class="bold ml-3">{{percent}}%</span> | ||
| <div class="d-flex align-items-center"> | ||
| <progress value={{percent}} max="100" class="flex-1 {{progressBarClass}}"></progress> | ||
| <span class="bold ml-3">{{percent}}%</span> | ||
| </div> |
14 changes: 5 additions & 9 deletions
14
app/pods/components/my-courses-list/recently-accessed/content/template.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,18 @@ | ||
| <div class="col-md-5 col-6"> | ||
| <div class="col-lg-5 col-md-6 pl-md-3 mt-md-0 mt-4"> | ||
| <div class="font-normal">Course Progress</div> | ||
| <div class="mt-3"> | ||
| <MyCoursesList::ProgressBar @percent={{progressPercent}} /> | ||
| </div> | ||
| </div> | ||
| <div class="col-md-3 col-12 mt-md-0 mt-3"> | ||
| <div class="col-lg-3 col-12 mt-lg-0 mt-4 pl-lg-3"> | ||
| <div class="row no-gutters justify-content-around align-items-center"> | ||
| <a href="#" class="font-normal {{fontClassName}}"> {{progressText}} </a> | ||
| <LinkTo | ||
| @route="classroom.timeline.overview" | ||
| @models={{array run.course.id run.id}} | ||
| @tagName="button" | ||
| class="button-orange button-solid" | ||
| > | ||
| <LinkTo @route="classroom.timeline.overview" @models={{array run.course.id run.id}} @tagName="button" | ||
| class="button-orange button-solid"> | ||
| {{resumeButtonText}} | ||
| </LinkTo> | ||
| {{#if showGetCertificate}} | ||
| <button class="button-green button-solid">Get Certificate</button> | ||
| <button class="button-green button-solid">Get Certificate</button> | ||
| {{/if}} | ||
| </div> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,15 @@ | ||
|
|
||
| <div class="row no-gutters align-items-center mt-4"> | ||
| <div class="col-md-4 col-6"> | ||
| <div class="col-lg-4 col-md-6"> | ||
| <div class="row no-gutters align-items-center"> | ||
| <div class="col-3"> | ||
| <img class="mr-5 s-80x80" src={{course.logo}} alt={{course.title}}> | ||
| <div> | ||
| <img class="s-60x60 br-5" src={{course.logo}} alt={{course.title}}> | ||
| </div> | ||
| <div class="col-9"> | ||
| <div class="flex-1 pl-4"> | ||
| <h5 class="bold">{{course.title}}</h5> | ||
| <div class="font-normal mt-2">Mentor: {{instrcutorNames}}</div> | ||
| <div>Expires {{moment-from-now (unix run.topRunAttempt.end)}} </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {{yield run.topRunAttempt.progressPercent}} | ||
| </div> | ||
| {{yield run.topRunAttempt.progressPercent}} | ||
| </div> |
68 changes: 30 additions & 38 deletions
68
app/pods/components/player/player-doubts-tab/template.hbs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,38 @@ | ||
| <div class="py-4 d-flex align-items-center font-sm"> | ||
| <span class="bold">Filter Doubts</span> | ||
| <div class="py-4 row no-gutters align-items-center font-sm"> | ||
| <span class="bold col-sm-2 col-12 mb-sm-0 mb-3">Filter Doubts</span> | ||
|
|
||
| <div class="input-radio gradient-input small ml-4"> | ||
| <input | ||
| checked={{eq filter 'all'}} | ||
| type="radio" | ||
| id="my-doubts" | ||
| onclick={{action (mut filter) 'all'}} /> | ||
| <label for="my-doubts"> | ||
| <span class="ml-3"> | ||
| My Doubts | ||
| </span> | ||
| </label> | ||
| </div> | ||
| <div class="col-sm-10 col-6 row no-gutters"> | ||
| <div class="input-radio gradient-input small ml-sm-4"> | ||
| <input checked={{eq filter 'all'}} type="radio" id="my-doubts" onclick={{action (mut filter) 'all'}} /> | ||
| <label for="my-doubts"> | ||
| <span class="ml-3"> | ||
| My Doubts | ||
| </span> | ||
| </label> | ||
| </div> | ||
|
|
||
| <div class="input-radio gradient-input small ml-4"> | ||
| <input | ||
| checked={{eq filter 'resolved'}} | ||
| type="radio" | ||
| id="resolved-doubts" | ||
| onclick={{action (mut filter) 'resolved'}} /> | ||
| <label for="resolved-doubts"> | ||
| <span class="ml-3"> | ||
| Resolved Doubts | ||
| </span> | ||
| </label> | ||
| </div> | ||
| <div class="input-radio gradient-input small ml-sm-4 mt-sm-0 mt-2"> | ||
| <input checked={{eq filter 'resolved'}} type="radio" id="resolved-doubts" | ||
| onclick={{action (mut filter) 'resolved'}} /> | ||
| <label for="resolved-doubts"> | ||
| <span class="ml-3"> | ||
| Resolved Doubts | ||
| </span> | ||
| </label> | ||
| </div> | ||
|
|
||
| <div class="input-radio gradient-input small ml-4"> | ||
| <input | ||
| checked={{eq filter 'unresolved'}} | ||
| type="radio" | ||
| id="unresolved-doubts" | ||
| onclick={{action (mut filter) 'unresolved'}} /> | ||
| <label for="unresolved-doubts"> | ||
| <span class="ml-3"> | ||
| Unresolved Doubts | ||
| </span> | ||
| </label> | ||
| <div class="input-radio gradient-input small ml-sm-4 mt-sm-0 mt-2"> | ||
| <input checked={{eq filter 'unresolved'}} type="radio" id="unresolved-doubts" | ||
| onclick={{action (mut filter) 'unresolved'}} /> | ||
| <label for="unresolved-doubts"> | ||
| <span class="ml-3"> | ||
| Unresolved Doubts | ||
| </span> | ||
| </label> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="divider-h"></div> | ||
|
|
||
| <Player::PlayerDoubtsList @doubts={{doubtsList}} /> | ||
| <Player::PlayerDoubtsList @doubts={{doubtsList}} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters