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

UI fixes

Browse source 
- calendar settings: clean checkbox label
- correct button layout in table
This commit is contained in:
Felix Niklas 2017-03-16 15:03:10 +01:00
parent 04eda17d3b
commit af5a73f92a
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
View file

@ -8,7 +8,7 @@
<p><%- @T('See your tickets from within your favorite calendar by adding the following URL to your calendar app.') %></p> <p><%- @T('See your tickets from within your favorite calendar by adding the following URL to your calendar app.') %></p>
<h3><label for="calendar-subscription-url"><%- @T('URL') %></label></h3> <label for="calendar-subscription-url"><%- @T('URL') %></label>
<form class="form--flexibleWidth"> <form class="form--flexibleWidth">
<div class="form-group"> <div class="form-group">
<div class="controls"> <div class="controls">
@ -23,14 +23,12 @@
<label for="notification-sound"><%- @T('Alarm') %></label> <label for="notification-sound"><%- @T('Alarm') %></label>
</div> </div>
<div class="controls"> <div class="controls">
<p>
<label class="checkbox-replacement inline-label"> <label class="checkbox-replacement inline-label">
<input type="checkbox" name="alarm" value="true" <% if @preferences.alarm: %>checked<% end %>/> <input type="checkbox" name="alarm" value="true" <% if @preferences.alarm: %>checked<% end %>/>
<%- @Icon('checkbox', 'icon-unchecked') %> <%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %> <%- @Icon('checkbox-checked', 'icon-checked') %>
<span class="label-text"><%- @T('Add alarm to pending reminder and escalated tickets.') %></span>
</label> </label>
<%- @T('Add alarm to pending reminder and escalated tickets.') %>
</p>
</div> </div>
</div> </div>
<table class="settings-list"> <table class="settings-list">

3
app/assets/stylesheets/zammad.scss
View file

@ -7294,7 +7294,8 @@ output {
} }
.btn--table { .btn--table {
margin: 0; padding-top: 0;
padding-bottom: 0;
} }
th:not(:last-child), th:not(:last-child),