From b269b3bb3ed96dc953b0f7a2bae81806f0f0faf4 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Thu, 13 Aug 2015 20:28:11 +0100 Subject: [PATCH] Some image manager fixes --- resources/assets/js/image-manager.js | 15 +++++++++++---- resources/assets/sass/image-manager.scss | 10 ++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/image-manager.js b/resources/assets/js/image-manager.js index 97c7f5a0a..4d24e35c8 100644 --- a/resources/assets/js/image-manager.js +++ b/resources/assets/js/image-manager.js @@ -18,7 +18,7 @@ this.callback = callback; } - hide(e) { + hide() { console.log('test'); $(React.findDOMNode(this)).hide(); } @@ -70,12 +70,19 @@ }); } + 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 ( -
+
@@ -117,7 +124,7 @@ constructor(){ super(); - this._dblClickTime = 160; + this._dblClickTime = 350; this._cClickTime = 0; } @@ -142,7 +149,7 @@ var imageClick = this.imageClick.bind(this); return (
- +
); } diff --git a/resources/assets/sass/image-manager.scss b/resources/assets/sass/image-manager.scss index d0ae6ded4..1c6220fda 100644 --- a/resources/assets/sass/image-manager.scss +++ b/resources/assets/sass/image-manager.scss @@ -1,5 +1,5 @@ #image-manager { - background-color: #EEE; + background-color: rgb(37, 37, 37); max-width: 90%; max-height: 90%; width: 90%; @@ -21,6 +21,12 @@ 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;