Skip to content

Commit 2b3ad39

Browse files
committed
replacing fa-plug with fusionDB logo
1 parent 7bdc523 commit 2b3ad39

File tree

10 files changed

+1054
-11
lines changed

10 files changed

+1054
-11
lines changed

fusion-studio-extension/src/browser/commands.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const actConnect: FSAction = {
1919
menu: MENU,
2020
menuLabel: 'New Server...',
2121
keys: 'ctrlcmd+shift+n',
22-
icon: 'fa fa-plug',
22+
icon: 'fa fusion-menu-icon',
2323
execute: (core, prepare) => () => prepare && prepare().then(() => core.newConnection()),
2424
};
2525
export const actDisconnect: FSAction = {

fusion-studio-extension/src/browser/style/fusion.svg

Lines changed: 970 additions & 0 deletions
Loading

fusion-studio-extension/src/browser/welcome-contribution.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export class FSWelcomeContribution extends AbstractViewContribution<FSWelcomeWid
3535
menus.registerMenuAction(CommonMenus.HELP, {
3636
commandId: 'FusionEval:welcome',
3737
label: 'Fusion Studio',
38-
icon: 'fa fa-plug',
38+
icon: 'fa fusion-menu-icon',
3939
order: '0',
4040
});
4141
}

fusion-studio-extension/src/browser/widget/_home.scss

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,19 @@
66
text-align: center;
77
margin: 4px 0 8px;
88
color: #fff;
9+
10+
911
i {
10-
line-height: 1.28571429em;
11-
border: 4px solid;
12-
border-radius: 100%;
12+
// remove the circle
13+
// line-height: 1.28571429em;
14+
// border: 4px solid;
15+
// border-radius: 100%;
1316
overflow: hidden;
17+
18+
// for the fusion-logo
19+
height: 3rem;
20+
width: 8rem;
21+
background-position: bottom;
1422
}
1523
}
1624
.description {

fusion-studio-extension/src/browser/widget/_toolbar.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
flex: 1;
77
margin-bottom: 4px;
88
height: 23px;
9+
>.title {
10+
display: flex;
11+
}
912
> span:first-child {
1013
flex: 1;
1114
i {

fusion-studio-extension/src/browser/widget/_welcome.scss

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,66 @@
99
text-decoration: underline;
1010
}
1111
}
12-
}
12+
}
13+
14+
// fusion-logo style
15+
.fusion {
16+
&-header {
17+
align-items: center;
18+
display: flex;
19+
}
20+
&-logo {
21+
// i feel bad for this monstrosity but without it, it doesnt work
22+
background-repeat: no-repeat !important; //
23+
background-size: contain !important; // theia has forced my hand
24+
margin-right: 8px;
25+
display: inline-block;
26+
width: 4rem;
27+
padding-top: 3rem;
28+
background: url(fusion.svg);
29+
}
30+
31+
&-menu-icon{
32+
display: flex;
33+
justify-content: center;
34+
align-items: center;
35+
36+
&::before {
37+
display: inline-block;
38+
content: "";
39+
background: url(fusion.svg);
40+
width: 100%;
41+
background-position-x: center;
42+
height: 0.7rem;
43+
background-size: contain;
44+
background-repeat: no-repeat;
45+
}
46+
}
47+
48+
&-tabBar-icon {
49+
display: flex;
50+
justify-content: center;
51+
align-items: center;
52+
53+
&::before {
54+
display: inline-block;
55+
content: "";
56+
background: url(fusion.svg);
57+
width: 2rem;
58+
height: 1.95rem;
59+
background-size: contain;
60+
background-repeat: no-repeat;
61+
}
62+
}
63+
64+
&-toolbar-icon {
65+
background: url(fusion.svg);
66+
padding-top: 5%;
67+
width: 10%;
68+
background-position-x: right;
69+
background-size: contain;
70+
background-repeat: no-repeat;
71+
}
72+
73+
}
74+

fusion-studio-extension/src/browser/widget/home.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export class FSHome extends React.Component<FSHomeProps, any> {
1010
return (
1111
<div id="fusion-home" className='theia-navigator-container'>
1212
<div className="title">
13-
<p><i className="fa fa-plug fa-fw fa-5x" /></p>
13+
<i className="fusion-logo" />
1414
<p>Fusion Studio</p>
1515
</div>
1616
<div className="description">

fusion-studio-extension/src/browser/widget/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class FSViewWidget extends TreeWidget {
2424
this.id = 'fusion-view';
2525
this.title.label = 'Servers';
2626
this.title.caption = 'Servers';
27-
this.title.iconClass = 'fa fa-plug';
27+
this.title.iconClass = 'fa fusion-tabBar-icon';
2828
this.title.closable = true;
2929
this.addClass('fusion-view');
3030
}

fusion-studio-extension/src/browser/widget/toolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class FSToolbar extends React.Component<FSToolbarProps, any> {
3030
public render() {
3131
return (
3232
<div id='fusion-toolbar'>
33-
<span className="title"><i className="fa fa-plug fa-fw"></i>Servers</span>
33+
<span className="title"><i className="fa fusion-toolbar-icon"></i>Servers</span>
3434
{this.button('fusion-toolbar-button-add', { ...actConnect, icon: 'fa fa-plus'})}
3535
{/* {this.button('fusion-toolbar-button-delete', 'Remove connection', 'minus', this.deleteConnection, 'red')} */}
3636
</div>

fusion-studio-extension/src/browser/widget/welcome.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export class FSWelcomeWidget extends ReactWidget {
3333

3434
protected render(): React.ReactNode {
3535
return <React.Fragment>
36-
<h1><i className="fa fa-plug fa-fw" /> Fusion Studio</h1>
36+
<h1 className="fusion-header"> <i className="fusion-logo"></i> Fusion Studio</h1>
3737
<p>Welcome to Fusion Studio, an IDE and Management Tool for FusionDB Server.</p>
3838
<br/>
3939
<ul>
@@ -43,7 +43,7 @@ export class FSWelcomeWidget extends ReactWidget {
4343
<span className="checkbox" onClick={e => this.store(!this.checked)}>
4444
<span className={'checkbox-box' + (this.checked ? ' checked' : '')}>
4545
<span></span>
46-
</span>
46+
</span>ls
4747
<span className="checkbox-label">Show at startup</span>
4848
</span>
4949
</React.Fragment>

0 commit comments

Comments
 (0)