scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix with feedback from DD

Browse source
This commit is contained in:
Paul Kaplan 2017-10-13 14:24:07 -04:00
parent 3eaf8047aa
commit e2e4823642
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/color-picker.css
View file

@ -1,5 +1,4 @@
/* Popover styles */ /* Popover styles */
/* @TODO need to fix tip border issue */
:global(.Popover-body) { :global(.Popover-body) {
background: white; background: white;
border: 1px solid #ddd; border: 1px solid #ddd;
@ -8,6 +7,7 @@
padding: 4px; padding: 4px;
box-shadow: 0px 0px 8px 1px rgba(0, 0, 0, .3); box-shadow: 0px 0px 8px 1px rgba(0, 0, 0, .3);
} }
:global(.Popover-tipShape) { :global(.Popover-tipShape) {
fill: white; fill: white;
stroke: #ddd; stroke: #ddd;

2
src/components/color-picker.jsx
View file

@ -84,6 +84,8 @@ class ColorPickerComponent extends React.Component {
_makeBackground (channel) { _makeBackground (channel) {
const stops = []; const stops = [];
// Generate the color slider background CSS gradients by adding
// color stops depending on the slider.
for (let n = 100; n >= 0; n -= 10) { for (let n = 100; n >= 0; n -= 10) {
switch (channel) { switch (channel) {
case 'hue': case 'hue':

2
src/reducers/fill-color.js
View file

@ -3,7 +3,7 @@ import {CHANGE_SELECTED_ITEMS} from './selected-items';
import {getColorsFromSelection} from '../helper/style-path'; import {getColorsFromSelection} from '../helper/style-path';
const CHANGE_FILL_COLOR = 'scratch-paint/fill-color/CHANGE_FILL_COLOR'; const CHANGE_FILL_COLOR = 'scratch-paint/fill-color/CHANGE_FILL_COLOR';
const initialState = '#aa0551'; const initialState = '#000';
// Matches hex colors // Matches hex colors
const regExp = /^#([0-9a-f]{3}){1,2}$/i; const regExp = /^#([0-9a-f]{3}){1,2}$/i;