From 9c3497e1d98f4e194d924117e1400f3d6e75aa60 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 28 Oct 2014 10:41:30 +0800 Subject: [PATCH] * ajusted style of chosen with input group in table foot. --- module/project/view/task.html.php | 8 ++++---- www/theme/default/style.css | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php index 95859c3d49..7f254eb365 100644 --- a/module/project/view/task.html.php +++ b/module/project/view/task.html.php @@ -39,7 +39,7 @@
- +
id&status=$status&parma=$param&orderBy=%s&recTotal=$recTotal&recPerPage=$recPerPage"; ?> @@ -72,7 +72,7 @@ assignedTo == $app->user->account ? 'style=color:red' : ''; ?> @@ -164,8 +164,8 @@ $actionLink = $this->createLink('task', 'batchAssignTo', "projectID=$projectID"); echo "
"; echo html::select('assignedTo', $memberPairs, '', 'class="form-control chosen"'); - echo ""; - echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->task->assign); + echo ""; + echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->task->assign, '', "class='btn'"); echo '
'; } } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index d6ee838483..06e8bdfe83 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -82,9 +82,6 @@ hr.small {margin: 10px 0} /* Table */ .table td .input[type="radio"], .table td input[type="checkbox"] {margin-top: 1px; position: relative; top: 2px} -.table-fixed {table-layout: fixed;} -.table-fixed th, .table-fixed td {overflow:hidden; white-space:nowrap;} -.table-fixed tfoot > tr > th, .table-fixed tfoot > tr > td, .table-fixed .nofixed{overflow: visible;} .table-borderless {border: none!important} /* Tables sorters */ @@ -104,6 +101,11 @@ hr.small {margin: 10px 0} .table caption {padding: 8px 20px; border: 1px solid #DDD; border-bottom: 0; background: #fafafa;} .table.table-condensed caption {padding: 6px 15px;} +/* Datatable */ +.table-datatable tbody > tr td, +.table-datatable thead > tr th {max-height: 34px; line-height: 21px;} +.table-datatable tbody > tr td .btn-icon > i {line-height: 19px;} + /* Datepicker */ .datepicker-wrapper {position: relative; cursor: pointer;} .datepicker-wrapper:before {font-family: ZenIcon; content: '\e617'; display: block; position: absolute; right: 8px; color: #808080; font-size: 14px; top: 5px;} @@ -502,6 +504,8 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} .outer .table tfoot .datepicker-wrapper:before {top: 5px} .outer .table tfoot .form-control.form-date {width: 110px} .outer .table tfoot .input-wrapper {display: inline-block;} +.outer .table tfoot .chosen-single {padding: 4px 6px; height: 30px; } +.outer .table tfoot .chosen-container-single .chosen-single abbr {top: 4px;} .table-actions {float: left;} .table-actions > .btn-group, .table-actions > .btn, .table-actions > .input-group, .table-actions > .text {float: left; margin-right: 10px;} .table-actions > .text {line-height: 30px; color: #808080}
- + id", sprintf('%03d', $task->id))) printf('%03d', $task->id);?> task->priList, $task->pri, $task->pri)?>'>task->priList, $task->pri, $task->pri);?>