From 782e5194add818f38cf658ddf3ee1f7fceae246a Mon Sep 17 00:00:00 2001
From: shortcutme <hello@noloop.me>
Date: Fri, 18 Nov 2016 20:15:29 +0100
Subject: [PATCH] Merge sidebar js, css

---
 plugins/Sidebar/media/all.css |  7 +++++--
 plugins/Sidebar/media/all.js  | 28 +++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/plugins/Sidebar/media/all.css b/plugins/Sidebar/media/all.css
index 050796bf..3015908d 100644
--- a/plugins/Sidebar/media/all.css
+++ b/plugins/Sidebar/media/all.css
@@ -68,11 +68,14 @@
 .sidebar .content { margin: 30px; font-family: "Segoe UI Light", "Segoe UI", "Helvetica Neue"; color: white; width: 375px; height: 300px; font-weight: 200; -webkit-transition: all 1s; -moz-transition: all 1s; -o-transition: all 1s; -ms-transition: all 1s; transition: all 1s ; opacity: 0 }
 .sidebar-container.loaded .content { opacity: 1; -webkit-transform: none ; -moz-transform: none ; -o-transform: none ; -ms-transform: none ; transform: none  }
 .sidebar h1, .sidebar h2 { font-weight: lighter; }
-.sidebar .button { margin: 0px; display: inline-block; -webkit-transition: all 0.3s; -moz-transition: all 0.3s; -o-transition: all 0.3s; -ms-transition: all 0.3s; transition: all 0.3s ; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -o-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box ; max-width: 160px }
+.sidebar .button { margin: 0px; display: inline-block; -webkit-transition: all 0.3s; -moz-transition: all 0.3s; -o-transition: all 0.3s; -ms-transition: all 0.3s; transition: all 0.3s ; -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -o-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box ; max-width: 260px }
 .sidebar .button.hidden { padding: 0px; max-width: 0px; opacity: 0; pointer-events: none }
 .sidebar #button-delete { background-color: transparent; border: 1px solid #333; color: #AAA; margin-left: 10px }
 .sidebar #button-delete:hover { border: 1px solid #666; color: white }
 
+.sidebar .flex { display: flex }
+.sidebar .flex .button { margin-left: 4px }
+
 /* FIELDS */
 
 .sidebar .fields { padding: 0px; list-style-type: none; width: 355px; }
@@ -83,7 +86,7 @@
 	vertical-align: text-bottom; margin-right: 10px; width: 100%
 }
 .sidebar .fields label small { font-weight: normal; color: white; text-transform: none; }
-.sidebar .fields .text { background-color: black; border: 0px; padding: 10px; color: white; -webkit-border-radius: 3px; -moz-border-radius: 3px; -o-border-radius: 3px; -ms-border-radius: 3px; border-radius: 3px ; width: 250px; font-family: Consolas, monospace; }
+.sidebar .fields .text { background-color: black; border: 0px; padding: 10px; color: white; -webkit-border-radius: 3px; -moz-border-radius: 3px; -o-border-radius: 3px; -ms-border-radius: 3px; border-radius: 3px ; width: 260px; font-family: Consolas, monospace; }
 .sidebar .fields .text.long { width: 330px; font-size: 72%; }
 .sidebar .fields .disabled { color: #AAA; background-color: #3B3B3B; }
 .sidebar .fields .text-num { width: 30px; text-align: right; padding-right: 30px; }
diff --git a/plugins/Sidebar/media/all.js b/plugins/Sidebar/media/all.js
index ff95c022..058a46c9 100644
--- a/plugins/Sidebar/media/all.js
+++ b/plugins/Sidebar/media/all.js
@@ -446,18 +446,20 @@ window.initScrollable = function () {
           }
           this.opened = true;
         }
-        this.tag.css("transition", "0.4s ease-out");
-        this.tag.css("transform", "translateX(-" + targetx + "px)").one(transitionEnd, (function(_this) {
-          return function() {
-            _this.tag.css("transition", "");
-            if (!_this.opened) {
-              _this.container.remove();
-              _this.container = null;
-              _this.tag.remove();
-              return _this.tag = null;
-            }
-          };
-        })(this));
+        if (this.tag) {
+          this.tag.css("transition", "0.4s ease-out");
+          this.tag.css("transform", "translateX(-" + targetx + "px)").one(transitionEnd, (function(_this) {
+            return function() {
+              _this.tag.css("transition", "");
+              if (!_this.opened) {
+                _this.container.remove();
+                _this.container = null;
+                _this.tag.remove();
+                return _this.tag = null;
+              }
+            };
+          })(this));
+        }
         this.log("stopdrag", "opened:", this.opened);
         if (!this.opened) {
           return this.onClosed();
@@ -487,7 +489,7 @@ window.initScrollable = function () {
       this.tag.find("#button-dbreload").off("click").on("click", (function(_this) {
         return function() {
           wrapper.ws.cmd("dbReload", [], function() {
-            wrapper.notifications.add("done-dbreload", "done", "Database schema reloaded", 5000);
+            wrapper.notifications.add("done-dbreload", "done", "Database schema reloaded!", 5000);
             return _this.updateHtmlTag();
           });
           return false;