From a737b2454ae985ac8fd272c3b2c2abe5a643b0ba Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 17 Nov 2014 10:29:50 +0100 Subject: [PATCH 1/5] fix logo preview cross browser --- .../app/views/getting_started/base.jst.eco | 3 ++- .../app/views/layout_ref/setup.jst.eco | 3 ++- app/assets/stylesheets/zammad.css.scss | 27 +++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/app/views/getting_started/base.jst.eco b/app/assets/javascripts/app/views/getting_started/base.jst.eco index 00b090368..cc70e48ff 100644 --- a/app/assets/javascripts/app/views/getting_started/base.jst.eco +++ b/app/assets/javascripts/app/views/getting_started/base.jst.eco @@ -13,7 +13,8 @@
- + +
<%- @T('Your Logo') %>
<%- @T('Upload') %>
diff --git a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco index ee8181457..25a346dc5 100644 --- a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco @@ -55,7 +55,8 @@
- + +
<%- @T('Your Logo') %>
Upload
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index e36c8e431..14598e683 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4241,27 +4241,26 @@ label + .wizard-buttonList { .setup.wizard .logo-preview { display: block; - background: hsl(0,0%,95%); - width: 100%; - height: 60px; - margin-bottom: 10px; - content: ""; - color: hsl(0,0%,60%); - @extend .centered; + height: 0; + max-width: 200px; + max-height: 100px; - &:after { - content: attr(data-placeholder); + + .logo-preview-placeholder { + height: 100px; + color: hsl(0,0%,60%); + background: hsl(0,0%,95%); + margin-bottom: 10px; + @extend .centered; } } .setup.wizard .logo-preview:not([src=""]) { - content: initial; - max-width: 240px; - max-height: 60px; margin: 0 auto 15px; - background: none; - width: auto; height: auto; + + + .logo-preview-placeholder { + display: none; + } } .import.wizard .wizard-slide { From a2906fef89a1b5070c2cddd6b2be01cb8bfb1685 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 17 Nov 2014 10:30:03 +0100 Subject: [PATCH 2/5] adjust company logo to fit into 200x100 px --- app/assets/javascripts/app/views/login.jst.eco | 2 +- app/assets/stylesheets/zammad.css.scss | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index e5a98cdac..af584f0a4 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -2,7 +2,7 @@

<%- @T( 'Login with %s', @C( 'fqdn' ) ) %>

- +
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 14598e683..5fce6278e 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -812,8 +812,10 @@ textarea, width: 430px; } - .login .logo { - margin: 30px auto; + .login .company-logo { + max-height: 100px; + max-width: 200px; + margin: 20px auto 42px; display: block; } From 92fe67278c610aab9b3884f3a9b242814c3b0239 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 17 Nov 2014 10:54:10 +0100 Subject: [PATCH 3/5] make logo on dark full white --- app/assets/images/full logo on dark.svg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/assets/images/full logo on dark.svg b/app/assets/images/full logo on dark.svg index e9a5ab8d2..c6979f697 100644 --- a/app/assets/images/full logo on dark.svg +++ b/app/assets/images/full logo on dark.svg @@ -1,7 +1,7 @@ - zammad logo 2 + logo on dark Created with Sketch. @@ -57,12 +57,12 @@ - - - - - - + + + + + + \ No newline at end of file From 09b0ef24dbb5d881e6771471d2eb98ae36461753 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 17 Nov 2014 10:54:40 +0100 Subject: [PATCH 4/5] add powered by Zammad --- app/assets/images/logotype on dark.svg | 17 ++++ app/assets/images/logotype.svg | 1 - .../javascripts/app/views/login.jst.eco | 98 ++++++++++--------- app/assets/stylesheets/zammad.css.scss | 45 +++++++-- 4 files changed, 107 insertions(+), 54 deletions(-) create mode 100644 app/assets/images/logotype on dark.svg delete mode 100644 app/assets/images/logotype.svg diff --git a/app/assets/images/logotype on dark.svg b/app/assets/images/logotype on dark.svg new file mode 100644 index 000000000..ec4360a20 --- /dev/null +++ b/app/assets/images/logotype on dark.svg @@ -0,0 +1,17 @@ + + + + logotype on dark + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/app/assets/images/logotype.svg b/app/assets/images/logotype.svg deleted file mode 100644 index 4e29ad919..000000000 --- a/app/assets/images/logotype.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco index af584f0a4..8729e8d55 100644 --- a/app/assets/javascripts/app/views/login.jst.eco +++ b/app/assets/javascripts/app/views/login.jst.eco @@ -1,55 +1,63 @@ -