From b1e72e993434c5c5c9cbad8e9a67c345f9d4ee9c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 26 Aug 2014 16:38:26 +0200 Subject: [PATCH] add white note; split, reply, internal --- app/assets/images/sprite.svg | 21 ++++++--- app/assets/stylesheets/zzz.css.erb | 72 ++++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 20 deletions(-) diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg index e8c46b746..0e58edf92 100644 --- a/app/assets/images/sprite.svg +++ b/app/assets/images/sprite.svg @@ -1,5 +1,5 @@ - + Created with Sketch (http://www.bohemiancoding.com/sketch) @@ -20,11 +20,17 @@ - - - - - + + + + + + + + + + + @@ -175,5 +181,8 @@ + + + \ No newline at end of file diff --git a/app/assets/stylesheets/zzz.css.erb b/app/assets/stylesheets/zzz.css.erb index c11e8f027..80ccd3054 100644 --- a/app/assets/stylesheets/zzz.css.erb +++ b/app/assets/stylesheets/zzz.css.erb @@ -964,15 +964,11 @@ ol.tabs li { width: 2px; background: #85888a; -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); transform: rotate(45deg); } .close.icon:after { -webkit-transform: rotate(-45deg); - -moz-transform: rotate(-45deg); - -ms-transform: rotate(-45deg); transform: rotate(-45deg); } @@ -1106,6 +1102,7 @@ ol.tabs li { background-position: -170px -141px; } + .white.phone.channel.icon, .white.received-calls.channel.icon { background-position: -187px -141px; } @@ -1122,6 +1119,10 @@ ol.tabs li { background-position: -238px -141px; } + .white.note.channel.icon { + background-position: -255px -141px; + } + .mood.icon { width: 60px; height: 59px; @@ -1289,6 +1290,24 @@ ol.tabs li { background-position: -42px -311px; } + .split.icon { + width: 24px; + height: 20px; + background-position: 0 -336px; + } + + .reply.icon { + width: 19px; + height: 20px; + background-position: -24px -336px; + } + + .internal.icon { + width: 16px; + height: 20px; + background-position: -44px -336px; + } + /* * removed margin of forms to not break the layout with submit buttons within
area e. g. for modal dialogs @@ -1450,13 +1469,6 @@ footer { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); } -.internal { - background-color: #f2dede; - border-color: #eed3d7; - border: 1px solid #fbeed5; - border-radius: 4px; -} - .merged, .merge:hover { text-decoration: line-through; } @@ -2410,6 +2422,7 @@ footer { .article-content-meta { margin-left: 55px; margin-right: 55px; + position: relative; } .article-content { margin-right: 55px; @@ -2420,6 +2433,24 @@ footer { margin-left: 55px; } + .article-content-meta .more, + .article-content-meta .close-details, + .article-action { + margin: 5px 12px; + color: hsl(200,87%,45%); + font-size: 12px; + text-decoration: underline; + cursor: pointer; + -webkit-user-select: none; + user-select: none; + } + + .article-content-meta .close-details { + position: absolute; + right: 5px; + bottom: -33px; + } + .article-meta { background: #2c2d36; color: white; @@ -2446,7 +2477,8 @@ footer { } .article-meta .icon { - vertical-align: bottom; + vertical-align: top; + margin: 1px 3px 0 0; } .article-meta .text-muted { @@ -2532,7 +2564,8 @@ footer { background: white; border: 1px solid hsl(240,4%,95%); box-shadow: 0 0 1px rgba(0,0,0,.06) inset; - transform: rotate(-45deg); + -webkit-transform: rotate(-45deg); + transform: rotate(-45deg); } .ticket-article-item .text-bubble.internal .bubble-arrow:after { @@ -2557,10 +2590,21 @@ footer { margin-top: 12px; } - .article-actions { + .article-action { text-align: center; + padding: 5px; } + .article-action .icon { + margin-right: 10px; + vertical-align: bottom; + opacity: 0.33; + } + + .article-action:hover .icon { + opacity: 0.75; + } + .ticket-edit { margin-top: auto; margin-bottom: 37px;