github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-21 00:45:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4768 from gsambrotta/fix-pr-4747

Browse Source 
Delete disabled Category button: remove tooltip on hover on desktop
This commit is contained in:
Sam
2017-03-20 09:57:16 -04:00
committed by GitHub
parent 521c88fe58 c3e8497636
commit 13fd8a45e3
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/edit-category.js.es6
View File

@ -106,10 +106,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
}, },
toggleDeleteTooltip() { toggleDeleteTooltip() {
// check if is touch device this.toggleProperty('hiddenTooltip');
if ( $('html').hasClass('discourse-touch') ) {
this.toggleProperty('hiddenTooltip');
}
} }
} }

7
app/assets/stylesheets/desktop/modal.scss
View File

@ -129,13 +129,6 @@
right: 4px; right: 4px;
max-width: 380px; max-width: 380px;
min-width: 300px; min-width: 300px;
display: none;
}
@include hover {
.cannot_delete_reason {
display: block;
}
} }
} }
} }