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.

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

[tabbar][enhancement] Add icons and captions to view tabs #2867

Merged
merged 1 commit into from
Sep 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ export class CallHierarchyTreeWidget extends TreeWidget {

this.id = CALLHIERARCHY_ID;
this.title.label = 'Call Hierarchy';
this.title.iconClass = 'fa fa-arrow-circle-down';
this.title.caption = 'Call Hierarchy';
this.title.iconClass = 'fa call-hierarchy-tab-icon';
this.title.closable = true;
this.addClass(HIERARCHY_TREE_CLASS);
this.toDispose.push(this.model.onSelectionChanged(selection => {
Expand Down
4 changes: 4 additions & 0 deletions packages/callhierarchy/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@
text-overflow: ellipsis;
color: var(--theia-ui-font-color2);
}

.call-hierarchy-tab-icon::before {
content: "\f0ab"
}
5 changes: 3 additions & 2 deletions packages/core/src/browser/style/sidepanel.css
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
position: relative;
padding: 12px 8px;
background: var(--theia-layout-color2);
flex-direction: column;
}

.p-TabBar.theia-app-left .p-TabBar-tab {
Expand Down Expand Up @@ -84,11 +85,11 @@
position: absolute;
min-height: var(--theia-private-sidebar-tab-width);
max-height: var(--theia-private-sidebar-tab-width);
align-items: flex-start;
}

.p-TabBar.theia-app-sides .p-TabBar-tabIcon {
position: absolute;
transform: scale(1.5) translate(3px,1px);
transform: scale(1.5);
max-height: 15px;
}

Expand Down
4 changes: 4 additions & 0 deletions packages/debug/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -235,3 +235,7 @@ div[orientation='vertical'] > .theia-debug-entry > .theia-TreeContainer > div >
background: var(--theia-layout-color0);
height: 380px
}

.debug-tab-icon::before {
content: "\f188"
}
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class DebugWidget extends BaseWidget {
this.title.label = debugSession.configuration.name;
this.title.caption = debugSession.configuration.name;
this.title.closable = true;
this.title.iconClass = 'fa fa-bug';
this.title.iconClass = 'fa debug-tab-icon';
this.addClass(DebugStyles.DEBUG_CONTAINER);
this.widgets = [this.toolbar, this.variables, this.threads, this.frames, this.breakpoints];
}
Expand Down
2 changes: 2 additions & 0 deletions packages/extension-manager/src/browser/extension-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export class ExtensionWidget extends ReactWidget {
super();
this.id = 'extensions';
this.title.label = 'Extensions';
this.title.caption = 'Extensions';
this.title.iconClass = 'fa extensions-tab-icon';
this.addClass('theia-extensions');

this.update();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,8 @@
justify-content: flex-end;
align-items: center;
flex: 3;
}
}

.extensions-tab-icon::before {
content: "\f12e"
}
2 changes: 2 additions & 0 deletions packages/git/src/browser/git-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ export class GitWidget extends ReactWidget implements StatefulWidget {
super();
this.id = 'theia-gitContainer';
this.title.label = 'Git';
this.title.caption = 'Git';
this.title.iconClass = 'fa git-tab-icon';
this.scrollContainer = GitWidget.Styles.CHANGES_CONTAINER;
this.addClass('theia-git');
this.node.tabIndex = 0;
Expand Down
2 changes: 2 additions & 0 deletions packages/git/src/browser/history/git-history-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ export class GitHistoryWidget extends GitNavigableListWidget<GitHistoryListNode>
this.id = GIT_HISTORY;
this.scrollContainer = 'git-history-list-container';
this.title.label = 'Git History';
this.title.caption = 'Git History';
this.title.iconClass = 'fa git-history-tab-icon';
this.addClass('theia-git');
this.resetState();
this.cancelIndicator = new CancellationTokenSource();
Expand Down
4 changes: 4 additions & 0 deletions packages/git/src/browser/style/history.css
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,7 @@
align-items: center;
justify-content: center;
}

.git-history-tab-icon::before {
content: "\f1da"
}
4 changes: 4 additions & 0 deletions packages/git/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,7 @@
.no-select:focus {
outline: none;
}

