Skip to content

Commit 8d0b5b4

Browse files
committed
merge
2 parents fb8e631 + 31ec2f4 commit 8d0b5b4

File tree

9 files changed

+455
-452
lines changed

9 files changed

+455
-452
lines changed

app/build/mojs-curve-editor.js

Lines changed: 429 additions & 429 deletions
Large diffs are not rendered by default.

app/build/mojs-curve-editor.min.js

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

app/css/assets/colors.postcss.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

22
$c-purple: #3A0839;
3+
$c-pastel-purple: #B3A0B2;
34
$c-orange: #FF512F;
45
$c-white : #FFFFFF;

app/css/blocks/code-panel.postcss.css

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,32 @@
33
.code-panel {
44
position: absolute;
55
left: calc( 10 * $PX );
6-
top: calc( -32 * $PX );
7-
width: calc( 391 * $PX );
8-
height: calc( 32 * $PX );
9-
margin: 0 auto;
6+
right: calc( 10 * $PX );
7+
margin-top: calc( -32 * $PX );
108
border-radius: calc( 6 * $PX ) calc( 6 * $PX ) 0 0;
119
background: rgba( 61, 27, 60, 1 );
1210
z-index: 1;
1311

14-
&__input-wrapp {
15-
width: 381px;
16-
height: 23px;
17-
margin: 5px 5px;
12+
&__input-wrap {
13+
margin: calc( 5 * $PX );
1814
border-radius: calc( 2 * $PX );
1915
background: rgba( 58, 8, 58, 1 );
20-
border: 1px solid #B3A0B2;
21-
box-shadow: inset 3px 3px 0 rgba(0,0,0,0.5);
16+
border: 1px solid $c-pastel-purple;
17+
box-shadow: inset calc( 3 * $PX ) calc( 3 * $PX ) 0 rgba(0,0,0,0.5);
2218
}
2319

2420
&__input-field {
2521
display: block;
2622
background: transparent;
2723
color: $c-white;
28-
padding: 0.4em;
24+
font-size: 9px;
25+
letter-spacing: 0.45px;
26+
font-weight: 100;
27+
padding: 0.4em 0.3em 0.6em 0.8em;
2928
border: none;
3029
width: 100%;
3130
}
31+
& ::selection {
32+
background: $c-orange;
33+
}
3234
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"code-panel":"_code-panel_1pe78_3","code-panel__input-wrapp":"_code-panel__input-wrapp_1pe78_1","code-panel__input-field":"_code-panel__input-field_1pe78_1"}
1+
{"code-panel":"_code-panel_t4jil_3","code-panel__input-wrap":"_code-panel__input-wrap_t4jil_1","code-panel__input-field":"_code-panel__input-field_t4jil_1"}

app/css/blocks/curve.postcss.css

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

app/css/blocks/curve.postcss.css.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"curve":"_curve_1jj2s_5","curve__svg-wrapper":"_curve__svg-wrapper_1jj2s_1","curve__svg":"_curve__svg_1jj2s_1","curve__svg-segment":"_curve__svg-segment_1jj2s_1"}
1+
{"curve":"_curve_1gafb_5","curve__svg-wrapper":"_curve__svg-wrapper_1gafb_1","curve__svg":"_curve__svg_1gafb_1","curve__svg-segment":"_curve__svg-segment_1gafb_1"}

app/js/tags/code-panel.tag

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22

33
<code-panel class={ this.CLASSES['code-panel'] }>
4-
<div class={ this.CLASSES['code-panel__input-wrapp'] }>
5-
<input class={ this.CLASSES['code-panel__input-field'] } type="text" readonly="readonly" value="M0,100 C0,100 12.0486221,-124.260309 24,99.7583642 C28.9933624,142.723104 " />
4+
<div class={ this.CLASSES['code-panel__input-wrap'] }>
5+
<input class={ this.CLASSES['code-panel__input-field'] } type="text" readonly="readonly" value="M0,100 C0,100 12.0486221,-124.260309 24,99.7583642 C28.9933624,142.723104" />
66
</div>
77

88
<script>

app/js/tags/curve-editor.tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require('./point-controls');
1313
-->
1414

1515
<curve-editor class={this.CLASSES['curve-editor']} style={this.getStyle()}>
16-
<icons />
1716
<code-panel />
17+
<icons />
1818
<div class={this.CLASSES['curve-editor__left']}>
1919
<icon-button shape="code"></icon-button>
2020
<icon-divider />

0 commit comments

Comments
 (0)