Skip to content

Commit

Permalink
[7576]: Support for vscode.workspace.findTextInFiles API
Browse files Browse the repository at this point in the history 
Signed-off-by: Ignacio Moreno <ignacio@genuitec.com>
  • Loading branch information
@nmorenor
nmorenor committed Jul 2, 2020
1 parent bd53574 commit 463b47e
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 48 deletions.
100 changes: 53 additions & 47 deletions packages/core/src/browser/style/sidepanel.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,19 @@
}

.p-TabBar.theia-app-left .p-TabBar-tab {
border-left: var(--theia-panel-border-width) solid transparent;
border-left: var(--theia-panel-border-width) solid transparent;
}

.p-TabBar.theia-app-left.theia-app-sides {
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
}

.p-TabBar.theia-app-right .p-TabBar-tab {
border-right: var(--theia-panel-border-width) solid transparent;
border-right: var(--theia-panel-border-width) solid transparent;
}

.p-Widget.p-TabBar.theia-app-right.theia-app-sides {
border-left: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
border-left: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
}

.p-TabBar.theia-app-sides .p-TabBar-tab.p-mod-current,
Expand All @@ -86,16 +86,16 @@
}

.p-TabBar.theia-app-left .p-TabBar-tab.p-mod-current.theia-mod-active {
border-left: var(--theia-panel-border-width) solid var(--theia-focusBorder);
border-left: var(--theia-panel-border-width) solid var(--theia-focusBorder);
}

.p-TabBar.theia-app-right .p-TabBar-tab.p-mod-current {
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-activeBorder);
border-top-color: transparent;
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-activeBorder);
border-top-color: transparent;
}

.p-TabBar.theia-app-right .p-TabBar-tab.p-mod-current.theia-mod-active {
border-right: var(--theia-panel-border-width) solid var(--theia-focusBorder);
border-right: var(--theia-panel-border-width) solid var(--theia-focusBorder);
}

.p-TabBar.theia-app-sides .p-TabBar-tabLabel,
Expand Down Expand Up @@ -154,12 +154,12 @@
max-width: var(--theia-private-sidebar-tab-width);
}

#theia-left-content-panel > .p-Panel {
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
#theia-left-content-panel>.p-Panel {
border-right: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
}

#theia-right-content-panel > .p-Panel {
border-left: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
#theia-right-content-panel>.p-Panel {
border-left: var(--theia-panel-border-width) solid var(--theia-activityBar-border);
}

.theia-side-panel {
Expand All @@ -168,7 +168,7 @@

.p-Widget.theia-side-panel .p-Widget,
.p-Widget .theia-sidepanel-toolbar {
color: var(--theia-sideBar-foreground);
color: var(--theia-sideBar-foreground);
}


Expand All @@ -177,23 +177,23 @@
| Perfect scrollbar
|----------------------------------------------------------------------------*/

.p-TabBar.theia-app-sides > .ps__rail-y {
.p-TabBar.theia-app-sides>.ps__rail-y {
width: var(--theia-private-sidebar-scrollbar-rail-width);
z-index: 1000;
}

#theia-app-shell .p-TabBar.theia-app-sides > .ps__rail-y >.ps__thumb-y {
#theia-app-shell .p-TabBar.theia-app-sides>.ps__rail-y>.ps__thumb-y {
width: var(--theia-private-sidebar-scrollbar-width);
right: calc((var(--theia-private-sidebar-scrollbar-rail-width) - var(--theia-private-sidebar-scrollbar-width)) / 2);
}

.p-TabBar.theia-app-sides > .ps__rail-y:hover,
.p-TabBar.theia-app-sides > .ps__rail-y:focus {
.p-TabBar.theia-app-sides>.ps__rail-y:hover,
.p-TabBar.theia-app-sides>.ps__rail-y:focus {
width: var(--theia-private-sidebar-scrollbar-rail-width);
}

.p-TabBar.theia-app-sides > .ps__rail-y:hover > .ps__thumb-y,
.p-TabBar.theia-app-sides > .ps__rail-y:focus > .ps__thumb-y {
.p-TabBar.theia-app-sides>.ps__rail-y:hover>.ps__thumb-y,
.p-TabBar.theia-app-sides>.ps__rail-y:focus>.ps__thumb-y {
width: var(--theia-private-sidebar-scrollbar-width);
right: calc((var(--theia-private-sidebar-scrollbar-rail-width) - var(--theia-private-sidebar-scrollbar-width)) / 2);
}
Expand All @@ -204,37 +204,37 @@
|----------------------------------------------------------------------------*/

#theia-bottom-content-panel {
background: var(--theia-panel-background);
background: var(--theia-panel-background);
}

#theia-bottom-content-panel .theia-input {
border-color: var(--theia-panelInput-border);
border-color: var(--theia-panelInput-border);
}

#theia-bottom-content-panel .p-DockPanel-handle[data-orientation='horizontal'] {
border-left: var(--theia-border-width) solid var(--theia-panel-border);
border-left: var(--theia-border-width) solid var(--theia-panel-border);
}

