From 1c1bf347bb50e81d0f5e759fefc95fff15a38a04 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Jun 2015 10:47:20 +0200 Subject: [PATCH] switch to user css changes --- .../widget/switch_back_to_user.js.coffee | 1 + .../app/views/widget/switch_back_to_user.jst.eco | 14 ++++++-------- app/assets/stylesheets/zammad.css.scss | 10 +++++----- 3 files changed, 12 insertions(+), 13 deletions(-) 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 59914361f..5871caba5 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,4 +1,5 @@ class Widget extends App.Controller + className: 'switchBackToUser' events: 'click .js-close': 'switchBack' 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 7eb33073e..7001ff8c9 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,10 +1,8 @@ -
- -
<%- @T('Zammad looks like this for "%s"', @S('firstname') + ' ' + @S('lastname') ) %>
-
- <%- @T('Back to my view') %> -
- -
+ +
<%- @T('Zammad looks like this for "%s"', @S('firstname') + ' ' + @S('lastname') ) %>
+
+ <%- @T('Back to my view') %> +
+
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index f3f458247..6823e7531 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -21,6 +21,7 @@ body { color: hsl(198,19%,72%); word-break: break-all; display: flex; + flex-direction: column; } p { @@ -34,6 +35,10 @@ p { color: #0F94D6; } +.u-dontfold { + flex-shrink: 0; +} + a { outline: none !important; @extend .u-highlight; @@ -4048,7 +4053,6 @@ footer { } .switchBackToUser { - @extend .fit, .zIndex-7; display: flex; align-items: center; background: hsl(200,87%,45%); @@ -4078,10 +4082,6 @@ footer { } } -#app.switchBackToUserSpace { - margin-top: 45px; -} - .modal { position: fixed; }