From 77d254dcadf7dfd2e6e3876502cc2294e2c3448d Mon Sep 17 00:00:00 2001 From: AlasdairSwan Date: Tue, 23 Jan 2018 11:27:29 -0500 Subject: [PATCH] LEARNER-3935 Style updates --- .../js/learner_analytics_dashboard/GradeTable.jsx | 4 ++-- .../sass/features/_learner-analytics-dashboard.scss | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lms/static/js/learner_analytics_dashboard/GradeTable.jsx b/lms/static/js/learner_analytics_dashboard/GradeTable.jsx index 6c2b044faa..6d96cbb2e1 100644 --- a/lms/static/js/learner_analytics_dashboard/GradeTable.jsx +++ b/lms/static/js/learner_analytics_dashboard/GradeTable.jsx @@ -43,7 +43,7 @@ class GradeTable extends React.Component { ); }); - return {rows}; + return rows.length ? {rows} : false; } render() { @@ -60,7 +60,7 @@ class GradeTable extends React.Component { {assignmentTypes.map((type, index) => this.getTableGroup(type, index))} - Totals + Total {passingGrade}% *{percentGrade}% diff --git a/lms/static/sass/features/_learner-analytics-dashboard.scss b/lms/static/sass/features/_learner-analytics-dashboard.scss index 39a2c9a8c8..b861edf31f 100644 --- a/lms/static/sass/features/_learner-analytics-dashboard.scss +++ b/lms/static/sass/features/_learner-analytics-dashboard.scss @@ -1,6 +1,5 @@ $mint-green: #92c9d3; $slices: #386f77, #1abc9c, $mint-green, #397d1c, #a39d3d, #0a5aaa; -$border-color: #4a4a4a; $table-border: rgba(155, 155, 155, 0.2); $font-color: #636c72; $heading-color: #292b2c; @@ -78,7 +77,8 @@ $trophy-gold: #f39c12; .grading-weight-wrapper { display: flex; flex-flow: row wrap; - border-bottom: 1px solid $border-color; + border-bottom: 1px solid $table-border; + margin-bottom: 25px; .chart-wrapper { width: 90px; height: 90px; @@ -193,6 +193,15 @@ $trophy-gold: #f39c12; font-weight: bold; } } + + .totals { + font-size: 18px; + border-color: $table-border; + + .footer-label { + color: black; + } + } } .footnote {