From 8dd2383d77b8ef3b401f13ecd9f50c49d0193aaf Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Thu, 15 Oct 2015 16:25:39 -0700 Subject: [PATCH] SUP-1798, Icon should be gray same as text if user has selected the another option. -- Fixed on both My Challenges and My SRMs pages SUP-1799, On mouse hover is not working for "Grid and List" on dashboard. --- assets/css/my-challenges/my-challenges.scss | 13 ++++++++++--- assets/css/my-dashboard/my-challenges.scss | 2 ++ assets/css/my-srms/my-srms.scss | 13 ++++++++++--- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/assets/css/my-challenges/my-challenges.scss b/assets/css/my-challenges/my-challenges.scss index e7c03738b..e3b21eed4 100644 --- a/assets/css/my-challenges/my-challenges.scss +++ b/assets/css/my-challenges/my-challenges.scss @@ -161,6 +161,13 @@ &.disabled { color: $black; cursor: default; + + &.tile:before { + background: url(/images/grid-on.svg); + } + &.list:before { + background: url(/images/list-on.svg); + } } &:before { @@ -169,14 +176,14 @@ margin-bottom: 2px; margin-right: 4px; vertical-align: middle; - @include background-image-size(16px, 16px); + @include background-image-size(12px, 12px); } &.tile:before { - background: url(/images/ico-grid.svg); + background: url(/images/grid-off.svg); } &.list:before { - background: url(/images/ico-list.svg); + background: url(/images/list-off.svg); } } diff --git a/assets/css/my-dashboard/my-challenges.scss b/assets/css/my-dashboard/my-challenges.scss index 0b8fb5435..a56244e09 100644 --- a/assets/css/my-dashboard/my-challenges.scss +++ b/assets/css/my-dashboard/my-challenges.scss @@ -32,9 +32,11 @@ line-height: 16px; text-transform: uppercase; color: #A3A3AE; + cursor: pointer; &.disabled { color: $black; + cursor: default; &.tile:before { background: url(/images/grid-on.svg); diff --git a/assets/css/my-srms/my-srms.scss b/assets/css/my-srms/my-srms.scss index bc702277a..3ec6b8f49 100644 --- a/assets/css/my-srms/my-srms.scss +++ b/assets/css/my-srms/my-srms.scss @@ -126,6 +126,13 @@ &.disabled { color: $black; cursor: default; + + &.tile:before { + background: url(/images/grid-on.svg); + } + &.list:before { + background: url(/images/list-on.svg); + } } &:before { @@ -134,14 +141,14 @@ margin-bottom: 2px; margin-right: 4px; vertical-align: middle; - @include background-image-size(16px, 16px); + @include background-image-size(12px, 12px); } &.tile:before { - background: url(/images/ico-grid.svg); + background: url(/images/grid-off.svg); } &.list:before { - background: url(/images/ico-list.svg); + background: url(/images/list-off.svg); } }