From beb767a168a0490f3b13748c3f9db6e07bbc7ee2 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 19 Oct 2015 11:44:46 +0200 Subject: [PATCH] remove our tooltips, back to native ones --- .../_application_controller.coffee | 2 +- app/assets/javascripts/app/index.coffee | 2 +- app/assets/stylesheets/zammad.scss | 54 ------------------- 3 files changed, 2 insertions(+), 56 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index 5de30d05b..619116a2a 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -231,7 +231,7 @@ class App.Controller extends Spine.Controller # only do dom updates on changes return if time is currentVal - item.attr('data-tooltip', App.i18n.translateTimestamp(timestamp)) + item.attr('title', App.i18n.translateTimestamp(timestamp)) item.html(time) ticketPopups: (position = 'right') -> diff --git a/app/assets/javascripts/app/index.coffee b/app/assets/javascripts/app/index.coffee index c7fc2ab65..490d25d12 100644 --- a/app/assets/javascripts/app/index.coffee +++ b/app/assets/javascripts/app/index.coffee @@ -113,7 +113,7 @@ class App extends Spine.Controller if cssClass.match 'escalation' escalation = true humanTime = App.PrettyDate.humanTime(result, escalation) - result = "" + result = "" if !isHtmlEscape && typeof result is 'string' result = App.Utils.htmlEscape(result) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index d132262e3..a1bbedb71 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -239,60 +239,6 @@ blockquote { z-index: 1; } -/* tooltip */ -a[data-tooltip], -time[data-tooltip], -span[data-tooltip] { - position: relative; -} -a[data-tooltip]:before, -time[data-tooltip]:before, -span[data-tooltip]:before, -a[data-tooltip]:after, -time[data-tooltip]:after, -span[data-tooltip]:after { - content: ""; - position: absolute; - transform: scale(0); - opacity: 0; - transition: transform 300ms cubic-bezier(0.34,1.6,0.71,1), opacity 300ms; -} -a[data-tooltip]:before, -time[data-tooltip]:before, -span[data-tooltip]:before { - left: 0; - top: -34px; - background-color: #c6c6c5; - color: #ffffff; - height: 26px; - line-height: 27px; - border-radius: 5px; - padding: 0 13px; - content: attr(data-tooltip); - white-space: nowrap; - transform-origin: 17px 26px; -} -a[data-tooltip]:after, -time[data-tooltip]:after, -span[data-tooltip]:after { - left: 13px; - top: -8px; - border-top: 7px solid #c6c6c5; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - transform-origin: 4px 0; -} -a[data-tooltip]:hover:after, -a[data-tooltip]:hover:before, -time[data-tooltip]:hover:after, -time[data-tooltip]:hover:before, -span[data-tooltip]:hover:after, -span[data-tooltip]:hover:before { - transform: scale(1); - opacity: 1; - transition: transform 300ms 1.5s cubic-bezier(0.34,1.6,0.71,1), opacity 300ms 1.5s; -} - .textarea::placeholder, .form-control::placeholder, .token-input::placeholder {