Skip to content

Commit 259ad33

Browse files
authored
Merge pull request #2438 from luckyklyist/luckyklyist/confusingIcons
confusing icons hover issue fix #2255
2 parents 2f1b66b + a6facad commit 259ad33

File tree

2 files changed

+18
-31
lines changed

2 files changed

+18
-31
lines changed

client/modules/IDE/components/QuickAddList/Icons.jsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
4-
import CheckIcon from '../../../../images/check_encircled.svg';
53
import CloseIcon from '../../../../images/close.svg';
4+
import CheckIcon from '../../../../images/check_encircled.svg';
65

76
const Icons = ({ isAdded }) => {
87
const classes = [
@@ -21,12 +20,6 @@ const Icons = ({ isAdded }) => {
2120
focusable="false"
2221
/>
2322
<CheckIcon
24-
className="quick-add__in-icon"
25-
role="img"
26-
aria-label="Descending"
27-
focusable="false"
28-
/>
29-
<CloseIcon
3023
className="quick-add__add-icon"
3124
role="img"
3225
aria-label="Descending"

client/styles/components/_quick-add.scss

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,11 @@
8383
}
8484
}
8585

86-
.quick-add__add-icon {
87-
transform: rotate(45deg);
88-
}
89-
90-
.quick-add__item:hover,
91-
.quick-add__item-toggle:hover,
86+
.quick-add__item,
87+
.quick-add__item-toggle,
9288
.quick-add__item-toggle:focus {
9389
cursor: pointer;
90+
9491
@include themify() {
9592
& .quick-add__icon path {
9693
fill: getThemifyVariable('table-button-hover-color');
@@ -100,28 +97,25 @@
10097
fill: getThemifyVariable('table-button-background-hover-color');
10198
}
10299
}
100+
}
103101

104-
& .quick-add__in-icon {
105-
display: none;
102+
.quick-add__icon--in-collection {
103+
.quick-add__remove-icon {
104+
display: inline-block;
106105
}
107106

108-
& .quick-add__icon--in-collection {
109-
.quick-add__remove-icon {
110-
display: inline-block;
111-
}
112-
113-
.quick-add__add-icon {
114-
display: none;
115-
}
107+
.quick-add__add-icon {
108+
display: none;
116109
}
110+
}
117111

118-
& .quick-add__icon--not-in-collection {
119-
.quick-add__add-icon {
120-
display: inline-block;
121-
}
112+
.quick-add__icon--not-in-collection {
113+
.quick-add__add-icon {
114+
display: inline-block;
115+
}
122116

123-
.quick-add__remove-icon {
124-
display: none;
125-
}
117+
.quick-add__remove-icon {
118+
display: none;
126119
}
127120
}
121+

0 commit comments

Comments
 (0)