IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Could click on unlike even after the window. Looked weird.

Browse Source
This commit is contained in:
Robin Ward
2015-07-29 14:34:20 -04:00
parent 92918e3b2b
commit 9d1e37fb46
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/components/post-menu.js.es6
View File

@@ -85,8 +85,10 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, {
// Delegate click actions // Delegate click actions
click(e) { click(e) {
const $target = $(e.target), const $target = $(e.target);
action = $target.data('action') || $target.parent().data('action'); const action = $target.data('action') || $target.parent().data('action');
if ($target.prop('disabled') || $target.parent().prop('disabled')) { return; }
if (!action) return; if (!action) return;
const handler = this["click" + action.classify()]; const handler = this["click" + action.classify()];

11
app/assets/stylesheets/desktop/topic-post.scss
View File

@@ -134,10 +134,8 @@ nav.post-controls {
&:active { &:active {
background: dark-light-diff($tertiary, $secondary, 50%, -35%); background: dark-light-diff($tertiary, $secondary, 50%, -35%);
box-shadow: inset 0 1px 3px rgba(0,0,0, .3); box-shadow: inset 0 1px 3px rgba(0,0,0, .3);
} }
} }
.create i { .create i {
@@ -153,13 +151,13 @@ nav.post-controls {
margin-left: 3px; margin-left: 3px;
transition: all linear 0.15s; transition: all linear 0.15s;
&:hover { &:hover {
background: dark-light-diff($primary, $secondary, 90%, -60%); background: dark-light-diff($primary, $secondary, 90%, -60%);
color: $primary; color: $primary;
} }
&:active { &:active {
box-shadow: inset 0 1px 3px rgba(0,0,0, .4); box-shadow: inset 0 1px 3px rgba(0,0,0, .4);
} }
&.hidden { &.hidden {
@@ -183,6 +181,9 @@ nav.post-controls {
&.has-like[disabled]:hover { &.has-like[disabled]:hover {
background: transparent; background: transparent;
} }
&.has-like[disabled]:active {
box-shadow: none;
}
&.bookmark {padding: 8px 11px; } &.bookmark {padding: 8px 11px; }