Page MenuHomePhabricator
Files F3487022

D3699.diff
No OneTemporary
Actions

D3699.diff
View Options

diff --git a/web/modals/threads/color-selector-button.react.js b/web/modals/threads/color-selector-button.react.js
--- a/web/modals/threads/color-selector-button.react.js
+++ b/web/modals/threads/color-selector-button.react.js
@@ -13,7 +13,7 @@
function ColorSelectorButton(props: ColorSelectorButtonProps): React.Node {
const { color, currentColor, onColorSelection } = props;
- const active = color === currentColor;
+ const active = color.toLowerCase() === currentColor.toLowerCase();
const containerClassName = classNames(css.container, {
[css.active]: active,
});
diff --git a/web/modals/threads/thread-settings-modal.react.js b/web/modals/threads/thread-settings-modal.react.js
--- a/web/modals/threads/thread-settings-modal.react.js
+++ b/web/modals/threads/thread-settings-modal.react.js
@@ -41,7 +41,7 @@
import { useSelector } from '../../redux/redux-utils';
import Input from '../input.react';
import Modal from '../modal.react';
-import ColorPicker from './color-picker.react';
+import ColorSelector from './color-selector.react';
import css from './thread-settings-modal.css';
const { COMMUNITY_OPEN_SUBTHREAD, COMMUNITY_SECRET_SUBTHREAD } = threadTypes;
@@ -218,14 +218,10 @@
</div>
<div className={css.edit_thread_color_container}>
<div className={`${css.form_title} ${css.color_title}`}>Color</div>
- <div className={css.form_content}>
- <ColorPicker
- id="edit-thread-color"
- value={this.possiblyChangedValue('color')}
- disabled={inputDisabled}
- onChange={this.onChangeColor}
- />
- </div>
+ <ColorSelector
+ currentColor={this.possiblyChangedValue('color')}
+ onColorSelection={this.onChangeColor}
+ />
</div>
</div>
);

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 6:42 AM (20 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2675749
Default Alt Text
D3699.diff (1 KB)

Event Timeline