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

fix editControls alignment in IE 10&11

Browse source 
and refactor class names
This commit is contained in:
Felix Niklas 2014-10-08 13:56:28 +02:00
parent d434df8093
commit f8b479b816
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/ticket_zoom.js.coffee
View file

@ -698,8 +698,8 @@ class Edit extends App.Controller
'.attachmentUpload-progressBar':'progressBar' '.attachmentUpload-progressBar':'progressBar'
'.js-percentage': 'progressText' '.js-percentage': 'progressText'
'.text-bubble': 'textBubble' '.text-bubble': 'textBubble'
'.edit-control-item': 'editControlItem' '.editControls-item': 'editControlItem'
#'.edit-controls': 'editControls' #'.editControls': 'editControls'
#'.recipient-picker': 'recipientPicker' #'.recipient-picker': 'recipientPicker'
#'.recipient-list': 'recipientList' #'.recipient-list': 'recipientList'
#'.recipient-list .list-arrow': 'recipientListArrow' #'.recipient-list .list-arrow': 'recipientListArrow'

6
app/assets/javascripts/app/views/ticket_zoom/edit.jst.eco
View file

@ -3,9 +3,9 @@
<input type="hidden" name="internal" value="<%= @article.internal %>"> <input type="hidden" name="internal" value="<%= @article.internal %>">
<input type="hidden" name="form_id" value="<%= @article.form_id %>"> <input type="hidden" name="form_id" value="<%= @article.form_id %>">
<div class="bubble-grid horizontal"> <div class="bubble-grid horizontal">
<div class="vertical center edit-controls"> <div class="editControls">
<%- App.User.fullLocal( @S('id') ).avatar(false, 'right', 'zIndex-5') %> <%- App.User.fullLocal( @S('id') ).avatar(false, 'right', 'zIndex-5') %>
<div class="dark pop-select zIndex-7 edit-control-item"> <div class="dark pop-select zIndex-7 editControls-item">
<div class="pop-selected u-clickable centered"> <div class="pop-selected u-clickable centered">
<div class="gray <%- @article.type %> channel icon"></div> <div class="gray <%- @article.type %> channel icon"></div>
</div> </div>
@ -19,7 +19,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="visibility-toggle zIndex-7 u-clickable edit-control-item"> <div class="visibility-toggle zIndex-7 u-clickable editControls-item">
<div class="internal-visibility centered" title="<%- @T("unset internal") %>"> <div class="internal-visibility centered" title="<%- @T("unset internal") %>">
<div class="internal visibility icon"></div> <div class="internal visibility icon"></div>
</div> </div>

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

@ -2767,10 +2767,6 @@ footer {
background: white; background: white;
} }
.ticket-edit .avatar {
margin-bottom: 3px;
}
.dropArea { .dropArea {
background: white; background: white;
border: 5px solid; border: 5px solid;
@ -2784,27 +2780,32 @@ footer {
display: block; display: block;
} }
.edit-controls { .editControls {
position: relative; position: relative;
} }
.edit-control-item { .editControls-item {
width: 38px; width: 38px;
height: 36px; height: 36px;
position: absolute; position: absolute;
top: 38px; top: 38px;
display: none; display: none;
margin-left: 1px;
} }
.edit-control-item:nth-child(3) { .editControls-item:nth-child(2) {
top: 74px; margin-top: 5px;
} }
.edit-control-item:nth-child(4) { .editControls-item:nth-child(3) {
top: 110px; top: 79px;
} }
.edit-control-item:not(:last-child) { .editControls-item:nth-child(4) {
top: 115px;
}
.editControls-item:not(:last-child) {
border-bottom: 1px solid #e6e6e6; border-bottom: 1px solid #e6e6e6;
} }