Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monaco: fix quick-input-list styling #10923

Merged
merged 1 commit into from
Mar 29, 2022
Merged

monaco: fix quick-input-list styling #10923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
outline: none;
}

#theia-sample-toolbar-contribution .icon-wrapper.action-item.item.enabled:hover {
#theia-sample-toolbar-contribution .icon-wrapper.action-label.item.enabled:hover {
background-color: var(--theia-toolbar-hoverBackground);
}

Expand Down
2 changes: 1 addition & 1 deletion examples/api-samples/src/browser/toolbar/sample-toolbar-contribution.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class SampleToolbarContribution extends AbstractToolbarContribution
<div
role='button'
tabIndex={0}
className='icon-wrapper action-item item enabled codicon codicon-search'
className='icon-wrapper action-label item enabled codicon codicon-search'
id='easy-search-item-icon'
onClick={this.handleOnClick}
title='Search for files, text, commands, and more...'
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/shell/tab-bars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export class TabBarRenderer extends TabBar.Renderer {
this.renderBadge(data, isInSidePanel)
),
h.div({
className: 'p-TabBar-tabCloseIcon action-item',
className: 'p-TabBar-tabCloseIcon action-label',
onclick: this.handleCloseClickEvent
})
);
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/browser/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@ blockquote {
outline: none;
}

.action-item {
.action-label {
padding: 2px;
border-radius: 5px;
cursor: pointer;
}

.action-item:hover {
.action-label:hover {
background-color: var(--theia-toolbar-hoverBackground);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/style/tabs.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ body.theia-editor-highlightModifiedTabs
cursor: pointer;
}

.p-TabBar-toolbar :not(.item.enabled) .action-item {
.p-TabBar-toolbar :not(.item.enabled) .action-label {
background: transparent;
cursor: default;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/browser/widgets/widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ decorate(unmanaged(), Widget, 0);
export * from '@phosphor/widgets';
export * from '@phosphor/messaging';

export const ACTION_ITEM = 'action-item';
export const ACTION_ITEM = 'action-label';

export function codiconArray(name: string, actionItem = false): string[] {
const array = ['codicon', `codicon-${name}`];
Expand Down
2 changes: 1 addition & 1 deletion packages/filesystem/src/browser/style/file-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
cursor: default;
}

.dialogContent span.theia-mod-disabled .action-item {
.dialogContent span.theia-mod-disabled .action-label {
background: none;
}

Expand Down
9 changes: 1 addition & 8 deletions packages/monaco/src/browser/style/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,20 +165,13 @@

.quick-input-list .monaco-list-row .codicon {
color: var(--theia-foreground) !important;
padding-left: 0px !important;
padding: 2px !important;
}

.quick-input-list .monaco-list-row.focused .codicon {
color: var(--theia-list-foreground) !important;
}

.monaco-action-bar .action-item {
height: var(--theia-ui-icon-font-size);
width: var(--theia-ui-icon-font-size);
margin: auto;
padding-right: calc(var(--theia-ui-padding) * 0.5);
}

.quick-input-list .monaco-list-row.focused .monaco-highlighted-label .highlight {
color: var(--theia-list-focusHighlightForeground) !important;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/search-in-workspace/src/browser/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
background-image: var(--theia-icon-replace-all);
}

.replace-all-button-container .action-item.disabled {
.replace-all-button-container .action-label.disabled {
opacity: var(--theia-mod-disabled-opacity);
background: transparent;
cursor: default;
Expand Down
4 changes: 2 additions & 2 deletions packages/toolbar/src/browser/style/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@
line-height: var(--theia-toolbar-icon-size);
}

#main-toolbar .toolbar-item.action-item.enabled:hover:not(.dragging):not(.active) {
#main-toolbar .toolbar-item.action-label.enabled:hover:not(.dragging):not(.active) {
background-color: var(--theia-toolbar-hoverBackground);
}

#main-toolbar .toolbar-item.action-item:not(.enabled) {
#main-toolbar .toolbar-item.action-label:not(.enabled) {
cursor: default;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/toolbar/src/browser/toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ export class ToolbarImpl extends TabBarToolbar {
id={item.id}
data-position={stringifiedPosition}
key={`${item.id}-${stringifiedPosition}`}
className={`${toolbarItemClassNames} toolbar-item action-item`}
className={`${toolbarItemClassNames} toolbar-item action-label`}
onMouseDown={this.onMouseDownEvent}
onMouseUp={this.onMouseUpEvent}
onMouseOut={this.onMouseUpEvent}
Expand Down