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-10-19 14:21:53 +02:00
commit c0e34c8b8b
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/app/views/agent_ticket_view/bulk.jst.eco
View file

@ -1,13 +1,13 @@
<form class="update-box bulkAction-form" role="form"> <form class="update-box bulkAction-form" role="form">
<div class="horizontal center bulkAction-firstStep js-action-step"> <div class="bulkAction-firstStep js-action-step">
<div id="form-ticket-bulk" class="form-inline form-inline--enclosed flex"></div> <div id="form-ticket-bulk" class="form-inline form-inline--enclosed flex"></div>
<div class="btn btn--primary js-confirm"><%- @T('Confirm') %></div> <div class="btn btn--primary js-confirm"><%- @T('Confirm') %></div>
</div> </div>
<div class="vertical hide bulkAction-secondStep js-confirm-step"> <div class="hide bulkAction-secondStep js-confirm-step">
<div id="form-ticket-bulk-comment" class="form-inline horizontal"></div> <div id="form-ticket-bulk-comment" class="form-inline"></div>
<div class="horizontal"> <div class="horizontal">
<div id="form-ticket-bulk-typeVisibility" class="form-inline"></div> <div id="form-ticket-bulk-typeVisibility" class="form-inline"></div>
<div class="bulkAction-controls align-right"> <div class="bulkAction-controls">
<a class="btn btn--text btn--secondary js-cancel"><%- @T( 'Go Back' ) %></a> <a class="btn btn--text btn--secondary js-cancel"><%- @T( 'Go Back' ) %></a>
<input type="submit" class="btn btn--primary js-submit" value="<%- @T('Update') %>"> <input type="submit" class="btn btn--primary js-submit" value="<%- @T('Update') %>">
</div> </div>

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

@ -2155,12 +2155,27 @@ footer {
0 -3px rgba(0,0,0,.01); 0 -3px rgba(0,0,0,.01);
} }
.bulkAction-firstStep {
display: flex;
align-items: center;
}
.bulkAction-secondStep {
display: flex;
flex-direction: column;
}
.bulkAction .btn { .bulkAction .btn {
margin: 0 10px; margin: 0 16px;
}
.bulkAction .btn--text {
margin-right: 0;
} }
.bulkAction-controls { .bulkAction-controls {
margin-top: 10px; margin-top: 10px;
margin-left: auto;
} }
.show_toogle { .show_toogle {
@ -3558,12 +3573,14 @@ footer {
.bulkAction-secondStep .form-inline textarea.form-control { .bulkAction-secondStep .form-inline textarea.form-control {
display: block; display: block;
padding-left: 8px;
padding-right: 8px;
width: 100%; width: 100%;
resize: vertical; resize: vertical;
} }
.bulkAction-secondStep .form-inline .expanding-wrapper {
margin: 0 6px;
}
.bulkAction-secondStep .form-inline textarea.form-control:not(:focus) { .bulkAction-secondStep .form-inline textarea.form-control:not(:focus) {
border-color: #f0f0f0; border-color: #f0f0f0;
} }