From 2158807fd0054c7bd7d9010ff893453405c72e10 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 May 2015 21:42:08 +0200 Subject: [PATCH] replace icon-close by icon-diagonal-cross --- .../app/views/agent_user_create.jst.eco | 2 +- .../app/views/layout_ref/local_modal.jst.eco | 2 +- app/assets/javascripts/app/views/modal.jst.eco | 2 +- .../javascripts/app/views/navigation.jst.eco | 2 +- .../app/views/task_widget_tasks.jst.eco | 2 +- .../app/views/widget/switch_back_to_user.jst.eco | 2 +- app/assets/stylesheets/svg-dimensions.css | 1 - app/assets/stylesheets/zammad.css.scss | 14 +++++--------- public/assets/images/icons.svg | 2 +- public/assets/images/icons/close.svg | 12 ------------ 10 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 public/assets/images/icons/close.svg diff --git a/app/assets/javascripts/app/views/agent_user_create.jst.eco b/app/assets/javascripts/app/views/agent_user_create.jst.eco index 89f47efec..4ed610d36 100644 --- a/app/assets/javascripts/app/views/agent_user_create.jst.eco +++ b/app/assets/javascripts/app/views/agent_user_create.jst.eco @@ -3,7 +3,7 @@
- +

<%- @T( @head ) %>

diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco index 4464fdeb3..b68a51cb5 100644 --- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -6,7 +6,7 @@
- +

Edit Customer

diff --git a/app/assets/javascripts/app/views/modal.jst.eco b/app/assets/javascripts/app/views/modal.jst.eco index b2b47500e..11211f2de 100644 --- a/app/assets/javascripts/app/views/modal.jst.eco +++ b/app/assets/javascripts/app/views/modal.jst.eco @@ -4,7 +4,7 @@
<% if @close: %>
- +
<% end %>

<%- @T( @head ) %>

diff --git a/app/assets/javascripts/app/views/navigation.jst.eco b/app/assets/javascripts/app/views/navigation.jst.eco index 4fe97ca16..96f6749c0 100644 --- a/app/assets/javascripts/app/views/navigation.jst.eco +++ b/app/assets/javascripts/app/views/navigation.jst.eco @@ -3,7 +3,7 @@
- +
diff --git a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco index 81fce0b6b..bdb75b005 100644 --- a/app/assets/javascripts/app/views/task_widget_tasks.jst.eco +++ b/app/assets/javascripts/app/views/task_widget_tasks.jst.eco @@ -11,7 +11,7 @@
<%= item.data.head %>
- +
diff --git a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco index 29f68e6ef..7eb33073e 100644 --- a/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco +++ b/app/assets/javascripts/app/views/widget/switch_back_to_user.jst.eco @@ -4,7 +4,7 @@
<%- @T('Back to my view') %>
- +
\ No newline at end of file diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 911973215..d66d53d8c 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -6,7 +6,6 @@ .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; } diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 1ac0a3232..0dbdba3e3 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1698,7 +1698,7 @@ footer { background-color: #972e29; } - .nav-tab-close .icon { + .nav-tab-close svg { width: 13px; height: 13px; fill: white; @@ -1706,7 +1706,7 @@ footer { transform: scale(0.7); } - .nav-tab-close:hover .icon { + .nav-tab-close:hover svg { opacity: 1; } @@ -1758,7 +1758,7 @@ footer { justify-content: center; } - .empty-search .icon-close { + .empty-search .icon-diagonal-cross { fill: white; opacity: 0.5; } @@ -3819,10 +3819,8 @@ footer { align-items: center; justify-content: center; - .icon { + svg { fill: white; - width: 13px; - height: 13px; } } @@ -3869,10 +3867,8 @@ footer { @extend .u-clickable; } - .modal-close .close-icon { + .modal-close .icon-diagonal-cross { opacity: 0.18; - width: 13px; - height: 13px; } .modal-body { diff --git a/public/assets/images/icons.svg b/public/assets/images/icons.svg index 46e308cea..77a66985e 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockclosecloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upcheckbox-checkedcheckboxcheckmarkclockcloudcogdashboarddiagonal-crossdownloademailfacebookgrouphelpimportantin-processlistloadinglock-openlocklong-arrow-rightmagnifiermarkermessagemood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphonepluspriority-modified-inner-circlepriority-modified-outer-circlepriorityradio-checkedradioreceived-callsreopeningreply-allreplysignoutsplitstopwatchswitchViewteamtemplatestoolstotal-ticketstrashtwitteruser \ No newline at end of file diff --git a/public/assets/images/icons/close.svg b/public/assets/images/icons/close.svg deleted file mode 100644 index 11955773a..000000000 --- a/public/assets/images/icons/close.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - close - Created with Sketch. - - - - - - - \ No newline at end of file