#theia-bottom-content-panel .p-TabBar {
border-top: var(--theia-border-width) solid var(--theia-panel-border);
background: inherit;
border-top: var(--theia-border-width) solid var(--theia-panel-border);
background: inherit;
}

#theia-bottom-content-panel .p-TabBar-tab {
background: inherit;
background: inherit;
}

#theia-bottom-content-panel .p-TabBar-tab:not(.p-mod-current) {
color: var(--theia-panelTitle-inactiveForeground);
color: var(--theia-panelTitle-inactiveForeground);
}

#theia-bottom-content-panel .p-TabBar-tab.p-mod-current {
color: var(--theia-panelTitle-activeForeground);
border-top: var(--theia-border-width) solid var(--theia-panelTitle-activeBorder);
color: var(--theia-panelTitle-activeForeground);
border-top: var(--theia-border-width) solid var(--theia-panelTitle-activeBorder);
}

#theia-bottom-content-panel .p-TabBar-tab.p-mod-current.theia-mod-active {
border-top-color: var(--theia-focusBorder);
border-top-color: var(--theia-focusBorder);
}

/*-----------------------------------------------------------------------------
Expand All @@ -247,15 +247,15 @@
visibility: hidden;
}

.p-TabBar.theia-app-sides > .theia-TabBar-hidden-content .p-TabBar-tab {
.p-TabBar.theia-app-sides>.theia-TabBar-hidden-content .p-TabBar-tab {
line-height: var(--theia-private-sidebar-tab-width);
}

.p-TabBar.theia-app-left > .theia-TabBar-hidden-content .p-TabBar-tabLabel {
.p-TabBar.theia-app-left>.theia-TabBar-hidden-content .p-TabBar-tabLabel {
transform: none;
}

.p-TabBar.theia-app-right > .theia-TabBar-hidden-content .p-TabBar-tabLabel {
.p-TabBar.theia-app-right>.theia-TabBar-hidden-content .p-TabBar-tabLabel {
transform: none;
}

Expand All @@ -264,33 +264,39 @@
|----------------------------------------------------------------------------*/

.theia-sidepanel-toolbar {
min-height: calc(var(--theia-private-horizontal-tab-height) + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2);
display: flex;
padding-left: 5px;
align-items: center;
background-color: var(--theia-sideBar-background);
min-height: calc(var(--theia-private-horizontal-tab-height) + var(--theia-private-horizontal-tab-scrollbar-rail-height) / 2);
display: flex;
padding-left: 5px;
align-items: center;
background-color: var(--theia-sideBar-background);
}

.theia-sidepanel-toolbar .theia-sidepanel-title {
color: var(--theia-settings-headerForeground);
flex: 1;
margin-left: 14px;
text-transform: uppercase;
font-size: var(--theia-ui-font-size0);
color: var(--theia-settings-headerForeground);
flex: 1;
margin-left: 14px;
text-transform: uppercase;
font-size: var(--theia-ui-font-size0);
}

.theia-sidepanel-toolbar .p-TabBar-toolbar .item {
color: var(--theia-icon-foreground);
color: var(--theia-icon-foreground);
}

.theia-sidepanel-toolbar .p-TabBar-toolbar .item > div{
height: 18px;
width: 18px;
background-repeat: no-repeat;
.theia-sidepanel-toolbar .p-TabBar-toolbar .item>div {
height: 18px;
width: 18px;
background-repeat: no-repeat;
}

.noWrapInfo {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}

.noWrapInfoTree {
white-space: pre;
overflow: hidden;
text-overflow: ellipsis;
}
2 changes: 1 addition & 1 deletion packages/plugin-ext/src/main/browser/view/tree-view-widget.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export class TreeViewWidget extends TreeWidget {
});
}

return <div className='noWrapInfo'>
return <div className='noWrapInfoTree'>
{...nodes}
{work && <span>{work}</span>}
{description && <span className='theia-tree-view-description'>
Expand Down

0 comments on commit 463b47e

Please sign in to comment.