diff --git a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.js.coffee b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.js.coffee index 0d6f6af74..6913c1ea6 100644 --- a/app/assets/javascripts/app/controllers/widget/switch_back_to_user.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/switch_back_to_user.js.coffee @@ -1,6 +1,6 @@ class Widget extends App.Controller events: - 'click .close': 'switchBack' + 'click .js-close': 'switchBack' constructor: -> super @@ -19,12 +19,12 @@ class Widget extends App.Controller # if no switch to user is active if !App.Config.get('switch_back_to_possible') || _.isEmpty( App.Session.all() ) @el.html('') - $('#app').removeClass('switch-back-to-user-space') + $('#app').removeClass('switchBackToUserSpace') return # show switch back widget @html App.view('widget/switch_back_to_user')() - $('#app').addClass('switch-back-to-user-space') + $('#app').addClass('switchBackToUserSpace') switchBack: (e) => e.preventDefault() diff --git a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco index a451c0ad6..24cf3f419 100644 --- a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco +++ b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco @@ -1,4 +1,10 @@ -
- <%- @T('Zammad looks like this for "%s"', @S('firstname') + ' ' + @S('lastname') ) %> - +
+
+
<%- @T('Zammad looks like this for "%s"', @S('firstname') + ' ' + @S('lastname') ) %>
+
+ <%- @T('Back to my Overview') %> +
+ +
+
\ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index bfa7295e6..b77dd5c0d 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -1617,7 +1617,7 @@ footer { } .search { - padding: 10px 15px 10px 10px; + padding: 14px 15px 10px 10px; border-bottom: 1px solid rgba(240, 250, 255, .05); } @@ -3071,17 +3071,25 @@ footer { font-size: inherit; } -.switch-back-to-user { - position: absolute; - background-color: #389ed9; +.switchBackToUser.fit { + background: hsl(200,87%,45%); color: #fff; - height: 34px; - z-index: 1; - padding: 8px 9px; - top: -34px; + height: 45px; + padding: 0 17px; + top: -45px; + border-bottom: 5px solid hsl(205,90%,60%); } -.switch-back-to-user-space { - top: 34px; + .switchBackToUser-text { + margin-left: 10px; + } + .switchBackToUser-close { + width: 40px; + height: 40px; + margin-right: -10px; + } + +#app.switchBackToUserSpace { + top: 45px; } /*