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

safari bugfixes

Browse source
This commit is contained in:
Felix Niklas 2014-10-07 21:04:00 +02:00
parent e0c934d7b2
commit 8cb885cbb6
3 changed files with 50 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -102,12 +102,12 @@ class App.Controller extends Spine.Controller
# show navigation # show navigation
navShow: -> navShow: ->
return if $('#navigation').is(':visible') return if $('#navigation').is(':visible')
$('#navigation').attr('style', 'display: flex!important') $('#navigation').removeClass('hide')
# hide navigation # hide navigation
navHide: -> navHide: ->
return if !$('#navigation').is(':visible') return if !$('#navigation').is(':visible')
$('#navigation').attr('style', 'display: none!important') $('#navigation').addClass('hide')
scrollTo: ( x = 0, y = 0, delay = 0 ) -> scrollTo: ( x = 0, y = 0, delay = 0 ) ->
a = -> a = ->
@ -428,14 +428,14 @@ class App.Controller extends Spine.Controller
class App.ControllerPermanent extends App.Controller class App.ControllerPermanent extends App.Controller
constructor: -> constructor: ->
super super
$('.content').attr('style', 'display: none!important') $('.content').addClass('hide');
@navShow() @navShow()
class App.ControllerContent extends App.Controller class App.ControllerContent extends App.Controller
constructor: -> constructor: ->
super super
$('.content').attr('style', 'display: none!important') $('.content').addClass('hide');
$('#content').attr('style', 'display: flex!important') $('#content').removeClass('hide');
@navShow() @navShow()
class App.ControllerModal extends App.Controller class App.ControllerModal extends App.Controller

13
app/assets/javascripts/app/lib/app_post/task_manager.js.coffee
View file

@ -151,23 +151,18 @@ class _taskManagerSingleton extends App.Controller
$('#content').empty() $('#content').empty()
# hide all tasks # hide all tasks
$('.content').attr('style', 'display: none!important') $('.content').addClass('hide')
#$('.content').hide()
$('.content').removeClass('active') $('.content').removeClass('active')
# create div for task if not exists # create div for task if not exists
if !$("#content_permanent_#{key}")[0] if !$("#content_permanent_#{key}")[0]
$('#app').append('<div id="content_permanent_' + key + '" class="content flex"></div>') $('#app').append('<div id="content_permanent_' + key + '" class="content horizontal flex"></div>')
# set task to shown and active # set task to shown and active
if @activeTask is key if @activeTask is key
#$('#content_permanent_' + key ).show() $('#content_permanent_' + key).removeClass('hide')
$('#content_permanent_' + key).attr('style', 'display: flex!important')
$('#content_permanent_' + key ).addClass('active')
else else
#$('#content_permanent_' + key ).hide() $('#content_permanent_' + key).addClass('hide')
$('#content_permanent_' + key).attr('style', 'display: none!important')
$('#content_permanent_' + key ).removeClass('active')
# set all tasks to active false, only new/selected one to active # set all tasks to active false, only new/selected one to active
if active if active

57
app/assets/stylesheets/zammad.css.scss.erb
View file

