Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A bunch of various improvements #16

Open
wants to merge 10 commits into
base: gh-pages
Choose a base branch
from
+305 −1,154
Open

A bunch of various improvements #16

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0045a9
1) use newer chroma.js; 2) show clipped colors; 3) update dev depende…
thorn0 Feb 10, 2018
a9976db
Hue shift slider, see #13
thorn0 Feb 11, 2018
9d3ed70
build
thorn0 Feb 11, 2018
4f029eb
use the `input` event for sliders
thorn0 Feb 11, 2018
e442099
fix stack overflow; prevent pull-to-refresh in chrome mobile
thorn0 Feb 11, 2018
8610236
sliders: handle both `input` and `change` events, remove `step`; add …
thorn0 Feb 11, 2018
6ca2f6d
disable hue shift when Z is hue; fix drag handles' position after hue…
thorn0 Feb 12, 2018
38335ed
fix the weird interaction on hue shift
thorn0 Apr 20, 2018
5de4697
add .prettierrc
thorn0 Apr 20, 2018
eae5435
rebuild
thorn0 Apr 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/node_modules
4 changes: 4 additions & 0 deletions .prettierrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"printWidth": 100,
"singleQuote": true
}
8 changes: 1 addition & 7 deletions bundle.js
View file

Large diffs are not rendered by default.

15 changes: 9 additions & 6 deletions css/site.css
View file
Original file line number Diff line number Diff line change
@@ -178,7 +178,10 @@ input[type=range]::-moz-range-thumb {
margin-right:auto;
}
.slider-output {
bottom:-25px;
position: absolute;
right: 101%;
margin-top: 10px;
white-space: nowrap;
}
.axis-select {
position:absolute;
@@ -213,7 +216,7 @@ input[type=range]::-moz-range-thumb {
.sidebar {
background:#353535;
width:145px;
height:460px;
height:500px;
float:left;
border-radius:0 2px 2px 0;
position:relative;
@@ -252,10 +255,10 @@ input[type=range]::-moz-range-thumb {
}
#grad,
.drag_cont {
left:-15px;
top:-15px;
width:440px;
height:440px;
left:0px;
top:0px;
width:420px;
height:420px;
}
#grad {
z-index: 20;
13 changes: 9 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
<html>
<head>
<meta charset='utf-8' />
<meta name="viewport" content="width=650px" />
<title>Colorpicker for data | tristen</title>
<meta name='twitter:site' content='@fallsemo' />
<meta property='og:site_name' content='Colorpicker for data' />
@@ -54,17 +55,21 @@ <h1>Colorpicker for data</h1>
<div id='bg'>
<canvas id='colorspace' width='210' height='210'></canvas>
</div>
<canvas id='grad' width='440' height='440'></canvas>
<canvas id='grad' width='420' height='420'></canvas>
<div class='drag_cont'>
<div class='drag from'></div>
<div class='drag to'></div>
</div>
<input id='slider' class='slider col12' type='range' value='0' min='0' max='1' step='0.05' />

<div class='slider-output pin-bottomleft'>
<div class='slider-output hide-tablet'>
<span class='quiet capitalize js-slider-title'></span>
<span class='quiet js-slider-value'></span>
</div>
<input id='slider' class='slider col12' type='range' value='0' min='0' max='1' step='1' />
<div class='slider-output slider-output-hue hide-tablet'>
<span class='quiet capitalize js-slider-hue-title'>Hue Shift</span>
<span class='quiet js-slider-hue-value'></span>
</div>
<input id='slider-hue' class='slider col12' type='range' value='0' min='-180' max='180' step='1' />
</div>
<div class='sidebar'>
<div class='output pad1'>
427 changes: 274 additions & 153 deletions index.js
View file

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@
"description": "A colorpicker for Data",
"main": "index.js",
"scripts": {
"test": "eslint --no-eslintrc -c .eslintrc index.js src",
"start": "budo index.js --serve=bundle.js --live -d",
"test": "eslint --no-eslintrc -c .eslintrc index.js",
"start": "budo index.js --serve=bundle.js --live",
"build": "browserify index.js | uglifyjs -c -m > bundle.js"
},
"repository": {
@@ -25,15 +25,17 @@
},
"homepage": "https://github.com/tristen/hcl-picker#readme",
"devDependencies": {
"browserify": "^13.0.0",
"budo": "^8.1.0",
"browserify": "^16",
"budo": "^11",
"eslint": "^2.7.0",
"uglify-js": "^2.6.2"
"uglify-js": "^3"
},
"dependencies": {
"chroma-js": "^1.3.6",
"clipboard": "^1.5.10",
"d3": "^3.5.16",
"d3-geo": "0.0.0",
"lodash.debounce": "^4.0.8",
"xtend": "^4.0.1"
}
}
979 changes: 0 additions & 979 deletions src/chroma.js
View file

This file was deleted.