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

style public hollidays settings-list

Browse source
This commit is contained in:
Felix Niklas 2015-09-15 11:49:38 +02:00
parent 3eb72d1e92
commit 53d6869c25
2 changed files with 83 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/assets/javascripts/app/views/calendar/new.jst.eco
View file

@ -661,34 +661,71 @@
<label for="name">Public Holidays</label> <label for="name">Public Holidays</label>
</div> </div>
<div class="controls"> <div class="controls">
<table class="settings-list">
<table class="table table-fluid">
<thead> <thead>
<tr> <tr>
<th><%- @T('Active') %>
<th><%- @T('Date') %> <th><%- @T('Date') %>
<th><%- @T('Description') %> <th><%- @T('Description') %>
<th><%- @T('Action') %> <th><%- @T('Action') %>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>
<label class="checkbox-replacement">
<input type="checkbox" checked>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td><%- @Tdate('2015-12-24') %> <td><%- @Tdate('2015-12-24') %>
<td>Some Description <td>Some Description
<td class="list-item-delete js-disable"><%- @Icon('diagonal-cross') %> <td>
<div class="settings-list-rowControls">
<div class="btn btn--text js-remove">
<%- @Icon('trash') %> <%- @T('Remove') %>
</div>
</div>
<tr> <tr>
<td>
<label class="checkbox-replacement">
<input type="checkbox" checked>
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td><%- @Tdate('2015-12-25') %> <td><%- @Tdate('2015-12-25') %>
<td>Some Description <td>Some Description
<td class="list-item-delete js-disable"><%- @Icon('diagonal-cross') %> <td>
<div class="settings-list-rowControls">
<div class="btn btn--text js-remove">
<%- @Icon('trash') %> <%- @T('Remove') %>
</div>
</div>
<tr class="is-inactive"> <tr class="is-inactive">
<td>
<label class="checkbox-replacement">
<input type="checkbox">
<%- @Icon('checkbox', 'icon-unchecked') %>
<%- @Icon('checkbox-checked', 'icon-checked') %>
</label>
<td><%- @Tdate('2015-12-26') %> <td><%- @Tdate('2015-12-26') %>
<td>Some Description <td>Some Description
<td class="list-item-delete js-disable">ICON FOR ENABLE? <td>
<tr> <div class="settings-list-rowControls">
<td colspan="2"><%- @T('Add manual hollidays') %>: <div class="btn btn--text js-remove">
<tr> <%- @Icon('trash') %> <%- @T('Remove') %>
<td><input type="text" name="public_holidays_date" placeholder="<%- @Tdate('2015-12-26') %>"/> </div>
<td><input type="text" name="public_holidays_description" placeholder="Some New Description"/> </div>
<%- @Icon('plus') %> <tr class="settings-list-controlRow">
<td>
<td>
<!-- Hallo Martin! Allow to add by pressing enter! -->
<input class="form-control form-control--small" type="date" name="public_holidays_date" placeholder="<%- @T('Date') %>"/>
<td>
<input class="form-control form-control--small" type="text" name="public_holidays_description" placeholder="<%- @T('Date Description') %>"/>
<td>
<div class="btn btn--text js-add">
<%- @Icon('plus-small') %> Add Date
</div>
</tbody> </tbody>
</table> </table>
</div> </div>

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

@ -294,6 +294,11 @@ span[data-tooltip]:hover:before {
white-space: nowrap; white-space: nowrap;
vertical-align: middle; vertical-align: middle;
.icon {
vertical-align: middle;
margin-top: -3px;
}
&:focus { &:focus {
box-shadow: 0 0 0 3px hsl(201,62%,90%); box-shadow: 0 0 0 3px hsl(201,62%,90%);
} }
@ -619,7 +624,6 @@ table {
.radio-replacement { .radio-replacement {
padding: 0; padding: 0;
margin: 0; margin: 0;
height: 38px;
@extend .u-clickable; @extend .u-clickable;
display: flex; display: flex;
align-items: center; align-items: center;
@ -635,6 +639,11 @@ table {
display: none; display: none;
} }
.table .checkbox-replacement,
.table .radio-replacement {
height: 38px;
}
.table .priority.icon:after { .table .priority.icon:after {
background: #f8f9fa; background: #f8f9fa;
} }
@ -801,6 +810,9 @@ label,
display: inline; display: inline;
white-space: nowrap; /* for labels in tables that might get crushed view: calendar_subscriptions */ white-space: nowrap; /* for labels in tables that might get crushed view: calendar_subscriptions */
} }
.inline-label .label-text {
margin-left: 3px;
}
fieldset { fieldset {
margin: 0 -4px; margin: 0 -4px;
@ -1020,6 +1032,7 @@ input[type="checkbox"] {
input[type=text], input[type=text],
input[type=password], input[type=password],
input[type=email], input[type=email],
input[type=date],
textarea, textarea,
.form-control, .form-control,
.checkbox.form-group .checkbox { .checkbox.form-group .checkbox {
@ -1040,8 +1053,7 @@ textarea,
appearance: none; appearance: none;
&.form-control--small { &.form-control--small {
padding-top: 0; padding: 0 8px;
padding-bottom: 0;
height: 31px; height: 31px;
} }
} }
@ -5823,7 +5835,6 @@ output {
} }
} }
th, td { th, td {
padding: 10px; padding: 10px;
border: 1px solid hsl(198,18%,86%); border: 1px solid hsl(198,18%,86%);
@ -5849,6 +5860,14 @@ output {
margin: 0; margin: 0;
} }
.btn.btn--text:not(.btn--secondary) {
color: hsl(60,1%,61%);
}
.btn .icon {
fill: hsl(60,1%,61%);
}
th:not(:last-child), th:not(:last-child),
td:not(:last-child) { td:not(:last-child) {
border-right: none; border-right: none;
@ -5858,6 +5877,11 @@ output {
border-bottom: none; border-bottom: none;
} }
tr.is-inactive td {
color: hsl(199,19%,80%);
text-decoration: line-through;
}
thead th:first-child { thead th:first-child {
border-top-left-radius: 4px; border-top-left-radius: 4px;
} }
@ -5896,6 +5920,12 @@ output {
vertical-align: top; vertical-align: top;
} }
} }
.settings-list-controlRow {
td {
padding: 5px;
}
}
} }