@ -160,9 +160,11 @@ span[data-tooltip]:after {
content: ""; content: "";
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
transform: scale(0); -webkit-transform: scale(0);
transform: scale(0);
opacity: 0; opacity: 0;
transition: transform 300ms cubic-bezier(0.34,1.6,0.71,1), opacity 300ms; -webkit-transition: -webkit-transform 300ms cubic-bezier(0.34,1.6,0.71,1), opacity 300ms;
transition: transform 300ms cubic-bezier(0.34,1.6,0.71,1), opacity 300ms;
} }
a[data-tooltip]:before, a[data-tooltip]:before,
time[data-tooltip]:before, time[data-tooltip]:before,
@ -177,7 +179,8 @@ span[data-tooltip]:before {
padding: 0 13px; padding: 0 13px;
content: attr(data-tooltip); content: attr(data-tooltip);
white-space: nowrap; white-space: nowrap;
transform-origin: 17px 26px; -webkit-transform-origin: 17px 26px;
transform-origin: 17px 26px;
} }
a[data-tooltip]:after, a[data-tooltip]:after,
time[data-tooltip]:after, time[data-tooltip]:after,
@ -187,7 +190,8 @@ span[data-tooltip]:after {
border-top: 7px solid #c6c6c5; border-top: 7px solid #c6c6c5;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-right: 7px solid transparent; border-right: 7px solid transparent;
transform-origin: 4px 0; -webkit-transform-origin: 4px 0;
transform-origin: 4px 0;
} }
a[data-tooltip]:hover:after, a[data-tooltip]:hover:after,
a[data-tooltip]:hover:before, a[data-tooltip]:hover:before,
@ -198,7 +202,8 @@ span[data-tooltip]:hover:before {
pointer-events: auto; pointer-events: auto;
transform: scale(1); transform: scale(1);
opacity: 1; opacity: 1;
transition: transform 300ms 1.5s cubic-bezier(0.34,1.6,0.71,1), opacity 300ms 1.5s; -webkit-transition: -webkit-transform 300ms 1.5s cubic-bezier(0.34,1.6,0.71,1), opacity 300ms 1.5s;
transition: transform 300ms 1.5s cubic-bezier(0.34,1.6,0.71,1), opacity 300ms 1.5s;
} }
.textarea::-webkit-input-placeholder, .textarea::-webkit-input-placeholder,
@ -472,6 +477,9 @@ textarea,
transition: none; transition: none;
box-shadow: none; box-shadow: none;
outline: none; outline: none;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
} }
.form-control:focus, .form-control:focus,
@ -491,6 +499,18 @@ textarea,
background: none; background: none;
} }
select.form-control {
padding-left: 10px;
padding-right: 10px;
}
select.form-control + .select-arrow {
position: absolute;
right: 12px;
top: 50%;
margin-top: -3px;
}
.has-error .form-control, .has-error .form-control,
.has-error .form-control:focus, .has-error .form-control:focus,
.has-error .form-control.focus { .has-error .form-control.focus {
@ -691,7 +711,8 @@ ol.tabs li {
padding: 10px 20px; padding: 10px 20px;
text-align: center; text-align: center;
border-right: 1px solid rgba(0,8,14,.08); border-right: 1px solid rgba(0,8,14,.08);
flex-grow: 1; -webkit-flex-grow: 1;
flex-grow: 1;
@extend .u-clickable; @extend .u-clickable;
} }
@ -2011,7 +2032,8 @@ footer {
height: 40px; height: 40px;
padding: 0 15px; padding: 0 15px;
color: #2594d4; color: #2594d4;
display: flex; display: -webkit-flex;
display: flex;
} }
.user-menu .dropdown-menu > li > a:hover { .user-menu .dropdown-menu > li > a:hover {
@ -2089,7 +2111,8 @@ footer {
.nav-pills > li > a { .nav-pills > li > a {
padding: 0; padding: 0;
height: 40px; height: 40px;
display: flex; display: -webkit-flex;
display: flex;
color: #0f94d6; color: #0f94d6;
line-height: 39px; line-height: 39px;
border-radius: 0; border-radius: 0;
@ -2388,13 +2411,15 @@ footer {
.form-inline .form-group { .form-inline .form-group {
overflow: hidden; overflow: hidden;
flex-grow: 1; -webkit-flex-grow: 1;
flex-grow: 1;
position: relative; position: relative;
height: 60px; height: 60px;
} }
.ticket-attributes.form-inline .form-group:last-child { .ticket-attributes.form-inline .form-group:last-child {
flex-grow: 0; -webkit-flex-grow: 0;
flex-grow: 0;
} }
.form-group.is-changed { .form-group.is-changed {
@ -2465,9 +2490,6 @@ footer {
display: block; display: block;
border-radius: 0; border-radius: 0;
background: none; background: none;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
} }
.bulkAction-secondStep .form-group { .bulkAction-secondStep .form-group {
@ -2477,7 +2499,8 @@ footer {
.bulkAction-secondStep .form-inline .textarea.form-group { .bulkAction-secondStep .form-inline .textarea.form-group {
padding: 0 10px; padding: 0 10px;
height: auto; height: auto;
flex-grow: 1; -webkit-flex-grow: 1;
flex-grow: 1;
} }
.bulkAction-secondStep .form-inline .textarea.form-group .input-group-addon { .bulkAction-secondStep .form-inline .textarea.form-group .input-group-addon {
@ -3266,7 +3289,8 @@ footer {
vertical-align: top; vertical-align: top;
margin-right: 9px; margin-right: 9px;
margin-top: 10px; margin-top: 10px;
transform: scale(1.2); -webkit-transform: scale(1.2);
transform: scale(1.2);
} }
.tokenfield .token { .tokenfield .token {
@ -3764,7 +3788,8 @@ footer {
position: fixed; position: fixed;
right: 0; right: 0;
top: 0; top: 0;
transform: translateY(-64px); -webkit-transform: translateY(-64px);
transform: translateY(-64px);
} }
.scrollPageHeader small { .scrollPageHeader small {