Skip to content

Commit b4aa169

Browse files
Merge pull request #215 from jekyll/design-tweaks
Design tweaks
2 parents a5bece2 + bebb438 commit b4aa169

File tree

5 files changed

+34
-29
lines changed

5 files changed

+34
-29
lines changed

src/containers/views/DataFileNew.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ export class DataFileNew extends Component {
6868
<div className="side-unit">
6969
<a onClick={() => this.handleClickSave()}
7070
className={"btn"+(datafileChanged ? " btn-success " : " btn-inactive ")+"btn-fat"}>
71-
<i className="fa fa-save" aria-hidden="true"></i>
72-
{updated ? 'Saved' : 'Save'}
71+
<i className="fa fa-plus-square" aria-hidden="true"></i>
72+
{updated ? 'Created' : 'Create'}
7373
</a>
7474
</div>
7575
</div>

src/containers/views/DocumentNew.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class DocumentNew extends Component {
8686
<div className="side-unit">
8787
<a onClick={() => this.handleClickSave()}
8888
className={"btn"+(fieldChanged ? " btn-success " : " btn-inactive ")+"btn-fat"}>
89-
<i className="fa fa-plus-square-o" aria-hidden="true"></i>
89+
<i className="fa fa-plus-square" aria-hidden="true"></i>
9090
{updated ? 'Created' : 'Create'}
9191
</a>
9292
</div>

src/containers/views/PageNew.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export class PageNew extends Component {
7878
<div className="side-unit">
7979
<a onClick={() => this.handleClickSave()}
8080
className={"btn"+(fieldChanged ? " btn-success " : " btn-inactive ")+"btn-fat"}>
81-
<i className="fa fa-plus-square-o" aria-hidden="true"></i>
81+
<i className="fa fa-plus-square" aria-hidden="true"></i>
8282
{updated ? 'Created' : 'Create'}
8383
</a>
8484
</div>

src/styles/form.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
box-shadow: none;
4343
border: 0;
4444
border-bottom: 1px solid #ededed;
45-
@include border-radius($border-radius);
4645
&:focus {
4746
color: #000 !important;
4847
border-bottom: 2px solid $border-color-focus;

src/styles/metafields.scss

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
margin-bottom: 20px;
77
.meta-key {
88
.key-field {
9-
margin: 15px 0 10px;
10-
padding: 11px 13px;
11-
max-width: calc(100% - 36px);
12-
height: 48px;
9+
margin: 0 0 5px;
10+
max-width: 200px;
1311
font-size: 16px;
1412
font-weight: 700;
15-
border: 1px solid $border-color;
16-
@include border-radius($border-radius);
13+
background: 0 0;
14+
border: 2px solid transparent;
15+
@include border-radius(2px);
16+
padding: 5px 0;
1717
box-shadow: none;
1818
@include transition(padding 250ms ease);
1919
&:focus {
20-
border-color: $border-color-focus;
20+
padding: 5px;
21+
border-color: $dark-orange;
2122
color: #000 !important;
2223
}
2324
&:hover {
@@ -27,28 +28,30 @@
2728
}
2829
.meta-value {
2930
.value-field {
30-
margin-bottom: 0;
31-
padding: 11px 13px;
32-
max-width: calc(100% - 36px);
31+
overflow: hidden;
32+
word-wrap: break-word;
33+
resize:vertical;
34+
height: auto;
3335
min-height: 46px;
36+
margin-bottom: 0;
3437
max-height: 500px;
35-
font-size: 16px;
36-
line-height: 1.5;
37-
resize: vertical;
3838
vertical-align: bottom;
39-
word-wrap: break-word;
40-
overflow: hidden;
39+
line-height: 1.5;
40+
width: 100%;
41+
42+
@include border-radius(2px);
4143
border-color: $border-color;
42-
@include border-radius($border-radius);
44+
font-size: 16px;
45+
padding: 11px 13px;
4346
&:focus {
44-
border: 1px solid $border-color-focus;
47+
border: 1px solid $dark-orange;
4548
}
4649
}
4750
}
4851
.meta-value-array {
4952
padding: 10px 15px;
5053
border: 1px solid $border-color;
51-
@include border-radius($border-radius);
54+
@include border-radius(3px);
5255
position: relative;
5356
.array-item-wrap {
5457
margin-bottom: 20px;
@@ -79,6 +82,9 @@
7982
bottom: -13px;
8083
margin-left: -13px;
8184
left: 50%;
85+
i {
86+
margin: 0;
87+
}
8288
}
8389
}
8490
.meta-value-object {
@@ -101,7 +107,7 @@
101107
box-shadow: none;
102108
min-height: 46px;
103109
line-height: 1.5;
104-
@include border-radius($border-radius);
110+
@include border-radius(2px);
105111
}
106112
.meta-buttons {
107113
transform: translateY(-50%);
@@ -156,7 +162,7 @@
156162
cursor: pointer;
157163
position: relative;
158164
button {
159-
border: 1px solid $border-color;
165+
border: 1px solid #d4d7d9;
160166
background: none;
161167
padding: 0;
162168
@include border-radius(50%);
@@ -175,7 +181,7 @@
175181
height: 0;
176182
border-style: solid;
177183
border-width: 0 10px 10px;
178-
border-color: transparent transparent $border-color;
184+
border-color: transparent transparent #d4d7d9;
179185
content: "";
180186
position: absolute;
181187
top: -10px;
@@ -190,7 +196,7 @@
190196
z-index: 30;
191197
width: 185px;
192198
border: 1px solid #d4d7d9;
193-
border-radius: $border-radius;
199+
border-radius: 2px;
194200
background: #fff;
195201
span {
196202
display: block;
@@ -234,7 +240,7 @@
234240
& div {
235241
opacity: 0;
236242
}
237-
border: 1px dashed $dark-orange !important;
243+
border: 2px dashed $dark-orange !important;
238244
}
239245
.showing-dropdown {
240246
z-index: 30;
@@ -256,6 +262,6 @@
256262
right: -10px !important;
257263
}
258264
.rw-state-focus {
259-
border: 1px solid $orange !important;
265+
border: 1px solid $dark-orange !important;
260266
}
261267
}

0 commit comments

Comments
 (0)