]> BookStack Code Mirror - bookstack/commitdiff
Some image manager fixes
authorDan Brown <redacted>
Thu, 13 Aug 2015 19:28:11 +0000 (20:28 +0100)
committerDan Brown <redacted>
Thu, 13 Aug 2015 19:28:11 +0000 (20:28 +0100)
resources/assets/js/image-manager.js
resources/assets/sass/image-manager.scss

index 97c7f5a0a0263b62c213f22bf40632f275dbfb27..4d24e35c8e9c66a1dd87a3a9508da4ffcd46ce15 100644 (file)
@@ -18,7 +18,7 @@
             this.callback = callback;
         }
 
-        hide(e) {
+        hide() {
             console.log('test');
             $(React.findDOMNode(this)).hide();
         }
             });
         }
 
+        overlayClick(e) {
+            if(e.target.className === 'overlay') {
+                this.hide();
+            }
+        }
+
         render() {
             var loadMore = this.loadMore.bind(this);
             var selectImage = this.selectImage.bind(this);
+            var overlayClick = this.overlayClick.bind(this);
             var hide = this.hide.bind(this);
             return (
-                <div className="overlay" onClick={hide}>
+                <div className="overlay" onClick={overlayClick}>
                     <div id="image-manager">
                         <div className="image-manager-content">
                             <div className="dropzone-container" ref="dropZone">
 
         constructor(){
             super();
-            this._dblClickTime = 160;
+            this._dblClickTime = 350;
             this._cClickTime = 0;
         }
 
             var imageClick = this.imageClick.bind(this);
             return (
                 <div>
-                    <img onDoubleClick={imageClick} src={this.props.image.thumbnail}/>
+                    <img onClick={imageClick} src={this.props.image.thumbnail}/>
                 </div>
             );
         }
index d0ae6ded4d96580f79b9007998207f8b285cb9f5..1c6220fda3dd8fc584a94d2707e9c7fa76401eb9 100644 (file)
@@ -1,5 +1,5 @@
 #image-manager {
-  background-color: #EEE;
+  background-color: rgb(37, 37, 37);
   max-width: 90%;
   max-height: 90%;
   width: 90%;
   left: 0;
   z-index: 999;
   display: flex;
+  p, h1, h2, h3, h4, label, input {
+    color: #EEE;
+  }
+  h1, h2, h3 {
+    font-weight: 300;
+  }
 }
 #image-manager .dropzone-container {
   height: 100px;
@@ -38,7 +44,7 @@
   display: block;
   float: left;
   text-align: center;
-  background-color: #888;
+  background-color: #404040;
   margin: 1px;
   color: #FFF;
   line-height: 140px;