From d02bf26b1a25923197dc85dbf0dc999f29bf13d1 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 16 Oct 2014 13:50:14 -0400 Subject: show color picker --- public/assets/javascripts/rectangles/_env.js | 4 ++-- public/assets/javascripts/ui/editor/ColorControl.js | 2 +- public/assets/stylesheets/app.css | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'public') 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; -- cgit v1.2.3-70-g09d2