Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix ticket tags

Browse source
This commit is contained in:
Felix Niklas 2015-05-28 15:27:44 +02:00
parent 91c14382a4
commit 7f297a977c
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/views/widget/tag.jst.eco
View file

@ -2,12 +2,12 @@
<label><%- @T( 'Tags' ) %></label> <label><%- @T( 'Tags' ) %></label>
<ul class="tagList"> <ul class="tagList">
<% for tag in @tags: %> <% for tag in @tags: %>
<li class="horizontal center"> <li class="tag">
<span class="flex tag"><%= tag %></span> <div class="tag-name"><%= tag %></div>
<!--<span>3</span>--> <!--<span>3</span>-->
<span class="tag-delete js-delete centered u-clickable"> <div class="tag-delete js-delete ">
<span class="delete icon"></span> <svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
</span> </div>
<% end %> <% end %>
</ul> </ul>
<div class="text-muted js-newTagLabel u-clickable">+ <%- @T('Add Tag') %></div> <div class="text-muted js-newTagLabel u-clickable">+ <%- @T('Add Tag') %></div>

25
app/assets/stylesheets/zammad.css.scss
View file

@ -3599,20 +3599,35 @@ footer {
margin-bottom: 5px; margin-bottom: 5px;
} }
.tagList li { .tagList .tag {
display: flex;
align-items: center;
color: hsl(206,7%,28%);
border-bottom: 1px solid hsl(240,4%,95%); border-bottom: 1px solid hsl(240,4%,95%);
} }
.tagList .tag-name {
flex: 1;
}
.tagList .tag-delete { .tagList .tag-delete {
height: 29px; height: 29px;
padding: 0 10px; padding: 0 10px;
margin-right: -4px; margin-right: -4px;
display: block; display: flex;
opacity: 0.2; align-items: center;
justify-content: center;
@extend .u-clickable;
.icon {
width: 9px;
height: 9px;
fill: hsl(0,0%,82%);
}
} }
.tagList .tag-delete:hover { .tagList .tag-delete:hover .icon {
opacity: 0.5; fill: hsl(1,77%,47%);
} }
.attributeBar { .attributeBar {