diff options
| -rwxr-xr-x | public/assets/stylesheets/app.css | 12 | ||||
| -rw-r--r-- | views/controls/editor/toolbar.ejs | 9 |
2 files changed, 10 insertions, 11 deletions
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 42f0058..b8e2a2b 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1471,6 +1471,7 @@ border-left: 1px solid black; -webkit-transition: -webkit-transform 0.1s ease-in-out; line-height: 0; vertical-align: text-bottom; + background-color:white; -webkit-user-drag: element; } .wallpaper.active .swatches .swatch:hover { @@ -2213,15 +2214,12 @@ form li textarea { transform: translateY(-200px) translateZ(0); } #fixed_close.active { - animation: visibility 0.2s; - animation-fill-mode: forwards; + animation:0.2s transform linear 1s; display: block; + transform: translateY(0px) translateZ(0); } -@keyframes visibility { - 100% { - transform: translateY(0px) translateZ(0); - } -} + + .desktop .close:hover { diff --git a/views/controls/editor/toolbar.ejs b/views/controls/editor/toolbar.ejs index 57a98b9..8ea21d5 100644 --- a/views/controls/editor/toolbar.ejs +++ b/views/controls/editor/toolbar.ejs @@ -1,9 +1,6 @@ <div class="edit menu vvbox" id="editorToolbar" data-intro="This is the main toolbar. Add and select media, Apply wallpaper, change room name etc." data-position="left"> - <span - data-role='undo' - data-info="undo" - class="ion-reply"></span> + <span data-role='open-media-viewer' data-info="add media" @@ -14,6 +11,10 @@ class="ion-ios7-briefcase-outline"></span> <!-- <span + data-role='undo' + data-info="undo" + class="ion-reply"></span> + <span data-role='resize-media' data-info="resize media" class="ion-arrow-resize"></span> |