Browse Source

Moved to bs3.

Martin Edenhofer 11 years ago
parent
commit
a7d9e69e93

+ 1 - 1
app/assets/javascripts/app/controllers/task_widget.js.coffee

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

+ 14 - 13
app/assets/javascripts/app/views/customer_ticket_create.jst.eco

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

+ 20 - 2
app/assets/stylesheets/zzz.css

@@ -86,6 +86,24 @@ table th, table td {
   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 {
   top: 80px;
   bottom: 0;
@@ -301,7 +319,7 @@ table th, table td {
 }
 
 #task .taskbar .btn-small {
-  padding: 5px 10px 7px;
+  padding: 3px 8px 4px;
   margin-top: 2px;
   font-size: 11px;
   font-weight: 300;
@@ -876,4 +894,4 @@ footer {
   font-family: 'Glyphicons Halflings';
   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');
-}
+}