Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove our tooltips, back to native ones

Browse source
This commit is contained in:
Felix Niklas 2015-10-19 11:44:46 +02:00
parent dfc3c97825
commit beb767a168
3 changed files with 2 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_application_controller.coffee
View file

@ -231,7 +231,7 @@ class App.Controller extends Spine.Controller
# only do dom updates on changes # only do dom updates on changes
return if time is currentVal return if time is currentVal
item.attr('data-tooltip', App.i18n.translateTimestamp(timestamp)) item.attr('title', App.i18n.translateTimestamp(timestamp))
item.html(time) item.html(time)
ticketPopups: (position = 'right') -> ticketPopups: (position = 'right') ->

2
app/assets/javascripts/app/index.coffee
View file

@ -113,7 +113,7 @@ class App extends Spine.Controller
if cssClass.match 'escalation' if cssClass.match 'escalation'
escalation = true escalation = true
humanTime = App.PrettyDate.humanTime(result, escalation) humanTime = App.PrettyDate.humanTime(result, escalation)
result = "<time class=\"humanTimeFromNow #{cssClass}\" data-time=\"#{result}\" data-tooltip=\"#{timestamp}\">#{humanTime}</time>" result = "<time class=\"humanTimeFromNow #{cssClass}\" data-time=\"#{result}\" title=\"#{timestamp}\">#{humanTime}</time>"
if !isHtmlEscape && typeof result is 'string' if !isHtmlEscape && typeof result is 'string'
result = App.Utils.htmlEscape(result) result = App.Utils.htmlEscape(result)

54
app/assets/stylesheets/zammad.scss
View file

@ -239,60 +239,6 @@ blockquote {
z-index: 1; 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, .textarea::placeholder,
.form-control::placeholder, .form-control::placeholder,
.token-input::placeholder { .token-input::placeholder {