diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 62 | ||||
| -rw-r--r-- | views/controls/editor/light-control.ejs | 10 | ||||
| -rw-r--r-- | views/controls/reader/about-room.ejs | 2 |
3 files changed, 53 insertions, 21 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 3f3b8f7..fe67edc 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -729,10 +729,7 @@ iframe.embed { -moz-user-select: none; user-select: none; } -.vvbox .txt { - padding: 5px; - display: inline-block; -} + .edit-video.menu, .edit-image.menu { right: auto; @@ -1239,7 +1236,7 @@ iframe.embed { transform: translateX(400px); transition: -webkit-transform 0.2s ease-in-out; } -h4 { +.lightcontrol h4 { font-weight: 600; font-size: 12px; line-height: 0; @@ -1273,12 +1270,17 @@ input[type="range"]::-webkit-slider-thumb { .colorPicker { cursor: crosshair; } + .swatch { width: 20px; height: 20px; border: 1px solid #eee; display: inline-block; cursor: pointer; + float:left; +} +.swatch:hover { + border: 1px solid red; } .swatch.selected { border: 1px solid #000; @@ -1286,17 +1288,39 @@ input[type="range"]::-webkit-slider-thumb { .color-swatches { margin-top: 10px; } +.color-swatches span { + display: inline-block; + width: 50%; + float:left; + cursor:pointer; +} +.color-swatches span:nth-child(1),.color-swatches span:nth-child(2){ + margin-bottom:5px; +} +.color-swatches span.active{ + background:red; + color:white; +} +.color-swatches span:nth-child(3){ + clear:left; +} +.color-swatches span:hover { + background:#eee; +} + +.color-swatches span.active:hover { + background:red; +} .color-swatches label { - font-size: 11px; - font-weight: 300; - position: relative; - top: -6px; - padding-left: 5px; - display: inline-block; - min-width: 35px; - cursor: pointer; + font-size: 14px; + font-weight: 300; + position: relative; + padding-left: 5px; + display: inline-block; + cursor: pointer; + top: -2px; } -.color-swatches label.selected { +.color-swatches span.active label { font-weight: 600; } @@ -1497,11 +1521,14 @@ input[type="range"]::-webkit-slider-thumb { background:black; color:white; } - +.btn.marg { + margin-top:10px; +} .warn { background:red; display: inline-block; color:white; + text-decoration:none; border:1px solid red; text-align: center; } @@ -1800,6 +1827,7 @@ a[data-role="forgot-password"] { .txt { font-size:12px; padding:5px 0; + display: inline-block; } .aboutRoom h1 a{ text-decoration: none; @@ -1811,16 +1839,12 @@ a[data-role="forgot-password"] { } .aboutRoom .editlink { - color: black; - text-decoration: none; border-bottom: 0; - background: white; padding: 6px; display: inline-block; margin-top: 10px; width: 100%; text-align: center; - border:1px solid black; } .aboutRoom .editlink:hover { diff --git a/views/controls/editor/light-control.ejs b/views/controls/editor/light-control.ejs index 1ed6ef6..65a602f 100644 --- a/views/controls/editor/light-control.ejs +++ b/views/controls/editor/light-control.ejs @@ -5,11 +5,19 @@ </div> <div class="color-swatches"> + <span> <div class="swatch" id="wall-color" data-mode="wall"></div><label>wall</label> + </span> + <span class="active"> <div class="swatch" id="floor-color" data-mode="floor"></div><label>floor</label> + </span> + <span> <div class="swatch" id="ceiling-color" data-mode="ceiling"></div><label>ceiling</label> - <br> + </span> + <span> <div class="swatch" id="outline-color" data-mode="outline"></div><label>outlines</label> + </span> + <span> </div> <!-- diff --git a/views/controls/reader/about-room.ejs b/views/controls/reader/about-room.ejs index 7338f48..e13f363 100644 --- a/views/controls/reader/about-room.ejs +++ b/views/controls/reader/about-room.ejs @@ -9,7 +9,7 @@ <h2> Last modified [[- date ]] [[ if (canEdit) { ]] - <br> <a href="[[- editlink ]]" class="editlink">Edit Room</a> + <a href="[[- editlink ]]" class="btn warn marg">Edit Room</a> [[ } ]] </h2> </div> |