diff options
| author | ryderr <r@okfoc.us> | 2014-10-01 16:47:56 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-01 16:47:56 -0400 |
| commit | df7653219ecef9cabfdb475946d86b6b0e797274 (patch) | |
| tree | 5eaf43fcdbd566f05d984593ca06afde1201a6b3 | |
| parent | e52ff269967587b8f36528158a83ebe491ff3239 (diff) | |
preset styles
| -rwxr-xr-x | public/assets/stylesheets/app.css | 19 | ||||
| -rw-r--r-- | views/controls/editor/light-control.ejs | 18 |
2 files changed, 33 insertions, 4 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index d672465..5c76560 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1351,7 +1351,7 @@ iframe.embed { /* COLOR PICKER */ .lightcontrol { - margin-top: 13%; + margin-top: 8%; right: 80px; padding: 13px 20px 20px 20px; -webkit-transform: translateX(400px); @@ -1418,12 +1418,27 @@ input[type="range"]::-webkit-slider-thumb { .color-swatches { margin-top: 10px; } +.color-swatches.defaults { + margin-top: 10px; +} .color-swatches span { display: inline-block; width: 50%; float:left; cursor:pointer; + font-size: 14px; + font-weight: 300; +} +.vvbox .color-swatches ~ h4 { + margin-bottom: -3px; + border-bottom: 1px solid #ddd; + padding-bottom: 6px; + padding-top: 11px; + display: inline-block; + width: 100%; + color: #555; } + .color-swatches span:nth-child(1),.color-swatches span:nth-child(2){ margin-bottom:5px; } @@ -1439,8 +1454,6 @@ input[type="range"]::-webkit-slider-thumb { } .color-swatches label { - font-size: 14px; - font-weight: 300; position: relative; padding-left: 5px; display: inline-block; diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 410aaff..37a243c 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -22,7 +22,23 @@ </span> <span> </div> - +<h4>Preset Styles</h4> +<div class="color-swatches defaults"> + <span> + Wireframe + </span> + <span> + Shaded + </span> + <span> + P.Funk + </span> + <span> + SeaPunk + </span> +</div> + +</div> <!-- <div class="slider"> <input type="range" min="0" max="100" value="100" id="wall-hue" /> |