From c1bcf5285c3bd136ab553c188b82ed21e28832f2 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Fri, 22 May 2015 09:59:35 +0200 Subject: [PATCH] create .icon-error (version of icon-diagonal-cross but with color) --- .../app/views/generic/error/generic.jst.eco | 2 +- .../app/views/generic/error/not_found.jst.eco | 2 +- .../views/generic/error/unauthorized.jst.eco | 2 +- .../javascripts/app/views/import/otrs.jst.eco | 14 +++---- .../app/views/layout_ref/error.jst.eco | 2 +- .../views/layout_ref/import_wizard.jst.eco | 13 +++--- .../layout_ref/loading_placeholder.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 2 +- app/assets/stylesheets/zammad.css.scss | 41 ++++++++----------- public/assets/images/icons.svg | 2 +- .../assets/images/icons/checkbox-checked.svg | 12 ++++++ public/assets/images/icons/checkbox.svg | 12 ++++++ public/assets/images/icons/checkmark.svg | 12 ++++++ public/assets/images/icons/download.svg | 12 ++++++ 14 files changed, 87 insertions(+), 43 deletions(-) create mode 100644 public/assets/images/icons/checkbox-checked.svg create mode 100644 public/assets/images/icons/checkbox.svg create mode 100644 public/assets/images/icons/checkmark.svg create mode 100644 public/assets/images/icons/download.svg diff --git a/app/assets/javascripts/app/views/generic/error/generic.jst.eco b/app/assets/javascripts/app/views/generic/error/generic.jst.eco index 7811d745d..3ee886f7f 100644 --- a/app/assets/javascripts/app/views/generic/error/generic.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/generic.jst.eco @@ -1,4 +1,4 @@
- +

<%- @T('Status Code') %>: <%= @status %>. <%= @detail %>

\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco index 6d059a1e3..712731661 100644 --- a/app/assets/javascripts/app/views/generic/error/not_found.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/not_found.jst.eco @@ -1,4 +1,4 @@
- +

<%- @T('Opps.. I\'m sorry, but I can\'t find this %s.', @objectName ) %>

\ No newline at end of file diff --git a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco index 47eb706f9..bfb0c9e21 100644 --- a/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco +++ b/app/assets/javascripts/app/views/generic/error/unauthorized.jst.eco @@ -1,4 +1,4 @@
- +

<%- @T('Opps.. I\'m sorry, but you have insufficient rights to open this %s.', @objectName ) %>

\ No newline at end of file diff --git a/app/assets/javascripts/app/views/import/otrs.jst.eco b/app/assets/javascripts/app/views/import/otrs.jst.eco index cfadc94b8..63210b4dc 100644 --- a/app/assets/javascripts/app/views/import/otrs.jst.eco +++ b/app/assets/javascripts/app/views/import/otrs.jst.eco @@ -18,7 +18,7 @@

<%- @T('Download and install your personalised OTRS Migration Plugin on your OTRS System') %>:

- <%- @T('Personal Migration Plugin') %> + <%- @T('Personal Migration Plugin') %>
<%- @T('Go Back') %> @@ -37,8 +37,8 @@
-
-
+ +
@@ -60,7 +60,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -78,7 +78,7 @@
-
+
@@ -87,7 +87,7 @@
-
+
diff --git a/app/assets/javascripts/app/views/layout_ref/error.jst.eco b/app/assets/javascripts/app/views/layout_ref/error.jst.eco index e08b39c5c..2e964ccdd 100644 --- a/app/assets/javascripts/app/views/layout_ref/error.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/error.jst.eco @@ -1,4 +1,4 @@
- +

<%- @T('Status Code') %>: 1234. Check your internet connection...

\ No newline at end of file diff --git a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco index bdc1c12a5..250a9529a 100644 --- a/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/import_wizard.jst.eco @@ -25,7 +25,8 @@

Download and install this personalised OTRS Migration Plugin on your OTRS System:

- Personal Migration Plugin + + Personal Migration Plugin
Go Back @@ -44,8 +45,8 @@
-
-
+ +
@@ -65,7 +66,7 @@
-
+
@@ -74,7 +75,7 @@
-
+
@@ -83,7 +84,7 @@
-
+
diff --git a/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco index ca1b84ef7..b11b18204 100644 --- a/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/loading_placeholder.jst.eco @@ -1,3 +1,3 @@ -
+

Loading Ticket

