Skip to content

Commit d768df0

Browse files
committed
Adjust styling of find setting switches, update button styling for new file and new folder form
1 parent 4b4b31e commit d768df0

File tree

7 files changed

+50
-20
lines changed

7 files changed

+50
-20
lines changed

client/images/down-arrow.svg

Lines changed: 2 additions & 2 deletions
Loading

client/images/up-arrow.svg

Lines changed: 2 additions & 2 deletions
Loading

client/modules/IDE/components/NewFileForm.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,12 @@ class NewFileForm extends React.Component {
3333
{...domOnlyProps(name)}
3434
ref={(element) => { this.fileName = element; }}
3535
/>
36-
<input type="submit" value="Add File" aria-label="add file" />
36+
<input
37+
type="submit"
38+
value="Add File"
39+
aria-label="add file"
40+
className="new-file-form__submit"
41+
/>
3742
</div>
3843
{name.touched && name.error && <span className="form-error">{name.error}</span>}
3944
</form>

client/modules/IDE/components/NewFolderForm.jsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ class NewFolderForm extends React.Component {
3434
ref={(element) => { this.fileName = element; }}
3535
{...domOnlyProps(name)}
3636
/>
37-
<input type="submit" value="Add Folder" aria-label="add folder" />
37+
<input
38+
type="submit"
39+
value="Add Folder"
40+
aria-label="add folder"
41+
className="new-folder-form__submit"
42+
/>
3843
</div>
3944
{name.touched && name.error && <span className="form-error">{name.error}</span>}
4045
</form>

client/styles/abstracts/_variables.scss

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ $themes: (
4646
modal-button-color: $dark,
4747
background-color: $lighter,
4848
button-background-color: $light,
49+
button-secondary-background-color: $medium-light,
4950
button-color: $black,
5051
button-border-color: $middle-light,
5152
toolbar-button-color: $p5js-pink,
@@ -119,9 +120,10 @@ $themes: (
119120
secondary-text-color: $medium-light,
120121
inactive-text-color: $middle-light,
121122
background-color: $darker,
122-
button-background-color: $lightest,
123-
button-color: $darkest,
124-
button-border-color: $middle-gray,
123+
button-background-color: $dark,
124+
button-secondary-background-color: $medium-dark,
125+
button-color: $light,
126+
button-border-color: $middle-dark,
125127
toolbar-button-color: $p5js-pink,
126128
toolbar-button-background-color: $medium-dark,
127129
button-background-hover-color: $p5js-pink,
@@ -191,9 +193,10 @@ $themes: (
191193
secondary-text-color: $lighter,
192194
inactive-text-color: $light,
193195
background-color: $darker,
194-
button-background-color: $white,
195-
button-color: $black,
196-
button-border-color: $middle-gray,
196+
button-background-color: $dark,
197+
button-secondary-background-color: $medium-dark,
198+
button-color: $light,
199+
button-border-color: $middle-dark,
197200
toolbar-button-color: $dark,
198201
toolbar-button-background-color: $medium-light,
199202
button-background-hover-color: $yellow,

client/styles/components/_editor.scss

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,30 @@ pre.CodeMirror-line {
143143
.CodeMirror-search-modifiers {
144144
display: flex;
145145
justify-content: flex-end;
146+
align-items: center;
146147
}
147148

148149
.CodeMirror-regexp-button,
149150
.CodeMirror-case-button,
150151
.CodeMirror-word-button {
151-
width: 20px;
152-
height: 20px;
152+
@include themify() {
153+
// @extend %button;
154+
padding: #{2 / $base-font-size}rem #{7 / $base-font-size}rem;
155+
border: 2px solid transparent;
156+
&:hover {
157+
border-color: getThemifyVariable("button-border-color");
158+
}
153159

154-
margin-left: #{10 / $base-font-size}rem;
160+
}
161+
width: #{35 / $base-font-size}rem;
162+
height: #{35 / $base-font-size}rem;
163+
164+
& + & {
165+
margin-left: #{10 / $base-font-size}rem;
166+
}
155167

156168
word-break: keep-all;
157169
white-space: nowrap;
158-
159-
@include themify() {
160-
color: getThemifyVariable('inactive-text-color');
161-
}
162170
}
163171

164172
.CodeMirror-regexp-button .label,
@@ -169,7 +177,9 @@ pre.CodeMirror-line {
169177

170178
[aria-checked="true"] {
171179
@include themify() {
172-
color: getThemifyVariable('primary-text-color');
180+
color: getThemifyVariable("heavy-text-color");
181+
background-color: getThemifyVariable("button-secondary-background-color");
182+
border-color: getThemifyVariable("button-border-color");
173183
}
174184
}
175185

client/styles/components/_modal.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@
4545
flex: 1;
4646
}
4747

48+
input.new-file-form__submit,
49+
input.new-folder-form__submit {
50+
@include themify() {
51+
background-color: getThemifyVariable("button-secondary-background-color");
52+
}
53+
}
54+
4855
.modal__divider {
4956
text-align: center;
5057
margin: #{20 / $base-font-size}rem 0;

0 commit comments

Comments
 (0)