<%- @T('Create OTRS Migration Plugin') %>
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 e9df90a66..91835b5a4 100644
--- a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
@@ -4,7 +4,7 @@
-
+
diff --git a/app/assets/javascripts/app/views/login.jst.eco b/app/assets/javascripts/app/views/login.jst.eco
index 3d62449c9..3924d5bc0 100644
--- a/app/assets/javascripts/app/views/login.jst.eco
+++ b/app/assets/javascripts/app/views/login.jst.eco
@@ -65,8 +65,8 @@
-
+
<%- @T("Powered by") %>
-
+
\ No newline at end of file
diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css
index f7ddff5b0..554da30f3 100644
--- a/app/assets/stylesheets/svg-dimensions.css
+++ b/app/assets/stylesheets/svg-dimensions.css
@@ -13,6 +13,7 @@
.icon-download { width: 14px; height: 13px; }
.icon-email { width: 17px; height: 17px; }
.icon-facebook { width: 17px; height: 17px; }
+.icon-full-logo { width: 175px; height: 50px; }
.icon-group { width: 24px; height: 24px; }
.icon-help { width: 16px; height: 16px; }
.icon-important { width: 16px; height: 16px; }
@@ -22,6 +23,7 @@
.icon-lock-open { width: 16px; height: 16px; }
.icon-lock { width: 16px; height: 16px; }
.icon-logo { width: 42px; height: 36px; }
+.icon-logotype { width: 84px; height: 16px; }
.icon-long-arrow-right { width: 11px; height: 11px; }
.icon-magnifier { width: 15px; height: 15px; }
.icon-marker { width: 17px; height: 19px; }
@@ -49,6 +51,7 @@
.icon-radio-checked { width: 11px; height: 11px; }
.icon-radio { width: 11px; height: 11px; }
.icon-received-calls { width: 17px; height: 17px; }
+.icon-reload { width: 26px; height: 26px; }
.icon-reopening { width: 68px; height: 47px; }
.icon-reply-all { width: 16px; height: 16px; }
.icon-reply { width: 16px; height: 16px; }
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index b98dd749a..12678aabf 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -255,20 +255,6 @@ span[data-tooltip]:hover:before {
.form-control:-ms-input-placeholder,
.token-input:-ms-input-placeholder { color: hsl(0,0%,80%); }
-.glyphicon {
- font-size: 13px;
-}
-
-.spinner {
- float: left;
- background: url("/assets/images/spinner.gif") no-repeat;
- background-position: center center;
- padding: 44px 10px 0 10px;
- width: 10px;
- height: 14px;
- display: none;
-}
-
.btn,
.btn:hover,
.btn:focus {
@@ -1022,12 +1008,6 @@ textarea,
margin-top: 0;
}
-.zammad.full.logo {
- height: 50px;
- margin-left: -25px;
- margin-bottom: 5px;
-}
-
.getstarted,
.reset_password,
.signup,
@@ -1116,7 +1096,6 @@ textarea,
right: 0;
.logo {
- height: 40px;
margin-right: 8px;
margin-top: -11px;
}
@@ -1124,6 +1103,7 @@ textarea,
.logotype {
margin-left: 8px;
margin-top: -5px;
+ fill: hsl(225,9%,27%);
}
}
@@ -1839,18 +1819,18 @@ footer {
z-index: -1;
}
- .logo {
+ .search .logo {
position: relative;
@extend .u-clickable, .zIndex-5;
margin: 0 10px;
transition: 240ms;
}
- .logo .icon-logo {
+ .search .logo .icon-logo {
position: relative;
}
- .logo .activity-counter {
+ .search .logo .activity-counter {
height: 20px;
min-width: 21px;
position: absolute;
@@ -1868,7 +1848,7 @@ footer {
border: 2px solid hsl(233,10%,16%);
}
- .logo .activity-counter:empty {
+ .search .logo .activity-counter:empty {
display: none;
}
@@ -4433,6 +4413,13 @@ footer {
@extend .u-textTruncate;
}
+
+.wizard-logo {
+ fill: white;
+ margin-left: -25px;
+ margin-bottom: 5px;
+}
+
.wizard-slide {
@extend .hero-unit;
display: flex;
diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch
index c40332668..380af2551 100644
Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ
diff --git a/extras/icon_authors/list.json b/extras/icon_authors/list.json
index 95c47e390..2f82704ff 100755
--- a/extras/icon_authors/list.json
+++ b/extras/icon_authors/list.json
@@ -3,32 +3,34 @@
"arrow-left.svg": "Felix Niklas",
"arrow-right.svg": "Felix Niklas",
"arrow-up.svg": "Felix Niklas",
- "checkbox-checked.svg": "Felix Niklas",
- "checkbox.svg": "Felix Niklas",
- "checkmark.svg": "Felix Niklas",
+ "checkbox-checked.svg": "Zammad",
+ "checkbox.svg": "Zammad",
+ "checkmark.svg": "Zammad",
"clock.svg": "",
"cloud.svg": "Felix Niklas",
"cog.svg": "",
"dashboard.svg": "",
- "diagonal-cross.svg": "Felix Niklas",
+ "diagonal-cross.svg": "Zammad",
"download.svg": "Felix Niklas",
"email.svg": "",
"facebook.svg": "Facebook",
+ "full-logo.svg": "Zammad",
"group.svg": "",
"help.svg": "Felix Niklas",
"important.svg": "",
"in-process.svg": "",
- "list.svg": "Felix Niklas",
- "loading.svg": "Felix Niklas",
- "lock-open.svg": "Felix Niklas",
- "lock.svg": "Felix Niklas",
- "logo.svg": "",
- "long-arrow-right.svg": "Felix Niklas",
- "magnifier.svg": "Felix Niklas",
+ "list.svg": "Zammad",
+ "loading.svg": "Zammad",
+ "lock-open.svg": "Zammad",
+ "lock.svg": "Zammad",
+ "logo.svg": "Zammad",
+ "logotype.svg": "Zammad",
+ "long-arrow-right.svg": "Zammad",
+ "magnifier.svg": "Zammad",
"marker.svg": "Felix Niklas",
"message.svg": "Felix Niklas",
- "minus.svg": "Felix Niklas",
- "mood-bad.svg": "Felix Niklas",
+ "minus.svg": "Zammad",
+ "mood-bad.svg": "Zammad",
"mood-good.svg": "Zammad",
"mood-ok.svg": "Zammad",
"mood-super-bad.svg": "Zammad",
@@ -39,22 +41,23 @@
"outbound-calls.svg": "",
"overviews.svg": "",
"package.svg": "Felix Niklas",
- "paperclip.svg": "Felix Niklas",
- "pen.svg": "Felix Niklas",
+ "paperclip.svg": "",
+ "pen.svg": "",
"person.svg": "",
"phone.svg": "",
- "plus.svg": "Felix Niklas",
- "priority-modified-inner-circle.svg": "Felix Niklas",
- "priority-modified-outer-circle.svg": "Felix Niklas",
- "priority.svg": "Felix Niklas",
- "radio-checked.svg": "Felix Niklas",
- "radio.svg": "Felix Niklas",
+ "plus.svg": "Zammad",
+ "priority-modified-inner-circle.svg": "Zammad",
+ "priority-modified-outer-circle.svg": "Zammad",
+ "priority.svg": "Zammad",
+ "radio-checked.svg": "Zammad",
+ "radio.svg": "Zammad",
"received-calls.svg": "",
+ "reload.svg": "",
"reopening.svg": "",
"reply-all.svg": "Felix Niklas",
"reply.svg": "Felix Niklas",
- "signout.svg": "",
- "split.svg": "",
+ "signout.svg": "Zammad",
+ "split.svg": "Felix Niklas",
"stopwatch.svg": "",
"switchView.svg": "",
"team.svg": "",
diff --git a/public/assets/images/close.png b/public/assets/images/close.png
deleted file mode 100644
index 81a24d89c..000000000
Binary files a/public/assets/images/close.png and /dev/null differ
diff --git a/public/assets/images/company-logo.png b/public/assets/images/company-logo.png
deleted file mode 100644
index 673daa7b9..000000000
Binary files a/public/assets/images/company-logo.png and /dev/null differ
diff --git a/public/assets/images/full logo on dark.svg b/public/assets/images/full logo on dark.svg
deleted file mode 100644
index c6979f697..000000000
--- a/public/assets/images/full logo on dark.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-
-
\ No newline at end of file
diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg
index 2d1198c9e..454ce5f1e 100644
--- a/public/assets/images/icons.svg
+++ b/public/assets/images/icons.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/assets/images/icons/full-logo.svg b/public/assets/images/icons/full-logo.svg
new file mode 100644
index 000000000..d45969270
--- /dev/null
+++ b/public/assets/images/icons/full-logo.svg
@@ -0,0 +1,33 @@
+
+
\ No newline at end of file
diff --git a/public/assets/images/icons/logo.svg b/public/assets/images/icons/logo.svg
index 2863f78cf..1a0a9beb1 100644
--- a/public/assets/images/icons/logo.svg
+++ b/public/assets/images/icons/logo.svg
@@ -6,26 +6,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/public/assets/images/icons/logotype.svg b/public/assets/images/icons/logotype.svg
new file mode 100644
index 000000000..a2f03ae93
--- /dev/null
+++ b/public/assets/images/icons/logotype.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/public/assets/images/logo.svg b/public/assets/images/logo.svg
index 0eb2bdd45..0685eb75a 100644
--- a/public/assets/images/logo.svg
+++ b/public/assets/images/logo.svg
@@ -1 +1,30 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/public/assets/images/logo_bw.svg b/public/assets/images/logo_bw.svg
deleted file mode 100644
index 1d382cef6..000000000
--- a/public/assets/images/logo_bw.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/public/assets/images/logotype on dark.svg b/public/assets/images/logotype on dark.svg
deleted file mode 100644
index 9da7675b0..000000000
--- a/public/assets/images/logotype on dark.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/public/assets/images/spinner.gif b/public/assets/images/spinner.gif
deleted file mode 100644
index d9e135c86..000000000
Binary files a/public/assets/images/spinner.gif and /dev/null differ