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

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-05-28 13:48:01 +02:00
commit 81003e0807
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/views/link/info.jst.eco
View file

@ -1,5 +1,4 @@
<label><%- @T('Links') %></label> <label><%- @T('Links') %></label>
<p>
<% for type of @links: %> <% for type of @links: %>
<label><%- @T( type ) %></label> <label><%- @T( type ) %></label>
<ul> <ul>
@ -8,5 +7,4 @@
<% end %> <% end %>
</ul> </ul>
<% end %> <% end %>
</p> <div class="text-muted js-newTagLabel u-clickable" data-type="add">+ <%- @T('Add Link') %></div>
<a href="" data-type="add" class="glyphicon glyphicon-plus" title="<%- @Ti('Add') %>"></a>

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

@ -3919,6 +3919,7 @@ footer {
border-radius: 0; border-radius: 0;
border: 1px solid hsl(0,0%,90%); border: 1px solid hsl(0,0%,90%);
box-shadow: none; box-shadow: none;
color: hsl(206,7%,28%);
word-wrap: break-word; word-wrap: break-word;
} }