diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-16 13:50:14 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-16 13:50:14 -0400 |
| commit | d02bf26b1a25923197dc85dbf0dc999f29bf13d1 (patch) | |
| tree | ff3a67b2e3625d0b890eda976e4fa3e35588ef3d | |
| parent | 1a15b32d8cc8fcf27861f94151ca63eb6d8736c2 (diff) | |
show color picker
| -rw-r--r-- | public/assets/javascripts/rectangles/_env.js | 4 | ||||
| -rw-r--r-- | public/assets/javascripts/ui/editor/ColorControl.js | 2 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 1 | ||||
| -rw-r--r-- | views/controls/editor/color-control.ejs | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/_env.js b/public/assets/javascripts/rectangles/_env.js index ecde3ca..3221bac 100644 --- a/public/assets/javascripts/rectangles/_env.js +++ b/public/assets/javascripts/rectangles/_env.js @@ -10,8 +10,8 @@ environment.init = function(){ "z": 0, "rotationX": 0, // PI/2, "rotationY": PI/2, // PI -// "rotationX": 0, -// "rotationY": PI + // "rotationX": 0, + // "rotationY": PI }) scene.camera.radius = 20 diff --git a/public/assets/javascripts/ui/editor/ColorControl.js b/public/assets/javascripts/ui/editor/ColorControl.js index 61a7ef6..4d8a7bb 100644 --- a/public/assets/javascripts/ui/editor/ColorControl.js +++ b/public/assets/javascripts/ui/editor/ColorControl.js @@ -29,7 +29,7 @@ var ColorControl = View.extend({ initialize: function(opt){ this.parent = opt.parent - this.colorPicker = new LabColorPicker(this, 180, 180) + this.colorPicker = new LabColorPicker(this, 155, 155) this.$("#color-picker").append( this.colorPicker.canvas ) this.$("#color-picker").append( this.colorPicker.cursor ) diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 1cc8fd6..209a3ad 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1725,6 +1725,7 @@ input[type="range"]::-webkit-slider-thumb { .color-swatches label { position: relative; + font-size: 13px; margin-left: 5px; display: inline-block; cursor: pointer; diff --git a/views/controls/editor/color-control.ejs b/views/controls/editor/color-control.ejs index 040808e..8ce6e85 100644 --- a/views/controls/editor/color-control.ejs +++ b/views/controls/editor/color-control.ejs @@ -4,7 +4,7 @@ <div class="colors"> </div> - <div id="color-picker" style="display: none"> + <div id="color-picker"> </div> <div class="slider"> |