Merge branch 'master' of github.com:easysoft/zentaopms

module/bug/css/customfields.css

@@ -1,2 +1,4 @@
 body{background:white; overflow:hidden;}
-.button-c {width:100px}
+.btn-group .btn{display: block;width: 80px;text-align: center;margin-top: -1px;}
+.btn-group .btn:hover{z-index: 9999;}
+.btn-group .btn i{line-height: 21px;}

module/bug/view/confirmbug.html.php

@@ -34,7 +34,7 @@ js::set('page', 'confirmbug');
     </tr>
     <tr>
       <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p94'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='a-center'><?php echo html::submitButton() . html::linkButton($lang->goback, $this->server->http_referer);?></td>

module/bug/view/customfields.html.php

@@ -28,19 +28,15 @@
         echo html::select('defaultFields[]', $defaultFields, '', 'class=hidden');
         ?>
       </td>
-      <td>
-        <?php
-        echo html::commonButton('>', "onclick=\"addItem('allFields', 'customFields')\"") . '<br />';
-        echo html::commonButton('<', "onclick=delItem('customFields')")  . '<br />';
-        ?>
+      <td class='v-middle btn-group'>
+        <a class='btn' onclick="addItem('allFields', 'customFields')"><i class="icon-chevron-right"></i></a>
+        <a class='btn' onclick="delItem('customFields')"><i class="icon-chevron-left"></i></a>
       </td>
       <td><?php echo html::select('customFields[]', $customFields, '', 'class=select-2 size=10 multiple');?></td>
-      <td>
-        <?php
-        echo html::commonButton('+', "onclick=upItem('customFields')")  . '<br />';
-        echo html::commonButton('-', "onclick=downItem('customFields')")  . '<br />';
-        echo html::commonButton($lang->bug->restoreDefault, "onclick=restoreDefault()")  . '<br />';
-        ?>
+      <td class='v-middle btn-group'>
+        <a class='btn' onclick="upItem('customFields')"><i class="icon-plus"></i></a>
+        <a class='btn' onclick="downItem('customFields')"><i class="icon-minus"></i></a>
+        <a class='btn' onclick='restoreDefault()'><?php echo $lang->bug->restoreDefault;?></a>
       </td>
     </tr>  
     <tr><td colspan='4' class='a-center'><?php echo html::submitButton('', 'onclick=selectItem("customFields")');?></td></tr>

module/story/css/create.css

@@ -1,3 +1,2 @@
-#plan {width:245px}
-#mailto {width:85%}
+#mailto {width:90.3%}
 select {border:1px solid #ccc}

www/theme/default/style.css

@@ -192,6 +192,7 @@ select{padding: 4px 1px;}
 .c-right {clear:right;}
 .c-both {clear:both;}
 .a-center {text-align: center;}
+.v-middle{vertical-align: middle;}
 .a-right {text-align: right;}
 .a-left {text-align: left;}
 
@@ -244,7 +245,7 @@ select.text-3 {width: 250px}
 select.select-1 {width: 90%}
 .select-2 {width: 125px}
 .select-3 {width: 245px}
-select.select-3{width: 255px;}
+select.select-3{width: 250px;}
 .select-4 {width: 360px}
 .select-5 {width: 480px}
 td>select{padding-left: 0;padding-right: 0}
@@ -366,6 +367,8 @@ table.data-table td:last-child{padding-right: 20px;}
 .w-p80 {width: 80%}
 .w-p85 {width: 85%}
 .w-p90 {width: 90%}
+.w-p94 {width: 94%}
+.w-p95 {width: 95%}
 .w-p100{width: 100%}
 .w-p98 {width: 98%}
 .w-p99 {width: 99%}
@@ -441,7 +444,7 @@ table.data-table td:last-child{padding-right: 20px;}
 
 /* Top bar. */
 #topbar, #topbar a {color:#ACCADF}
-#topbar {margin:5px 5px 15px 5px}
+#topbar {margin:5px 5px 6px 5px}
 #topbar select {border:none; color:#ACCADF; background:#003366}
 #topbar a {color:#d1e4f2;text-decoration:none;}
 #topbar a:hover {color: #fff;}