From 8cb885cbb61fe85cfa4fa26def4a44db3026dcd8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 7 Oct 2014 21:04:00 +0200 Subject: [PATCH] safari bugfixes --- .../_application_controller.js.coffee | 10 ++-- .../app/lib/app_post/task_manager.js.coffee | 13 ++--- app/assets/stylesheets/zammad.css.scss.erb | 57 +++++++++++++------ 3 files changed, 50 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 896fcd5ad..f7bf3f4d3 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -102,12 +102,12 @@ class App.Controller extends Spine.Controller # show navigation navShow: -> return if $('#navigation').is(':visible') - $('#navigation').attr('style', 'display: flex!important') + $('#navigation').removeClass('hide') # hide navigation navHide: -> return if !$('#navigation').is(':visible') - $('#navigation').attr('style', 'display: none!important') + $('#navigation').addClass('hide') scrollTo: ( x = 0, y = 0, delay = 0 ) -> a = -> @@ -428,14 +428,14 @@ class App.Controller extends Spine.Controller class App.ControllerPermanent extends App.Controller constructor: -> super - $('.content').attr('style', 'display: none!important') + $('.content').addClass('hide'); @navShow() class App.ControllerContent extends App.Controller constructor: -> super - $('.content').attr('style', 'display: none!important') - $('#content').attr('style', 'display: flex!important') + $('.content').addClass('hide'); + $('#content').removeClass('hide'); @navShow() class App.ControllerModal extends App.Controller diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index d6731dbb3..48b1fe0ca 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -151,23 +151,18 @@ class _taskManagerSingleton extends App.Controller $('#content').empty() # hide all tasks - $('.content').attr('style', 'display: none!important') - #$('.content').hide() + $('.content').addClass('hide') $('.content').removeClass('active') # create div for task if not exists if !$("#content_permanent_#{key}")[0] - $('#app').append('
') + $('#app').append('
') # set task to shown and active if @activeTask is key - #$('#content_permanent_' + key ).show() - $('#content_permanent_' + key).attr('style', 'display: flex!important') - $('#content_permanent_' + key ).addClass('active') + $('#content_permanent_' + key).removeClass('hide') else - #$('#content_permanent_' + key ).hide() - $('#content_permanent_' + key).attr('style', 'display: none!important') - $('#content_permanent_' + key ).removeClass('active') + $('#content_permanent_' + key).addClass('hide') # set all tasks to active false, only new/selected one to active if active diff --git a/app/assets/stylesheets/zammad.css.scss.erb b/app/assets/stylesheets/zammad.css.scss.erb index 78dc4b918..598347349 100644 --- a/app/assets/stylesheets/zammad.css.scss.erb +++ b/app/assets/stylesheets/zammad.css.scss.erb @@ -160,9 +160,11 @@ span[data-tooltip]:after { content: ""; position: absolute; pointer-events: none; - transform: scale(0); + -webkit-transform: scale(0); + transform: scale(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, time[data-tooltip]:before, @@ -177,7 +179,8 @@ span[data-tooltip]:before { padding: 0 13px; content: attr(data-tooltip); white-space: nowrap; - transform-origin: 17px 26px; + -webkit-transform-origin: 17px 26px; + transform-origin: 17px 26px; } a[data-tooltip]:after, time[data-tooltip]:after, @@ -187,7 +190,8 @@ span[data-tooltip]:after { border-top: 7px solid #c6c6c5; border-left: 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:before, @@ -198,7 +202,8 @@ span[data-tooltip]:hover:before { pointer-events: auto; transform: scale(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, @@ -472,6 +477,9 @@ textarea, transition: none; box-shadow: none; outline: none; + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; } .form-control:focus, @@ -491,6 +499,18 @@ textarea, 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:focus, .has-error .form-control.focus { @@ -691,7 +711,8 @@ ol.tabs li { padding: 10px 20px; text-align: center; border-right: 1px solid rgba(0,8,14,.08); - flex-grow: 1; + -webkit-flex-grow: 1; + flex-grow: 1; @extend .u-clickable; } @@ -2011,7 +2032,8 @@ footer { height: 40px; padding: 0 15px; color: #2594d4; - display: flex; + display: -webkit-flex; + display: flex; } .user-menu .dropdown-menu > li > a:hover { @@ -2089,7 +2111,8 @@ footer { .nav-pills > li > a { padding: 0; height: 40px; - display: flex; + display: -webkit-flex; + display: flex; color: #0f94d6; line-height: 39px; border-radius: 0; @@ -2388,13 +2411,15 @@ footer { .form-inline .form-group { overflow: hidden; - flex-grow: 1; + -webkit-flex-grow: 1; + flex-grow: 1; position: relative; height: 60px; } .ticket-attributes.form-inline .form-group:last-child { - flex-grow: 0; + -webkit-flex-grow: 0; + flex-grow: 0; } .form-group.is-changed { @@ -2465,9 +2490,6 @@ footer { display: block; border-radius: 0; background: none; - -webkit-appearance: none; - -moz-appearance: none; - appearance: none; } .bulkAction-secondStep .form-group { @@ -2477,7 +2499,8 @@ footer { .bulkAction-secondStep .form-inline .textarea.form-group { padding: 0 10px; height: auto; - flex-grow: 1; + -webkit-flex-grow: 1; + flex-grow: 1; } .bulkAction-secondStep .form-inline .textarea.form-group .input-group-addon { @@ -3266,7 +3289,8 @@ footer { vertical-align: top; margin-right: 9px; margin-top: 10px; - transform: scale(1.2); + -webkit-transform: scale(1.2); + transform: scale(1.2); } .tokenfield .token { @@ -3764,7 +3788,8 @@ footer { position: fixed; right: 0; top: 0; - transform: translateY(-64px); + -webkit-transform: translateY(-64px); + transform: translateY(-64px); } .scrollPageHeader small {