diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-10-07 18:38:43 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-10-07 18:38:43 -0400 |
| commit | 4dede1ce3a31cfb17cbad80749863725a9957d19 (patch) | |
| tree | 8450c58adc4dd1c52aa366e6586f79b0e39a4899 | |
| parent | c60434bc4655d0e020ca75fc7c5fddf53ac58ede (diff) | |
inverse colors
| -rw-r--r-- | public/assets/javascripts/ui/editor/LightControl.js | 11 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 6 | ||||
| -rw-r--r-- | views/controls/editor/light-control.ejs | 6 |
3 files changed, 14 insertions, 9 deletions
diff --git a/public/assets/javascripts/ui/editor/LightControl.js b/public/assets/javascripts/ui/editor/LightControl.js index 2b7cfaa..51e6be7 100644 --- a/public/assets/javascripts/ui/editor/LightControl.js +++ b/public/assets/javascripts/ui/editor/LightControl.js @@ -134,17 +134,18 @@ var LightControl = View.extend({ floor: [255,255,0], ceiling: [225,118,252], }, - seapunk: { - wall: [110,255,255], - outline: [146,133,255], - floor: [89,221,255], - ceiling: [139,255,173], + inverse: { + wall: [0,0,0], + outline: [0,230,255], + floor: [0,0,0], + ceiling: [0,0,0], }, }, selectPreset: function(e){ var preset = $(e.currentTarget).data('preset') if (! this.presets[preset]) return this.load(this.presets[preset]) + $(e.currentTarget).addClass('active') }, beginBrightness: function(){ diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index b4d176f..f770637 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1529,6 +1529,10 @@ input[type="range"]::-webkit-slider-thumb { width: 50%; float:left; cursor:pointer; + border-bottom: 1px transparent solid; +} +.presets span.active { + border-bottom: 1px dotted; } .color-swatches span { display: inline-block; @@ -1589,7 +1593,7 @@ input[type="range"]::-webkit-slider-thumb { font-size: 12px; -webkit-transform: translateY(500px); -webkit-transition: -webkit-transform 0.2s ease-in-out; - transform: translateY(450px); + transform: translateY(500px); transition: -webkit-transform 0.2s ease-in-out; width: 210px; } diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 1fc4484..8f42d8d 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -30,11 +30,11 @@ <span data-preset="shaded"> Shaded </span> + <span data-preset="inverse"> + Inverse + </span> <span data-preset="pfunk"> P.Funk </span> - <span data-preset="seapunk"> - SeaPunk - </span> </div> </div> |