From 3b0c5696a15b67c24e8cb6ca91dcfc01749dae1f Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 14 Nov 2014 15:37:14 +0100 Subject: [PATCH] make sidebar form changed state visible and prepare for the save button at the bottom of the page --- app/assets/images/sprite.svg | 93 +++++++++---------- .../app/views/generic/sidebar_tabs.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 30 ++++-- 3 files changed, 69 insertions(+), 56 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index 0ddbcd851..64892eabb 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,29 +1,26 @@ - - sprite - Created with Sketch (http://www.bohemiancoding.com/sketch) + + + Slice 2 + Created with Sketch. - + - - - - - - - - + + + + - + - + @@ -31,7 +28,7 @@ - + @@ -41,16 +38,16 @@ - + - + - + @@ -61,19 +58,19 @@ - + - - - + + + - + @@ -129,51 +126,53 @@ - - + + - - - - - - + + + + + + - - + + - + - - - + + + - + - + + + - - + + - + - - - - - + + + + + \ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco index 60b2d8a92..8f7777e48 100644 --- a/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco +++ b/app/assets/javascripts/app/views/generic/sidebar_tabs.jst.eco @@ -1,6 +1,6 @@ <% for item in @items: %>
-
+

<%- @T( item.head ) %>

diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index ceb5b2491..0c3d664b0 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -2667,7 +2667,7 @@ footer { content: ""; position: absolute; top: 0; - left: 0; + left: -16px; height: 100%; width: 3px; background: repeating-linear-gradient(-45deg, hsl(193,18%,90%), hsl(193,18%,90%) 4px, transparent 4px, transparent 7px) repeat center; @@ -3348,8 +3348,20 @@ footer { .tabsSidebar .sidebar { width: 280px; border-left: 1px solid #e6e6e6; + padding: 0; + @extend .vertical; } + .tabsSidebar hr { + margin: 20px; + } + + .tabsSidebar .sidebar-header { + @extend .horizontal; + @extend .center; + padding: 20px 20px 0; + } + .tabsSidebar .sidebar h2 { margin: 0 0 -1px; line-height: 1; @@ -3364,6 +3376,11 @@ footer { margin: -15px; } + .tabsSidebar .sidebar-content { + @extend .flex; + padding: 0 20px 20px; + } + .sidebar.bottom-form-shadow { box-shadow: 0 -1px rgba(0,0,0,.005) inset, @@ -3436,13 +3453,6 @@ footer { opacity: 1; } - .sidebar .form-group { - margin-left: -20px; - margin-right: -20px; - padding-right: 20px; - padding-left: 20px; - } - .sidebar .text-muted { color: hsl(204,3%,72%); } @@ -3923,6 +3933,10 @@ footer { margin: 20px 0; } +.userInfo-entry:first-child { + margin-top: 0; +} + .userInfo-label { text-transform: uppercase; color: #999;