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

fix tabsSidebar overflow

Browse source 
by adding a tabsSidebar-holder to the parent element containing both the content and the sidebar
This commit is contained in:
Felix Niklas 2014-09-29 12:54:04 +02:00
parent f5a7c3c06c
commit 0c3d3e63a6
5 changed files with 67 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
app/assets/javascripts/app/views/agent_ticket_create.jst.eco
View file

@ -1,49 +1,51 @@
<div class="main no-padding flex tabsSidebarSpace">
<div class="newTicket">
<div class="box">
<div class="page-header">
<h1><%- @T( @head ) %></h1>
<div class="tabsSidebar-holder">
<div class="main no-padding flex tabsSidebarSpace">
<div class="newTicket">
<div class="box">
<div class="page-header">
<h1><%- @T( @head ) %></h1>
</div>
<ul class="horizontal tabs type-tabs">
<li class="tab u-textTruncate" data-type="phone-in">
<div class="gray received-calls channel icon"></div>
<%- @T( 'Received Call' ) %>
</li>
<li class="tab u-textTruncate" data-type="phone-out">
<div class="gray outbound-calls channel icon"></div>
<%- @T( 'Outbound Call' ) %>
</li>
<li class="tab u-textTruncate" data-type="email-out">
<div class="gray email channel icon"></div>
<%- @T( 'Send E-Mail' ) %>
</li>
</ul>
<form role="form" class="ticket-create">
<input type="hidden" name="formSenderType"/>
<div class="ticket-form-top"></div>
<div class="article-form-top"></div>
<div class="formset-inset">
<div class="ticket-form-middle horizontal two-columns"></div>
<div class="ticket-form-bottom"></div>
</div>
<div class="form-actions horizontal">
<a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
<ul class="horizontal tabs type-tabs">
<li class="tab u-textTruncate" data-type="phone-in">
<div class="gray received-calls channel icon"></div>
<%- @T( 'Received Call' ) %>
</li>
<li class="tab u-textTruncate" data-type="phone-out">
<div class="gray outbound-calls channel icon"></div>
<%- @T( 'Outbound Call' ) %>
</li>
<li class="tab u-textTruncate" data-type="email-out">
<div class="gray email channel icon"></div>
<%- @T( 'Send E-Mail' ) %>
</li>
</ul>
<form role="form" class="ticket-create">
<input type="hidden" name="formSenderType"/>
<div class="ticket-form-top"></div>
<div class="article-form-top"></div>
<div class="formset-inset">
<div class="ticket-form-middle horizontal two-columns"></div>
<div class="ticket-form-bottom"></div>
</div>
<div class="form-actions horizontal">
<a class="subtle-link standalone cancel" href="#/"><%- @T( 'Cancel & Go Back' ) %></a>
<button type="submit" class="btn btn--success submit align-right"><%- @T( 'Create' ) %></button>
</div>
</form>
</div>
</div>
</div>
<div class="tabsSidebar vertical"></div>
<div class="tabsSidebar vertical"></div>
</div>
<!--
<div class="sidebar">
<div class="widgets">

28
app/assets/javascripts/app/views/layout_ref/content_sidebar_tabs_right.jst.eco
View file

@ -1,17 +1,19 @@
<div class="main flex tabsSidebarSpace">
<h1>content</h1>
<div class="tabsSidebar-holder flex horizontal">
<div class="main flex tabsSidebarSpace">
<h1>content</h1>
<p>
Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.
</p>
<p>
Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.
</p>
<p>
Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
</p>
<p>
Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
</p>
<p>
Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
</p>
<p>
Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
</p>
</div>
<div class="tabsSidebar vertical"></div>
</div>
<div class="tabsSidebar vertical"></div>

2
app/assets/javascripts/app/views/ticket_zoom.jst.eco
View file

@ -1,4 +1,4 @@
<div class="flex vertical">
<div class="tabsSidebar-holder flex vertical">
<div class="flex u-positionOrigin horizontal">
<div class="main no-padding flex tabsSidebarSpace">
<div class="ticketZoom">

2
app/assets/javascripts/app/views/user_zoom.jst.eco
View file

@ -1,4 +1,4 @@
<div class="flex vertical">
<div class="tabsSidebar-holder flex vertical">
<div class="flex u-positionOrigin horizontal">
<div class="main flex tabsSidebarSpace">
<div class="userZoom">

6
app/assets/stylesheets/zzz.css.erb
View file

@ -2375,6 +2375,7 @@ footer {
}
.ticket-title h1 {
max-width: 350px;
margin-top: 15px;
margin-bottom: 8px;
text-align: center;
@ -2839,6 +2840,11 @@ footer {
margin-right: 0;
}
.tabsSidebar-holder {
overflow: hidden;
position: relative;
}
.tabsSidebar .sidebar {
width: 280px;
border-left: 1px solid #e6e6e6;