From c3e849763683ea32c455a0fc4d7faeb68e5ab564 Mon Sep 17 00:00:00 2001 From: giorgia Date: Mon, 20 Mar 2017 13:26:36 +0100 Subject: [PATCH] remove tooltip on hover on desktop --- .../javascripts/discourse/controllers/edit-category.js.es6 | 5 +---- app/assets/stylesheets/desktop/modal.scss | 7 ------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 b/app/assets/javascripts/discourse/controllers/edit-category.js.es6 index da82528ad23..e05c37937b5 100644 --- a/app/assets/javascripts/discourse/controllers/edit-category.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-category.js.es6 @@ -106,10 +106,7 @@ export default Ember.Controller.extend(ModalFunctionality, { }, toggleDeleteTooltip() { - // check if is touch device - if ( $('html').hasClass('discourse-touch') ) { - this.toggleProperty('hiddenTooltip'); - } + this.toggleProperty('hiddenTooltip'); } } diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index 33992cfed59..fd82268119a 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -129,13 +129,6 @@ right: 4px; max-width: 380px; min-width: 300px; - display: none; - } - - @include hover { - .cannot_delete_reason { - display: block; - } } } }