.git-tab-icon::before {
content: "\f126"
}
3 changes: 2 additions & 1 deletion packages/markers/src/browser/problem/problem-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export class ProblemWidget extends TreeWidget {

this.id = 'problems';
this.title.label = 'Problems';
this.title.iconClass = 'fa fa-exclamation-circle';
this.title.caption = 'Problems';
this.title.iconClass = 'fa problem-tab-icon';
this.title.closable = true;
this.addClass('theia-marker-container');

Expand Down
6 changes: 5 additions & 1 deletion packages/markers/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,8 @@
min-width: 8px;
height: calc(var(--theia-private-horizontal-tab-height) * 0.8);
line-height: calc(var(--theia-private-horizontal-tab-height) * 0.8);
}
}

.problem-tab-icon::before {
content: "\f06a"
}
2 changes: 2 additions & 0 deletions packages/navigator/src/browser/navigator-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ export class FileNavigatorWidget extends FileTreeWidget {
super(props, model, contextMenuRenderer);
this.id = FILE_NAVIGATOR_ID;
this.title.label = LABEL;
this.title.caption = LABEL;
this.title.iconClass = 'fa navigator-tab-icon';
this.addClass(CLASS);
this.initialize();
}
Expand Down
4 changes: 4 additions & 0 deletions packages/navigator/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@
padding-bottom: 4px;
width: calc(100% - var(--theia-ui-padding)*4);
}

.navigator-tab-icon::before {
content: "\f0c5"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
defaultTreeProps
} from '@theia/core/lib/browser';
import { OutlineViewWidgetFactory, OutlineViewWidget } from './outline-view-widget';
import '../../src/browser/styles/index.css';

export default new ContainerModule(bind => {
bind(OutlineViewWidgetFactory).toFactory(ctx =>
Expand Down
2 changes: 2 additions & 0 deletions packages/outline-view/src/browser/outline-view-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ export class OutlineViewWidget extends TreeWidget {

this.id = 'outline-view';
this.title.label = 'Outline';
this.title.caption = 'Outline';
this.title.iconClass = 'fa outline-view-tab-icon';
this.addClass('theia-outline-view');
}

Expand Down
19 changes: 19 additions & 0 deletions packages/outline-view/src/browser/styles/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/********************************************************************************
* Copyright (C) 2017 TypeFox and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the Eclipse
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
* with the GNU Classpath Exception which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
********************************************************************************/

.outline-view-tab-icon::before {
content: "\f03a"
}
3 changes: 2 additions & 1 deletion packages/output/src/browser/output-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ export class OutputWidget extends ReactWidget {
super();
this.id = OUTPUT_WIDGET_KIND;
this.title.label = 'Output';
this.title.iconClass = 'fa fa-flag';
this.title.caption = 'Output';
this.title.iconClass = 'fa output-tab-icon';
this.title.closable = true;
this.addClass('theia-output');
}
Expand Down
6 changes: 5 additions & 1 deletion packages/output/src/browser/style/output.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@
background-repeat: no-repeat;
padding-left: 3px;
padding-right: 15px;
}
}

.output-tab-icon::before {
content: "\f024"
}
2 changes: 2 additions & 0 deletions packages/plugin-ext/src/main/browser/plugin-ext-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export class PluginWidget extends ReactWidget {
super();
this.id = 'plugins';
this.title.label = 'Plugins';
this.title.caption = 'Plugins';
this.title.iconClass = 'fa plugins-tab-icon';
this.addClass('theia-plugins');

this.update();
Expand Down
4 changes: 4 additions & 0 deletions packages/plugin-ext/src/main/browser/style/plugin-sidebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,7 @@
flex: 5;
align-items: center;
}

.plugins-tab-icon::before {
content: "\f0fe"
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ export class SearchInWorkspaceWidget extends BaseWidget implements StatefulWidge
init() {
this.id = SearchInWorkspaceWidget.ID;
this.title.label = SearchInWorkspaceWidget.LABEL;
this.title.caption = SearchInWorkspaceWidget.LABEL;
this.title.iconClass = 'fa search-in-workspace-tab-icon';

this.contentNode = document.createElement('div');
this.contentNode.classList.add('t-siw-search-container');
Expand Down
6 changes: 5 additions & 1 deletion packages/search-in-workspace/src/browser/styles/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -397,4 +397,8 @@

.replace-all-button.disabled {
opacity: 0.5;
}
}

.search-in-workspace-tab-icon::before {
content: "\f002"
}