Merge branch 'develop' into fillStrokeColor

This commit is contained in:
DD 2017-09-11 11:29:32 -04:00
commit 2c98f61d69
8 changed files with 28 additions and 48 deletions

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
import bindAll from 'lodash.bindall'; import bindAll from 'lodash.bindall';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
@import "../../css/units.css"; @import "../../css/units.css";
@import "../../css/colors.css"; @import "../../css/colors.css";

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
import classNames from 'classnames'; import classNames from 'classnames';

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
@import "../../css/units.css"; @import "../../css/units.css";
@import "../../css/colors.css"; @import "../../css/colors.css";

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';

View file

@ -27,20 +27,6 @@
margin-left: calc(2 * $space); margin-left: calc(2 * $space);
} }
.waveform-container {
display: flex;
justify-content: space-around;
align-items: center;
width: 100%;
position: relative;
background: $ui-pane-gray;
border: 1px solid $ui-pane-border;
border-radius: 5px;
padding: 3px;
}
$border-radius: 0.25rem; $border-radius: 0.25rem;
.button { .button {
@ -62,40 +48,6 @@ $border-radius: 0.25rem;
min-width: 1.5rem; min-width: 1.5rem;
} }
.trim-button {
display: flex;
align-items: center;
padding-right: 10px; /* To equalize with empty whitespace from image on left */
}
.trim-button > img {
width: 1.5rem;
}
.trim-button-active {
filter: hue-rotate(155deg); /* @todo replace blue -> red with real submit icon */
}
.input-group-right {
flex-grow: 1;
display: flex;
flex-direction: row-reverse;
}
.effect-button {
flex-basis: 150px;
color: $text-primary;
}
.effect-button + .effect-button {
margin: 0;
}
.effect-button img {
width: 60px;
height: 60px;
}
.button-group { .button-group {
margin: 0 1rem; margin: 0 1rem;
} }

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
$ui-pane-border: #D9D9D9; $ui-pane-border: #D9D9D9;
$ui-pane-gray: #F9F9F9; $ui-pane-gray: #F9F9F9;
$ui-background-blue: #e8edf1; $ui-background-blue: #e8edf1;

View file

@ -1,3 +1,7 @@
/* DO NOT EDIT
@todo This file is copied from GUI and should be pulled out into a shared library.
See https://github.com/LLK/scratch-paint/issues/13 */
$space: 0.5rem; $space: 0.5rem;
$sprites-per-row: 5; $sprites-per-row: 5;