diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index ae514c7d1..d5070211f 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -438,10 +438,10 @@ closed - + open - + pending close @@ -452,16 +452,6 @@ - - - Pending till * - - - - at - - - Priority * @@ -485,21 +475,19 @@ + + + Notifications + + <%- @Icon('mute') %> + Unsubscribe + + You’re receiving notifications because you wrote something. + + Tags - - - test - - - - - - 123 - - - planeten diff --git a/app/assets/stylesheets/svg-dimensions.css b/app/assets/stylesheets/svg-dimensions.css index 8c687ce56..7fb77979d 100644 --- a/app/assets/stylesheets/svg-dimensions.css +++ b/app/assets/stylesheets/svg-dimensions.css @@ -45,6 +45,7 @@ .icon-mood-ok { width: 60px; height: 59px; } .icon-mood-super-bad { width: 60px; height: 59px; } .icon-mood-supergood { width: 60px; height: 59px; } +.icon-mute { width: 16px; height: 16px; } .icon-note { width: 16px; height: 16px; } .icon-one-ticket { width: 48px; height: 10px; } .icon-organization { width: 16px; height: 16px; } @@ -80,6 +81,7 @@ .icon-trash { width: 16px; height: 16px; } .icon-twitter-button { width: 29px; height: 22px; } .icon-twitter { width: 17px; height: 17px; } +.icon-unmute { width: 16px; height: 16px; } .icon-user { width: 16px; height: 16px; } .icon-zoom-in { width: 20px; height: 20px; } .icon-zoom-out { width: 20px; height: 20px; } \ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 4cb0cacc9..800e27164 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -304,7 +304,7 @@ pre code.hljs { display: inline-block; font-size: 14px; padding: 10px 24px 9px; - color: hsl(202,68%,54%); + color: hsl(0,0%,20%); background: white; border: 1px solid rgba(0,0,0,.1); outline: none !important; @@ -319,6 +319,7 @@ pre code.hljs { .icon { vertical-align: middle; margin-top: -3px; + fill: currentColor; } &.btn--icon--last .icon { @@ -339,6 +340,12 @@ pre code.hljs { padding-right: 12px; } + &.btn--fullWidth { + width: 100%; + text-align: center; + justify-content: center; + } + &.btn--table { padding: 4px 9px; font-weight: 300; @@ -4961,7 +4968,7 @@ footer { } .sidebar .text-muted { - color: hsl(198,19%,72%); + color: hsl(198,22%,82%); } .alert { @@ -4993,6 +5000,10 @@ footer { margin: 20px 0; } +.userNotifications label + .btn { + margin-top: 1px; +} + .list { padding: 0; margin-bottom: 5px; diff --git a/contrib/icon-sprite.sketch b/contrib/icon-sprite.sketch index dd59ccaba..5d68abe9b 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 8669e5edf..e181a3ad4 100644 --- a/public/assets/images/icons.svg +++ b/public/assets/images/icons.svg @@ -1 +1 @@ -arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddropdown-listemail-buttonemailfacebook-buttonfacebookfull-logogoogle-buttongrouphelpimportantin-processline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogologotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-super-badmood-supergoodnoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtemplatestoolstotal-ticketstrashtwitter-buttontwitteruserzoom-inzoom-out \ No newline at end of file +arrow-downarrow-leftarrow-rightarrow-upchatcheckbox-checkedcheckboxcheckmarkclipboardclockcloudcogcrowndashboarddiagonal-crossdownloaddropdown-listemail-buttonemailfacebook-buttonfacebookfull-logogoogle-buttongrouphelpimportantin-processline-left-arrowline-right-arrowlinkedin-buttonlistloadinglock-openlocklogologotypelong-arrow-rightmagnifiermarkermessageminus-smallminusmood-badmood-goodmood-okmood-super-badmood-supergoodmutenoteone-ticketorganizationoutbound-callsoverviewspackagepaperclippenpersonphoneplus-smallplusradio-checkedradioreceived-callsreloadreopeningreply-allreplyreportsignoutsmall-dotsplitstatus-modified-outer-circlestatusstopwatchswitchViewtask-stateteamtemplatestoolstotal-ticketstrashtwitter-buttontwitterunmuteuserzoom-inzoom-out \ No newline at end of file diff --git a/public/assets/images/icons/mute.svg b/public/assets/images/icons/mute.svg new file mode 100644 index 000000000..e6dff1f89 --- /dev/null +++ b/public/assets/images/icons/mute.svg @@ -0,0 +1,13 @@ + + + + mute + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/public/assets/images/icons/unmute.svg b/public/assets/images/icons/unmute.svg new file mode 100644 index 000000000..e6d6e3806 --- /dev/null +++ b/public/assets/images/icons/unmute.svg @@ -0,0 +1,13 @@ + + + + unmute + Created with Sketch. + + + + + + + + \ No newline at end of file