Skip to content

Commit b3c3efc

Browse files
authored
re #389, update styling in sidebar and editor for icon consistency (#1104)
* re #389, update styling in sidebar and editor for icon consistency * re #389, remove link to unused icon
1 parent 0b24938 commit b3c3efc

File tree

7 files changed

+39
-19
lines changed

7 files changed

+39
-19
lines changed
Lines changed: 12 additions & 0 deletions
Loading
Lines changed: 12 additions & 0 deletions
Loading

client/modules/IDE/components/FileNode.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import classNames from 'classnames';
77
import * as IDEActions from '../actions/ide';
88
import * as FileActions from '../actions/files';
99

10-
const downArrowUrl = require('../../../images/down-arrow.svg');
10+
const downArrowUrl = require('../../../images/down-filled-triangle.svg');
1111
const folderRightUrl = require('../../../images/triangle-arrow-right.svg');
1212
const folderDownUrl = require('../../../images/triangle-arrow-down.svg');
1313
const fileUrl = require('../../../images/file.svg');

client/modules/IDE/components/Sidebar.jsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import classNames from 'classnames';
44
import InlineSVG from 'react-inlinesvg';
55
import ConnectedFileNode from './FileNode';
66

7-
const folderUrl = require('../../../images/folder.svg');
8-
const downArrowUrl = require('../../../images/down-arrow.svg');
7+
const downArrowUrl = require('../../../images/down-filled-triangle.svg');
98

109
class Sidebar extends React.Component {
1110
constructor(props) {
@@ -72,10 +71,7 @@ class Sidebar extends React.Component {
7271
<nav className={sidebarClass} title="file-navigation" >
7372
<div className="sidebar__header" onContextMenu={this.toggleProjectOptions}>
7473
<h3 className="sidebar__title">
75-
<span className="sidebar__folder-icon">
76-
<InlineSVG src={folderUrl} />
77-
</span>
78-
<span>project-folder</span>
74+
<span>Sketch Files</span>
7975
</h3>
8076
<div className="sidebar__icons">
8177
<button

client/styles/abstracts/_placeholders.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
display: flex;
211211
position: absolute;
212212
flex-direction: column;
213-
top: 100%;
213+
top: 95%;
214214
height: auto;
215215
z-index: 9999;
216216
border-radius: #{6 / $base-font-size}rem;

client/styles/abstracts/_variables.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ $themes: (
6262
keyboard-shortcut-color: #757575,
6363
nav-hover-color: $p5js-pink,
6464
error-color: $p5js-pink,
65-
codefold-icon-open: url(../images/down-arrow.svg),
66-
codefold-icon-closed: url(../images/right-arrow.svg)
65+
codefold-icon-open: url(../images/triangle-arrow-down.svg),
66+
codefold-icon-closed: url(../images/triangle-arrow-right.svg)
6767
),
6868
dark: (
6969
logo-color: $p5js-pink,
@@ -111,8 +111,8 @@ $themes: (
111111
keyboard-shortcut-color: #B5B5B5,
112112
nav-hover-color: $p5js-pink,
113113
error-color: $p5js-pink,
114-
codefold-icon-open: url(../images/down-arrow-white.svg),
115-
codefold-icon-closed: url(../images/right-arrow-white.svg)
114+
codefold-icon-open: url(../images/triangle-arrow-down-white.svg),
115+
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg)
116116
),
117117
contrast: (
118118
logo-color: $yellow,
@@ -159,8 +159,8 @@ $themes: (
159159
keyboard-shortcut-color: #e1e1e1,
160160
nav-hover-color: $yellow,
161161
error-color: $p5-contrast-pink,
162-
codefold-icon-open: url(../images/down-arrow-white.svg),
163-
codefold-icon-closed: url(../images/right-arrow-white.svg)
162+
codefold-icon-open: url(../images/triangle-arrow-down-white.svg),
163+
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg)
164164
)
165165
);
166166

client/styles/components/_sidebar.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@
7575
.file-item__spacer {
7676
flex-shrink: 0;
7777
.sidebar__file-item & {
78-
width: #{33 / $base-font-size}rem;
78+
width: #{19 / $base-font-size}rem;
7979
.sidebar__file-item & {
80-
width: #{53 / $base-font-size}rem;
80+
width: #{39 / $base-font-size}rem;
8181
.sidebar__file-item & {
82-
width: #{73 / $base-font-size}rem;
82+
width: #{59 / $base-font-size}rem;
8383
.sidebar__file-item & {
84-
width: #{93 / $base-font-size}rem;
84+
width: #{79 / $base-font-size}rem;
8585
.sidebar__file-item & {
86-
width: #{113 / $base-font-size}rem;
86+
width: #{99 / $base-font-size}rem;
8787
}
8888
}
8989
}

0 commit comments

Comments
 (0)