Merge pull request #377 from appirio-tech/feature/style-fixes-p1

vikasrohit · vikasrohit · commit e69570818507 · 2015-10-15T16:26:25.000-07:00
SUP-1798, Icon should be gray same as text if user has selected the a…
diff --git 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
@@ -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
@@ -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);
             }
 
           }

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,13 @@`
`161`	`161`	`&.disabled {`
`162`	`162`	`color: $black;`
`163`	`163`	`cursor: default;`
	`164`	`+`
	`165`	`+ &.tile:before {`
	`166`	`+ background: url(/images/grid-on.svg);`
	`167`	`+ }`
	`168`	`+ &.list:before {`
	`169`	`+ background: url(/images/list-on.svg);`
	`170`	`+ }`
`164`	`171`	`}`
`165`	`172`
`166`	`173`	`&:before {`
`@@ -169,14 +176,14 @@`
`169`	`176`	`margin-bottom: 2px;`
`170`	`177`	`margin-right: 4px;`
`171`	`178`	`vertical-align: middle;`
`172`		`- @include background-image-size(16px, 16px);`
	`179`	`+ @include background-image-size(12px, 12px);`
`173`	`180`	`}`
`174`	`181`
`175`	`182`	`&.tile:before {`
`176`		`- background: url(/images/ico-grid.svg);`
	`183`	`+ background: url(/images/grid-off.svg);`
`177`	`184`	`}`
`178`	`185`	`&.list:before {`
`179`		`- background: url(/images/ico-list.svg);`
	`186`	`+ background: url(/images/list-off.svg);`
`180`	`187`	`}`
`181`	`188`
`182`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,13 @@`
`126`	`126`	`&.disabled {`
`127`	`127`	`color: $black;`
`128`	`128`	`cursor: default;`
	`129`	`+`
	`130`	`+ &.tile:before {`
	`131`	`+ background: url(/images/grid-on.svg);`
	`132`	`+ }`
	`133`	`+ &.list:before {`
	`134`	`+ background: url(/images/list-on.svg);`
	`135`	`+ }`
`129`	`136`	`}`
`130`	`137`
`131`	`138`	`&:before {`
`@@ -134,14 +141,14 @@`
`134`	`141`	`margin-bottom: 2px;`
`135`	`142`	`margin-right: 4px;`
`136`	`143`	`vertical-align: middle;`
`137`		`- @include background-image-size(16px, 16px);`
	`144`	`+ @include background-image-size(12px, 12px);`
`138`	`145`	`}`
`139`	`146`
`140`	`147`	`&.tile:before {`
`141`		`- background: url(/images/ico-grid.svg);`
	`148`	`+ background: url(/images/grid-off.svg);`
`142`	`149`	`}`
`143`	`150`	`&.list:before {`
`144`		`- background: url(/images/ico-list.svg);`
	`151`	`+ background: url(/images/list-off.svg);`
`145`	`152`	`}`
`146`	`153`
`147`	`154`	`}`