diff --git a/LICENSE-ICONS-3RD-PARTY.json b/LICENSE-ICONS-3RD-PARTY.json
index a6453bc8f..899c4463c 100644
--- a/LICENSE-ICONS-3RD-PARTY.json
+++ b/LICENSE-ICONS-3RD-PARTY.json
@@ -1,125 +1,40 @@
{
- "info.svg": {
- "author": "Information by Gregor \u010cre\u0161nar from the Noun Project",
- "url": "https:\/\/thenounproject.com\/search\/?q=info&i=176431",
- "license": "CC 3.0 Attribution"
+ "twitter-button.svg": {
+ "author": "Twitter",
+ "url": "twitter.com",
+ "license": ""
},
- "web.svg": {
- "author": "Zammad",
+ "linkedin-button.svg": {
+ "author": "Linkedin",
"url": "",
- "license": "MIT"
+ "license": ""
},
- "form.svg": {
- "author": "Pickin Studio",
- "url": "https:\/\/thenounproject.com\/search\/?q=website&i=16523",
- "license": "CC 3.0 Attribution"
- },
- "draggable.svg": {
- "author": "Felix Niklas",
+ "google-button.svg": {
+ "author": "Google",
"url": "",
- "license": "MIT"
+ "license": ""
},
- "radio.svg": {
- "author": "Zammad",
+ "gitlab-button.svg": {
+ "author": "Gitlab",
"url": "",
- "license": "MIT"
+ "license": ""
},
- "radio-checked.svg": {
- "author": "Zammad",
+ "github-button.svg": {
+ "author": "Github",
"url": "",
- "license": "MIT"
+ "license": ""
},
- "received-calls.svg": {
- "author": "Michael Zenaty",
- "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
- "license": "CC 3.0 Attribution"
- },
- "phone.svg": {
- "author": "Michael Zenaty",
- "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
- "license": "CC 3.0 Attribution"
- },
- "outbound-calls.svg": {
- "author": "Michael Zenaty",
- "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
- "license": "CC 3.0 Attribution"
- },
- "signout.svg": {
- "author": "Felix Niklas",
+ "facebook-button.svg": {
+ "author": "Facebook",
"url": "",
- "license": "MIT"
- },
- "reopening.svg": {
- "author": "Zammad",
- "url": "",
- "license": "MIT"
- },
- "trash.svg": {
- "author": "Filip Malinowski",
- "url": "https:\/\/thenounproject.com\/term\/trash\/16505\/",
- "license": "CC 3.0 Attribution"
- },
- "email.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
+ "license": ""
},
"email-button.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
- "paperclip.svg": {
- "author": "Cheesefork",
- "url": "https:\/\/thenounproject.com\/search\/?q=attachment&i=197956",
- "license": "CC 3.0 Attribution"
- },
- "cog.svg": {
- "author": "Melvin Salas",
- "url": "https:\/\/thenounproject.com\/term\/gear\/17369\/",
- "license": "CC 3.0 Attribution"
- },
- "team.svg": {
- "author": "R\u00e9my M\u00e9dard",
- "url": "https:\/\/thenounproject.com\/catalarem\/uploads\/?i=2554",
- "license": "CC 3.0 Attribution"
- },
- "important.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "note.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "pen.svg": {
- "author": "Dmitry Baranovskiy",
- "url": "https:\/\/thenounproject.com\/search\/?q=edit&i=5039",
- "license": "CC 3.0 Attribution"
- },
- "package.svg": {
- "author": "Michael Wallner",
- "url": "https:\/\/thenounproject.com\/search\/?q=package&i=25152",
- "license": "CC 3.0 Attribution"
- },
- "organization.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "eyedropper.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "unmute.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "mute.svg": {
+ "line-right-arrow.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
@@ -134,20 +49,30 @@
"url": "",
"license": "MIT"
},
+ "web.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
"user.svg": {
"author": "R\u00e9my M\u00e9dard",
"url": "https:\/\/thenounproject.com\/search\/?q=user&i=10314",
"license": "CC 3.0 Attribution"
},
+ "unmute.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"twitter.svg": {
"author": "Twitter",
"url": "twitter.com",
"license": ""
},
- "twitter-button.svg": {
- "author": "Twitter",
- "url": "twitter.com",
- "license": ""
+ "trash.svg": {
+ "author": "Filip Malinowski",
+ "url": "https:\/\/thenounproject.com\/term\/trash\/16505\/",
+ "license": "CC 3.0 Attribution"
},
"total-tickets.svg": {
"author": "Zammad",
@@ -164,6 +89,11 @@
"url": "",
"license": "MIT"
},
+ "team.svg": {
+ "author": "R\u00e9my M\u00e9dard",
+ "url": "https:\/\/thenounproject.com\/catalarem\/uploads\/?i=2554",
+ "license": "CC 3.0 Attribution"
+ },
"task-state.svg": {
"author": "Zammad",
"url": "",
@@ -194,6 +124,21 @@
"url": "",
"license": "MIT"
},
+ "small-dot.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
+ "signout.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
+ "searchdetail.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"report.svg": {
"author": "Zammad",
"url": "",
@@ -209,11 +154,31 @@
"url": "",
"license": "MIT"
},
+ "reopening.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
"reload.svg": {
"author": "Anand A Nair",
"url": "https:\/\/thenounproject.com\/anandgrafiti\/uploads\/?i=2149",
"license": "CC 3.0 Attribution"
},
+ "received-calls.svg": {
+ "author": "Michael Zenaty",
+ "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+ "license": "CC 3.0 Attribution"
+ },
+ "radio.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
+ "radio-checked.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
"plus.svg": {
"author": "Zammad",
"url": "",
@@ -224,21 +189,61 @@
"url": "",
"license": "MIT"
},
+ "phone.svg": {
+ "author": "Michael Zenaty",
+ "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+ "license": "CC 3.0 Attribution"
+ },
"person.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
+ "pen.svg": {
+ "author": "Dmitry Baranovskiy",
+ "url": "https:\/\/thenounproject.com\/search\/?q=edit&i=5039",
+ "license": "CC 3.0 Attribution"
+ },
+ "paperclip.svg": {
+ "author": "Cheesefork",
+ "url": "https:\/\/thenounproject.com\/search\/?q=attachment&i=197956",
+ "license": "CC 3.0 Attribution"
+ },
+ "package.svg": {
+ "author": "Michael Wallner",
+ "url": "https:\/\/thenounproject.com\/search\/?q=package&i=25152",
+ "license": "CC 3.0 Attribution"
+ },
"overviews.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
+ "outbound-calls.svg": {
+ "author": "Michael Zenaty",
+ "url": "https:\/\/thenounproject.com\/search\/?q=phone&i=21797",
+ "license": "CC 3.0 Attribution"
+ },
+ "organization.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"one-ticket.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
+ "note.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
+ "mute.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"mood-supergood.svg": {
"author": "Zammad",
"url": "",
@@ -324,26 +329,26 @@
"url": "",
"license": "MIT"
},
- "linkedin-button.svg": {
- "author": "Linkedin",
- "url": "",
- "license": ""
- },
- "line-right-arrow.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
"line-left-arrow.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
},
+ "info.svg": {
+ "author": "Information by Gregor \u010cre\u0161nar from the Noun Project",
+ "url": "https:\/\/thenounproject.com\/search\/?q=info&i=176431",
+ "license": "CC 3.0 Attribution"
+ },
"in-process.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
+ "important.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"help.svg": {
"author": "Felix Niklas",
"url": "",
@@ -354,31 +359,41 @@
"url": "",
"license": "MIT"
},
- "google-button.svg": {
- "author": "Google",
- "url": "",
- "license": ""
- },
"full-logo.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
+ "form.svg": {
+ "author": "Pickin Studio",
+ "url": "https:\/\/thenounproject.com\/search\/?q=website&i=16523",
+ "license": "CC 3.0 Attribution"
+ },
"facebook.svg": {
"author": "Facebook",
"url": "",
"license": ""
},
- "facebook-button.svg": {
- "author": "Facebook",
+ "eyedropper.svg": {
+ "author": "Felix Niklas",
"url": "",
- "license": ""
+ "license": "MIT"
+ },
+ "email.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
},
"dropdown-list.svg": {
"author": "Zammad",
"url": "",
"license": "MIT"
},
+ "draggable.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
"download.svg": {
"author": "Felix Niklas",
"url": "",
@@ -399,42 +414,17 @@
"url": "",
"license": "MIT"
},
+ "cog.svg": {
+ "author": "Melvin Salas",
+ "url": "https:\/\/thenounproject.com\/term\/gear\/17369\/",
+ "license": "CC 3.0 Attribution"
+ },
"cloud.svg": {
"author": "Kirill Ulitin",
"url": "https:\/\/thenounproject.com\/search\/?q=cloud&i=84976",
"license": "CC 3.0 Attribution"
},
- "small-dot.svg": {
- "author": "Zammad",
- "url": "",
- "license": "MIT"
- },
- "checkbox.svg": {
- "author": "Zammad",
- "url": "",
- "license": "MIT"
- },
- "checkbox-checked.svg": {
- "author": "Zammad",
- "url": "",
- "license": "MIT"
- },
- "clock.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "clipboard.svg": {
- "author": "Felix Niklas",
- "url": "",
- "license": "MIT"
- },
- "checkmark.svg": {
- "author": "Zammad",
- "url": "",
- "license": "MIT"
- },
- "chat.svg": {
+ "arrow-down.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
@@ -454,7 +444,32 @@
"url": "",
"license": "MIT"
},
- "arrow-down.svg": {
+ "clock.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
+ "clipboard.svg": {
+ "author": "Felix Niklas",
+ "url": "",
+ "license": "MIT"
+ },
+ "checkmark.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
+ "checkbox.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
+ "checkbox-checked.svg": {
+ "author": "Zammad",
+ "url": "",
+ "license": "MIT"
+ },
+ "chat.svg": {
"author": "Felix Niklas",
"url": "",
"license": "MIT"
diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css
index 69eb7588b..25fb2798c 100644
--- a/app/assets/stylesheets/svg-dimensions.css
+++ b/app/assets/stylesheets/svg-dimensions.css
@@ -16,14 +16,16 @@
.icon-download { width: 14px; height: 13px; }
.icon-draggable { width: 16px; height: 16px; }
.icon-dropdown-list { width: 19px; height: 14px; }
-.icon-email-button { width: 29px; height: 22px; }
+.icon-email-button { width: 29px; height: 24px; }
.icon-email { width: 17px; height: 17px; }
.icon-eyedropper { width: 17px; height: 17px; }
-.icon-facebook-button { width: 29px; height: 22px; }
+.icon-facebook-button { width: 29px; height: 24px; }
.icon-facebook { width: 17px; height: 17px; }
.icon-form { width: 17px; height: 17px; }
.icon-full-logo { width: 175px; height: 50px; }
-.icon-google-button { width: 29px; height: 22px; }
+.icon-github-button { width: 29px; height: 24px; }
+.icon-gitlab-button { width: 29px; height: 24px; }
+.icon-google-button { width: 29px; height: 24px; }
.icon-group { width: 24px; height: 24px; }
.icon-help { width: 16px; height: 16px; }
.icon-important { width: 16px; height: 16px; }
@@ -31,7 +33,7 @@
.icon-info { width: 5px; height: 11px; }
.icon-line-left-arrow { width: 34px; height: 7px; }
.icon-line-right-arrow { width: 34px; height: 7px; }
-.icon-linkedin-button { width: 29px; height: 22px; }
+.icon-linkedin-button { width: 29px; height: 24px; }
.icon-list { width: 16px; height: 16px; }
.icon-loading { width: 16px; height: 16px; }
.icon-lock-open { width: 16px; height: 16px; }
@@ -84,7 +86,7 @@
.icon-tools { width: 24px; height: 24px; }
.icon-total-tickets { width: 48px; height: 83px; }
.icon-trash { width: 16px; height: 16px; }
-.icon-twitter-button { width: 29px; height: 22px; }
+.icon-twitter-button { width: 29px; height: 24px; }
.icon-twitter { width: 17px; height: 17px; }
.icon-unmute { width: 16px; height: 16px; }
.icon-user { width: 16px; height: 16px; }
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 0de112df3..edcc21a69 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -2462,8 +2462,7 @@ ol.tabs li {
padding: 0 10px 0 7px;
margin-bottom: 10px;
color: white !important;
- line-height: 22px;
- text-align: center;
+ line-height: 23px;
border-radius: 4px;
display: flex;
align-items: center;
@@ -2479,7 +2478,8 @@ ol.tabs li {
}
&.auth-provider--google {
- background: #d8543c;
+ background: hsl(0,0%,93%);
+ color: hsl(0,0%,46%) !important;
}
&.auth-provider--twitter {
@@ -2494,13 +2494,19 @@ ol.tabs li {
background: #006087;
}
+ &.auth-provider--github {
+ background: hsl(0,0%,27%);
+ }
+
+ &.auth-provider--gitlab {
+ background: hsl(10,78%,53%);
+ }
+
.provider-name {
flex: 1;
}
.provider-icon {
- width: 29px;
- height: 22px;
margin-right: 10px;
margin-top: 1px;
}
diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch
index 9244cb31e..f11dab6bb 100644
Binary files a/contrib/icon-sprite.sketch and b/contrib/icon-sprite.sketch differ
diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg
index a83d6abb3..157aa8cc4 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/email-button.svg b/public/assets/images/icons/email-button.svg
index 77488202f..7fb265034 100644
--- a/public/assets/images/icons/email-button.svg
+++ b/public/assets/images/icons/email-button.svg
@@ -1,12 +1,12 @@
-