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

Moved to bs3.

Browse source
This commit is contained in:
Martin Edenhofer 2013-09-17 10:48:49 +02:00
parent 87fcd4ef48
commit a7d9e69e93
3 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/task_widget.js.coffee
View file

@ -217,7 +217,7 @@ class Taskbar extends App.Controller
resizeTasks: -> resizeTasks: ->
width = $('#task .taskbar-items').width()# - $('#task .taskbar-new').width() - 200 width = $('#task .taskbar-items').width()# - $('#task .taskbar-new').width() - 200
task_count = App.TaskManager.all().length task_count = App.TaskManager.all().length
task_size = ( width / task_count ) - 44 task_size = ( width / task_count ) - 40
elementsOversize = 0 elementsOversize = 0
elementsOversizeLeftTotal = 0 elementsOversizeLeftTotal = 0
$('#task .task').each( $('#task .task').each(

27
app/assets/javascripts/app/views/customer_ticket_create.jst.eco
View file

@ -1,17 +1,18 @@
<div class="page-header"> <div class="content-one">
<div class="row"> <div class="page-header clearfix">
<div class="span12"> <div class="page-header-title">
<h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1> <h1 class="pull-left"><%- @T( 'New Ticket' ) %></h1>
</div> </div>
</div> </div>
</div> <div class="page-content">
<form class="form-horizontal ticket-create"> <form class="form-horizontal form-large">
<input type="hidden" value="" name="article_type"/> <input type="hidden" value="" name="article_type"/>
<div class="row"> <div id="form_create"></div>
<div class="span9" id="form_create"></div> <div class="form-actions">
<div class="span3"></div> <button type="reset" class="btn btn-default cancel"><%- @T( 'Cancel' ) %></button>
&nbsp;
<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>
</div> </div>
<div class="form-actions"> </div>
<button type="reset" class="btn cancel"><%- @T( 'Cancel' ) %></button>&nbsp;<button type="submit" class="btn btn-primary submit"><%- @T( 'Create' ) %></button>
</div>
</form>

22
app/assets/stylesheets/zzz.css
View file

@ -86,6 +86,24 @@ table th, table td {
float: right; float: right;
} }
.content-one {
top: 80px;
margin-left: 20px;
margin-right: 20px;
/*
bottom: 0;
left: 0;
right: 0;
position: fixed;
*/
z-index: -5000;
}
@media (min-width: 1024px) {
.content-one {
width: 1024px;
}
}
.content-two { .content-two {
top: 80px; top: 80px;
bottom: 0; bottom: 0;
@ -301,7 +319,7 @@ table th, table td {
} }
#task .taskbar .btn-small { #task .taskbar .btn-small {
padding: 5px 10px 7px; padding: 3px 8px 4px;
margin-top: 2px; margin-top: 2px;
font-size: 11px; font-size: 11px;
font-weight: 300; font-weight: 300;
@ -876,4 +894,4 @@ footer {
font-family: 'Glyphicons Halflings'; font-family: 'Glyphicons Halflings';
src: url('fonts/glyphicons-halflings-regular.eot'); src: url('fonts/glyphicons-halflings-regular.eot');
src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg'); src: url('fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('fonts/glyphicons-halflings-regular.woff') format('woff'), url('fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
} }