diff --git a/public/images/down-tick-inset.png b/public/images/down-tick-inset.png
new file mode 100644
index 000000000..f3375c1c7
Binary files /dev/null and b/public/images/down-tick-inset.png differ
diff --git a/public/images/up-tick-inset.png b/public/images/up-tick-inset.png
new file mode 100644
index 000000000..cef889e20
Binary files /dev/null and b/public/images/up-tick-inset.png differ
diff --git a/public/javascripts/app/templates/post-viewer/feedback.handlebars b/public/javascripts/app/templates/post-viewer/feedback.handlebars
index 8e8609b73..c1464f631 100644
--- a/public/javascripts/app/templates/post-viewer/feedback.handlebars
+++ b/public/javascripts/app/templates/post-viewer/feedback.handlebars
@@ -27,15 +27,22 @@
{{/if}}
-
+
+

+
diff --git a/public/javascripts/app/views/post-viewer/feedback.js b/public/javascripts/app/views/post-viewer/feedback.js
index 93d076f4b..ec49c58f6 100644
--- a/public/javascripts/app/views/post-viewer/feedback.js
+++ b/public/javascripts/app/views/post-viewer/feedback.js
@@ -10,12 +10,13 @@ app.views.PostViewerFeedback = app.views.Feedback.extend({
"click .follow" : "toggleFollow",
"click .reshare" : "resharePost",
- "click *[rel='interaction-pane']" : "invokePane"
+ "click *[rel='invoke-interaction-pane']" : "invokePane",
+ "click *[rel='hide-interaction-pane']" : "hidePane"
},
tooltipSelector : ".label",
- invokePane : function(evt){
- this.trigger("invokePane")
- }
+ invokePane : function(evt){ this.trigger("invokePane") },
+ hidePane : function(evt){ this.trigger("hidePane") }
+
})
diff --git a/public/javascripts/app/views/post-viewer/interactions.js b/public/javascripts/app/views/post-viewer/interactions.js
index a5fce9ac7..5feb1bdc5 100644
--- a/public/javascripts/app/views/post-viewer/interactions.js
+++ b/public/javascripts/app/views/post-viewer/interactions.js
@@ -14,6 +14,7 @@ app.views.PostViewerInteractions = app.views.Base.extend({
this.initViews();
this.feedbackView.bind("invokePane", this.invokePane, this)
+ this.feedbackView.bind("hidePane", this.hidePane, this)
},
initViews : function() {
@@ -29,23 +30,17 @@ app.views.PostViewerInteractions = app.views.Base.extend({
togglePane : function(evt) {
if(evt) { evt.preventDefault() }
this.$("#post-info").slideToggle(300)
+ this.$("#post-info-sneaky").toggleClass('passive')
this.removeTooltips()
},
invokePane : function(evt) {
if(evt) { evt.preventDefault() }
- if(this.$("#post-info").is(":visible")) { return }
-
- this.togglePane()
- this.$("#post-info-sneaky").addClass('passive')
+ if(!this.$("#post-info").is(":visible")) { this.togglePane() }
},
hidePane : function(evt) {
if(evt) { evt.preventDefault() }
- if(!this.$("#post-info").is(":visible")) { return }
-
- this.togglePane()
- setTimeout(function(){
- this.$("#post-info-sneaky").removeClass('passive')}, 300)
+ if(this.$("#post-info").is(":visible")) { this.togglePane() }
}
})
diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss
index 25a97a3fa..20b061c49 100644
--- a/public/stylesheets/sass/new-templates.scss
+++ b/public/stylesheets/sass/new-templates.scss
@@ -1,6 +1,7 @@
/* variables */
$light-grey: #999;
+$pane-width: 420px;
/* mixins */
@mixin center($orient:vertical) {
@@ -65,6 +66,7 @@ $light-grey: #999;
@include dark-hatched-bg();
display: inline-block;
+ position: relative;
border-top: 1px solid #555;
border-right: 1px solid #444;
@@ -72,7 +74,7 @@ $light-grey: #999;
padding-top: 25px;
- width: 420px;
+ width: $pane-width;
color: #ddd;
@@ -370,7 +372,6 @@ $light-grey: #999;
margin-top: 5px;
}
-
#post-info,
#post-info-sneaky {
text-align: center;
@@ -477,6 +478,7 @@ $light-grey: #999;
}
}
+
.post-comment {
-moz-box-shadow: 0 1px 2px -2px #999;
-webkit-box-shadow: 0 1px 2px -2px #999;
@@ -599,3 +601,27 @@ $light-grey: #999;
position: relative;
z-index: 30;
}
+
+#close-reactions-pane-container {
+ text-align: center;
+ position: absolute;
+ width: 100%;
+ left: 0;
+ top: -3px;
+
+ #close-reactions-pane {
+ width: $pane-width;
+ top: 0;
+
+ min-height: 30px;
+ display: inline-block;
+ }
+}
+
+.info-tick {
+ @include opacity(0.8);
+
+ position: absolute;
+ right: 8px;
+ top: 8px;
+}