Skip to content

Commit fc4c8b8

Browse files
LordCat0LordCat0
authored
Merge branch 'develop' into around-the-world
2 parents dbfa873 + f84b22e commit fc4c8b8

File tree

26 files changed

+313
-232
lines changed

26 files changed

+313
-232
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/components/custom-procedures/custom-procedures.jsx‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ const CustomProcedures = props => {
2525
const [inputIcon, setInputIcon] = useState(textInputIcon);
2626
useEffect(() => {
2727
switch (props.menuOption) {
28-
case "stringornumber": // To be split up as string and number types on a later date
29-
setInputIcon(textInputIcon);
30-
break;
31-
case "boolean":
32-
setInputIcon(booleanInputIcon);
33-
break;
34-
case "object":
35-
setInputIcon(objectInputIcon);
36-
break;
37-
case "array":
38-
setInputIcon(arrayInputIcon);
39-
break;
40-
};
28+
case 'stringornumber': // To be split up as string and number types on a later date
29+
setInputIcon(textInputIcon);
30+
break;
31+
case 'boolean':
32+
setInputIcon(booleanInputIcon);
33+
break;
34+
case 'object':
35+
setInputIcon(objectInputIcon);
36+
break;
37+
case 'array':
38+
setInputIcon(arrayInputIcon);
39+
break;
40+
}
4141
}, [props.menuOption]);
4242

