From 8fd9ac9c18fe32dccaadfa8a9b0b99404dcb1219 Mon Sep 17 00:00:00 2001
From: Paulina Nogal <pnogal@wisc.edu>
Date: Thu, 14 Feb 2019 21:50:51 +0000
Subject: [PATCH] Roenroll 1392 status icons update
---
.../course-item/course-item.component.html | 1 -
.../course-item/course-item.component.scss | 4 ++--
.../sidenav-menu-item.component.html | 1 -
.../term-container.component.scss | 4 ++++
src/assets/sass/general.scss | 20 +++++++++++++------
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/app/degree-planner/shared/course-item/course-item.component.html b/src/app/degree-planner/shared/course-item/course-item.component.html
index ebf8cb5..050e81f 100644
--- a/src/app/degree-planner/shared/course-item/course-item.component.html
+++ b/src/app/degree-planner/shared/course-item/course-item.component.html
@@ -8,7 +8,6 @@
{{ course.subject }} {{course.catalogNumber}}
</p>
<div [ngSwitch]="status">
- <i *ngSwitchCase="'complete'" class="material-icons complete-icon">check_circle</i>
<i *ngSwitchCase="'in-progress'" class="material-icons in-progress-icon">check_circle</i>
<i *ngSwitchCase="'waitlist'" class="material-icons problem-icon">report_problem</i>
<i *ngSwitchCase="'incomplete'" class="material-icons error-icon">error</i>
diff --git a/src/app/degree-planner/shared/course-item/course-item.component.scss b/src/app/degree-planner/shared/course-item/course-item.component.scss
index a6b1cad..8b173f5 100644
--- a/src/app/degree-planner/shared/course-item/course-item.component.scss
+++ b/src/app/degree-planner/shared/course-item/course-item.component.scss
@@ -44,7 +44,7 @@
line-height: 1.4;
&:hover,
&:focus {
- background: #dadee0;
+ opacity: 0.8;
}
}
}
@@ -70,7 +70,7 @@
.course-credits,
.course-title {
text-decoration: line-through;
- opacity: 0.5;
+ opacity: 0.8;
}
}
diff --git a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html
index 4c37392..7c1dca3 100644
--- a/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html
+++ b/src/app/degree-planner/sidenav-menu-item/sidenav-menu-item.component.html
@@ -6,7 +6,6 @@
</mat-panel-title>
</mat-expansion-panel-header>
<ul id="course-key-list">
- <li><i class="material-icons complete-icon">check_circle</i> Course is complete</li>
<li><i class="material-icons in-progress-icon">check_circle</i> Course is currently in progress</li>
<li><i class="material-icons problem-icon">report_problem</i> Course is waitlisted</li>
<li><i class="material-icons error-icon">error</i> Course is incomplete</li>
diff --git a/src/app/degree-planner/term-container/term-container.component.scss b/src/app/degree-planner/term-container/term-container.component.scss
index 61593de..6db9a85 100644
--- a/src/app/degree-planner/term-container/term-container.component.scss
+++ b/src/app/degree-planner/term-container/term-container.component.scss
@@ -24,6 +24,10 @@
line-height: 20px;
margin-left: 5px;
color: #2879a8;
+ &:hover,
+ &:focus {
+ opacity: 0.8;
+ }
}
}
diff --git a/src/assets/sass/general.scss b/src/assets/sass/general.scss
index 308fbf5..bdf434e 100644
--- a/src/assets/sass/general.scss
+++ b/src/assets/sass/general.scss
@@ -55,12 +55,8 @@ body {
color: white;
}
-.complete-icon {
- color: #457a3b;
-}
-
.in-progress-icon {
- color: #9cba99;
+ color: #457a3b;
}
.problem-icon {
@@ -75,7 +71,6 @@ body {
color: map-get($uw-primary, 500);
}
-.complete-icon,
.in-progress-icon,
.problem-icon,
.error-icon,
@@ -84,6 +79,19 @@ body {
font-size: 16px !important;
margin-left: 5px;
padding-top: 5px;
+ &:hover,
+ &:focus {
+ cursor: default;
+ opacity: 0.9;
+ }
+}
+
+.mat-icon,
+.material-icons {
+ &:hover,
+ &:focus {
+ opacity: 0.8;
+ }
}
#favoriteCourse-dropZone {
--
GitLab