\ No newline at end of file diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index c3e9aa81e..2d77e1d20 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -1 +1 @@ -.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-clock { width: 16px; height: 16px; } .icon-close { width: 13px; height: 13px; } .icon-cloud { width: 16px; height: 16px; } .icon-cog { width: 20px; height: 20px; } .icon-dashboard { width: 24px; height: 24px; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-mail { width: 17px; height: 17px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-happy { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-super-happy { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file +.icon-arrow-down { width: 13px; height: 7px; } .icon-arrow-left { width: 7px; height: 13px; } .icon-arrow-right { width: 7px; height: 13px; } .icon-arrow-up { width: 13px; height: 7px; } .icon-checkbox-checked { width: 10px; height: 10px; } .icon-checkbox { width: 10px; height: 10px; } .icon-checkmark { width: 16px; height: 14px; } .icon-clock { width: 16px; height: 16px; } .icon-close { width: 13px; height: 13px; } .icon-cloud { width: 16px; height: 16px; } .icon-cog { width: 20px; height: 20px; } .icon-dashboard { width: 24px; height: 24px; } .icon-diagonal-cross { width: 13px; height: 13px; } .icon-download { width: 14px; height: 13px; } .icon-email { width: 17px; height: 17px; } .icon-facebook { width: 17px; height: 17px; } .icon-group { width: 24px; height: 24px; } .icon-important { width: 16px; height: 16px; } .icon-in-process { width: 64px; height: 64px; } .icon-list { width: 16px; height: 16px; } .icon-lock-open { width: 16px; height: 16px; } .icon-lock { width: 16px; height: 16px; } .icon-logo { width: 42px; height: 36px; } .icon-long-arrow-right { width: 11px; height: 11px; } .icon-magnifier { width: 15px; height: 15px; } .icon-mail { width: 17px; height: 17px; } .icon-marker { width: 17px; height: 19px; } .icon-message { width: 24px; height: 24px; } .icon-mood-bad { width: 60px; height: 59px; } .icon-mood-good { width: 60px; height: 59px; } .icon-mood-happy { width: 60px; height: 59px; } .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-super-happy { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } .icon-note { width: 17px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } .icon-outbound-calls { width: 17px; height: 17px; } .icon-overviews { width: 24px; height: 24px; } .icon-package { width: 16px; height: 16px; } .icon-pen { width: 16px; height: 16px; } .icon-person { width: 24px; height: 24px; } .icon-phone { width: 17px; height: 17px; } .icon-plus { width: 20px; height: 20px; } .icon-priority-modified-inner-circle { width: 16px; height: 16px; } .icon-priority-modified-outer-circle { width: 16px; height: 16px; } .icon-priority { width: 16px; height: 16px; } .icon-received-calls { width: 17px; height: 17px; } .icon-reopening { width: 68px; height: 47px; } .icon-reply-all { width: 16px; height: 16px; } .icon-reply { width: 16px; height: 16px; } .icon-signout { width: 15px; height: 19px; } .icon-split { width: 16px; height: 16px; } .icon-stopwatch { width: 77px; height: 83px; } .icon-switchView { width: 19px; height: 18px; } .icon-team { width: 16px; height: 16px; } .icon-templates { width: 24px; height: 24px; } .icon-tools { width: 24px; height: 24px; } .icon-total-tickets { width: 48px; height: 83px; } .icon-twitter { width: 17px; height: 17px; } .icon-user { width: 16px; height: 16px; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 4cb2825c5..4079dc3b0 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -397,11 +397,12 @@ span[data-tooltip]:hover:before { margin-top: 10px; } -.btn--download .download.icon { +.btn--download .icon-download { margin-right: 6px; - margin-top: 3px; + margin-top: 4px; margin-left: -10px; vertical-align: top; + fill: white; } .btn-label { @@ -871,7 +872,6 @@ textarea, .icon { margin-right: 14px; - fill: #F35910; } h2 { @@ -1322,6 +1322,16 @@ ol.tabs li { height: 13px; } +.icon-checkmark { + fill: #38AE6A; +} + +.icon-error { + fill: #F35910; + width: 13px; + height: 13px; +} + .add.icon, .remove.icon { @@ -1861,22 +1871,6 @@ ol.tabs li { background-position: -103px -345px; } - .download.icon { - width: 14px; - height: 13px; - background-position: -120px -349px; - } - - .checkmark.icon { - width: 17px; - height: 15px; - background-position: -135px -348px; - } - - .white.checkmark.icon { - background-position: -135px -364px; - } - .error.icon { width: 13px; height: 13px; @@ -1884,6 +1878,7 @@ ol.tabs li { } .loading.icon { + display: inline-block; width: 30px; height: 30px; background: hsl(145,51%,45%); @@ -4949,8 +4944,8 @@ label + .wizard-buttonList { } .input-feedback[data-state=loading] .loading.icon, -.input-feedback[data-state=error] .error.icon, -.input-feedback[data-state=success] .checkmark.icon { +.input-feedback[data-state=error] .icon-error, +.input-feedback[data-state=success] .icon-checkmark { display: block; } @@ -4979,12 +4974,12 @@ label + .wizard-buttonList { display: block; } -.progressTable .checkmark { +.progressTable .icon-checkmark { margin-left: 10px; opacity: 0; } -.progressTable tr.is-done .checkmark { +.progressTable tr.is-done .icon-checkmark { opacity: 1; } diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index d1bb9b8c8..3c14c1650 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upclockclosecloudcogdashboarddiagonal-crossemailfacebookgroupimportantin-processlistlock-openlocklong-arrow-rightmagnifiermailmarkermessagemood-badmood-goodmood-happymood-okmood-super-badmood-super-happymood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgroupimportantin-processlistlock-openlocklong-arrow-rightmagnifiermailmarkermessagemood-badmood-goodmood-happymood-okmood-super-badmood-super-happymood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/checkbox-checked.svg b/public/assets/images/icons/checkbox-checked.svg new file mode 100644 index 000000000..4514e361e --- /dev/null +++ b/public/assets/images/icons/checkbox-checked.svg @@ -0,0 +1,12 @@ + + + + checkbox-checked + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/checkbox.svg b/public/assets/images/icons/checkbox.svg new file mode 100644 index 000000000..09f99e4e1 --- /dev/null +++ b/public/assets/images/icons/checkbox.svg @@ -0,0 +1,12 @@ + + + + checkbox + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/checkmark.svg b/public/assets/images/icons/checkmark.svg new file mode 100644 index 000000000..d45baed61 --- /dev/null +++ b/public/assets/images/icons/checkmark.svg @@ -0,0 +1,12 @@ + + + + checkmark + Created with Sketch. + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/download.svg b/public/assets/images/icons/download.svg new file mode 100644 index 000000000..2d5e9eb53 --- /dev/null +++ b/public/assets/images/icons/download.svg @@ -0,0 +1,12 @@ + + + + download + Created with Sketch. + + + + + + + \ No newline at end of file