Skip to content

Commit 8d542f9

Browse files
author
Miguel Solorio
committed
Color picker polish (Fixes microsoft#83589)
1 parent 5240d97 commit 8d542f9

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/vs/editor/contrib/colorPicker/colorPicker.css

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,20 @@
2828

2929
.colorpicker-header .picked-color {
3030
width: 216px;
31-
text-align: center;
31+
display: flex;
32+
align-items: center;
33+
justify-content: center;
3234
line-height: 24px;
3335
cursor: pointer;
3436
color: white;
3537
flex: 1;
36-
text-align: center;
38+
}
39+
40+
.colorpicker-header .picked-color .codicon {
41+
color: inherit;
42+
font-size: 14px;
43+
position: absolute;
44+
left: 8px;
3745
}
3846

3947
.colorpicker-header .picked-color.light {

src/vs/editor/contrib/colorPicker/colorPickerWidget.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { Emitter, Event } from 'vs/base/common/event';
1212
import { Disposable } from 'vs/base/common/lifecycle';
1313
import 'vs/css!./colorPicker';
1414
import { ColorPickerModel } from 'vs/editor/contrib/colorPicker/colorPickerModel';
15+
import { localize } from 'vs/nls';
1516
import { editorHoverBackground } from 'vs/platform/theme/common/colorRegistry';
1617
import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/common/themeService';
1718

@@ -31,6 +32,9 @@ export class ColorPickerHeader extends Disposable {
3132

3233
this.pickedColorNode = dom.append(this.domNode, $('.picked-color'));
3334

35+
const tooltip = localize('clickToToggleColorOptions', "Click to toggle color options (rgb/hsl/hex)");
36+
this.pickedColorNode.setAttribute('title', tooltip);
37+
3438
const colorBox = dom.append(this.domNode, $('.original-color'));
3539
colorBox.style.backgroundColor = Color.Format.CSS.format(this.model.originalColor) || '';
3640

@@ -58,6 +62,7 @@ export class ColorPickerHeader extends Disposable {
5862

5963
private onDidChangePresentation(): void {
6064
this.pickedColorNode.textContent = this.model.presentation ? this.model.presentation.label : '';
65+
this.pickedColorNode.prepend($('.codicon.codicon-color-mode'));
6166
}
6267
}
6368

0 commit comments

Comments
 (0)