4343
return (
@@ -102,7 +102,7 @@ const CustomProcedures = props => {
102102
</div>
103103
</div>
104104
</div>
105-
<br></br>
105+
<br />
106106
<div className={styles.sectionTitle}>
107107
<FormattedMessage
108108
defaultMessage="Select a color"
@@ -112,103 +112,103 @@ const CustomProcedures = props => {
112112
</div>
113113
<Box className={styles.colorRow}>
114114
<span
115-
style={{ backgroundColor: "#FF6680" }}
115+
style={{backgroundColor: '#FF6680'}}
116116
className={styles.colorOption}
117117
role="button"
118118
color="#FF6680"
119119
draggable={false}
120120
onClick={props.setColor}
121121
/>
122122
<span
123-
style={{ backgroundColor: "#4C97FF" }}
123+
style={{backgroundColor: '#4C97FF'}}
124124
className={styles.colorOption}
125125
role="button"
126126
color="#4C97FF"
127127
draggable={false}
128128
onClick={props.setColor}
129129
/>
130130
<span
131-
style={{ backgroundColor: "#9966FF" }}
131+
style={{backgroundColor: '#9966FF'}}
132132
className={styles.colorOption}
133133
role="button"
134134
color="#9966FF"
135135
draggable={false}
136136
onClick={props.setColor}
137137
/>
138138
<span
139-
style={{ backgroundColor: "#CF63CF" }}
139+
style={{backgroundColor: '#CF63CF'}}
140140
className={styles.colorOption}
141141
role="button"
142142
color="#CF63CF"
143143
draggable={false}
144144
onClick={props.setColor}
145145
/>
146146
<span
147-
style={{ backgroundColor: "#FFBF00" }}
147+
style={{backgroundColor: '#FFBF00'}}
148148
className={styles.colorOption}
149149
role="button"
150150
color="#FFBF00"
151151
draggable={false}
152152
onClick={props.setColor}
153153
/>
154154
<span
155-
style={{ backgroundColor: "#FFAB19" }}
155+
style={{backgroundColor: '#FFAB19'}}
156156
className={styles.colorOption}
157157
role="button"
158158
color="#FFAB19"
159159
draggable={false}
160160
onClick={props.setColor}
161161
/>
162162
<span
163-
style={{ backgroundColor: "#5CB1D6" }}
163+
style={{backgroundColor: '#5CB1D6'}}
164164
className={styles.colorOption}
165165
role="button"
166166
color="#5CB1D6"
167167
draggable={false}
168168
onClick={props.setColor}
169169
/>
170170
<span
171-
style={{ backgroundColor: "#59C059" }}
171+
style={{backgroundColor: '#59C059'}}
172172
className={styles.colorOption}
173173
role="button"
174174
color="#59C059"
175175
draggable={false}
176176
onClick={props.setColor}
177177
/>
178178
<span
179-
style={{ backgroundColor: "#FF8C1A" }}
179+
style={{backgroundColor: '#FF8C1A'}}
180180
className={styles.colorOption}
181181
role="button"
182182
color="#FF8C1A"
183183
draggable={false}
184184
onClick={props.setColor}
185185
/>
186186
<span
187-
style={{ backgroundColor: "#FF661A" }}
187+
style={{backgroundColor: '#FF661A'}}
188188
className={styles.colorOption}
189189
role="button"
190190
color="#FF661A"
191191
draggable={false}
192192
onClick={props.setColor}
193193
/>
194194
<span
195-
style={{ backgroundColor: "#5755D4" }}
195+
style={{backgroundColor: '#66BD5C'}}
196196
className={styles.colorOption}
197197
role="button"
198-
color="#5755D4"
198+
color="#66BD5C"
199199
draggable={false}
200200
onClick={props.setColor}
201201
/>
202202
<span
203-
style={{ backgroundColor: "#E4DB8C" }}
203+
style={{backgroundColor: '#5755D4'}}
204204
className={styles.colorOption}
205205
role="button"
206-
color="#E4DB8C"
206+
color="#5755D4"
207207
draggable={false}
208208
onClick={props.setColor}
209209
/>
210210
<input
211-
style={{ backgroundColor: props.colour }}
211+
style={{backgroundColor: props.colour}}
212212
type="color"
213213
value={props.colour}
214214
className={styles.colorPicker}

‎src/components/library/library.jsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,9 @@ class LibraryComponent extends React.Component {
305305
[styles.withFilterBar]: this.props.filterable || this.props.tags
306306
})}
307307
ref={this.setFilteredDataRef}
308-
onClickCapture={e => { this._lastClickWasShift = e.shiftKey; }}
308+
onClickCapture={e => {
309+
this._lastClickWasShift = e.shiftKey;
310+
}}
309311
>
310312
{filteredData && this.getFilteredData().map((dataItem, index) => (
311313
dataItem === '---' ? (
@@ -408,4 +410,4 @@ LibraryComponent.defaultProps = {
408410
showPlayButton: false
409411
};
410412

411-
export default injectIntl(LibraryComponent);
413+
export default injectIntl(LibraryComponent);

‎src/components/menu-bar/menu-bar.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ class MenuBar extends React.Component {
339339
if (modifier) {
340340
if (event.key.toLowerCase() === 's') {
341341
this.props.handleSaveProject();
342-
event.preventDefault();
342+
event.preventDefault();
343343
} else if (event.key.toLowerCase() === 'o') {
344-
event.preventDefault();
344+
event.preventDefault();
345345
this.props.onStartSelectingFileUpload();
346346
}
347347
}

‎src/components/monitor/table-monitor-scroller.jsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,10 @@ class TableMonitorScroller extends React.Component {
120120
// Skip rendering data for the + button column
121121
if (columnIndex === this.getColumnCount() + 1) {
122122
return (
123-
<div key={key} style={style} />
123+
<div
124+
key={key}
125+
style={style}
126+
/>
124127
);
125128
}
126129

‎src/components/monitor/table-monitor.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ TableMonitor.propTypes = {
7979
PropTypes.oneOfType([
8080
PropTypes.number,
8181
PropTypes.string
82-
])))
82+
])))
8383
]),
8484
width: PropTypes.number
8585
};

‎src/components/nb-editor-settings-modal/editor-settings-modal.css‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,11 @@
344344
margin-right: 0.5rem;
345345
}
346346

347+
.checkbox:disabled {
348+
opacity: 0.5;
349+
pointer-events: none;
350+
}
351+
347352
.help-icon {
348353
position: relative;
349354
border: 0;
@@ -431,3 +436,27 @@
431436
.key-setting > * {
432437
flex: 1 0;
433438
}
439+
440+
.collapseButton {
441+
display: flex;
442+
align-items: center;
443+
font: inherit;
444+
color: inherit;
445+
text-align: left;
446+
background: none;
447+
border: none;
448+
cursor: pointer;
449+
padding: 0;
450+
}
451+
452+
.collapseArrow {
453+
display: inline-block;
454+
width: 0.7rem;
455+
margin-left: 0.5rem;
456+
aspect-ratio: 1 / 1;
457+
transform: rotate(-90deg);
458+
}
459+
460+
.collapseArrowExpanded {
461+
transform: none;
462+
}

0 commit comments

Comments
 (0)