From c10aa876e448e07a016f126bfd4bdd8eb8c1ed4a Mon Sep 17 00:00:00 2001 From: Catouse Date: Sat, 26 Apr 2014 22:06:18 +0800 Subject: [PATCH] * fixed style for firefox, oprea 12 and ie 8. --- lib/front/front.class.php | 2 +- module/common/view/action.html.php | 4 ++-- module/common/view/footer.lite.html.php | 1 - module/company/css/browse.css | 3 ++- module/doc/view/create.html.php | 4 ++-- module/file/view/buildform.html.php | 2 +- module/project/css/manageproducts.css | 4 ++-- module/project/view/manageproducts.html.php | 3 --- module/project/view/team.html.php | 2 +- module/testtask/view/cases.html.php | 4 ++-- www/theme/default/style.css | 11 ++++++----- 11 files changed, 19 insertions(+), 21 deletions(-) diff --git a/lib/front/front.class.php b/lib/front/front.class.php index 5a2c329c8d..6c02b9274d 100644 --- a/lib/front/front.class.php +++ b/lib/front/front.class.php @@ -504,7 +504,7 @@ EOT; { global $lang; if(isonlybody()) return false; - return ""; + return "{$lang->goback}"; } /** diff --git a/module/common/view/action.html.php b/module/common/view/action.html.php index 8cb562bf0e..6ef32a13b2 100755 --- a/module/common/view/action.html.php +++ b/module/common/view/action.html.php @@ -152,8 +152,8 @@ $(function(){
id")?>'> - - +
comment),"rows='5' class='form-control'");?>
+
comment),"rows='5' class='form-control'");?>
id)", $lang->goback, '', "class='btn'");?>
diff --git a/module/common/view/footer.lite.html.php b/module/common/view/footer.lite.html.php index 7384989f16..57dafda87f 100755 --- a/module/common/view/footer.lite.html.php +++ b/module/common/view/footer.lite.html.php @@ -1,7 +1,6 @@ getExtViewFile(__FILE__)){include $extView; return helper::cd();}?> diff --git a/module/company/css/browse.css b/module/company/css/browse.css index fbcd3f0b94..9169114f17 100644 --- a/module/company/css/browse.css +++ b/module/company/css/browse.css @@ -1,3 +1,4 @@ -#titlebar #querybox {margin-top: -14px;} +#titlebar {height: 67px\0} +#titlebar #querybox {margin-top: -14px; position: relative\0; top: -18px\0;} #titlebar > .heading {display: none} form {position:relative} diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php index e09af5b458..cad4e1c923 100644 --- a/module/doc/view/create.html.php +++ b/module/doc/view/create.html.php @@ -49,11 +49,11 @@ doc->title;?> - + doc->url;?> - + doc->content;?> diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php index 101317e732..c4ba8dce58 100644 --- a/module/file/view/buildform.html.php +++ b/module/file/view/buildform.html.php @@ -3,7 +3,7 @@ /* Define the html code of a file row. */ $fileRow = << - + {$lang->file->label} diff --git a/module/project/css/manageproducts.css b/module/project/css/manageproducts.css index 25fbf9eee8..dd728adb6b 100644 --- a/module/project/css/manageproducts.css +++ b/module/project/css/manageproducts.css @@ -1,5 +1,5 @@ -#productsBox {border-bottom: 1px solid #ddd; padding: 20px; margin-bottom: 20px;} -#productsBox > label {padding: 8px 15px; border:1px solid #ddd; min-width: 33.333333333%} +#productsBox {padding: 20px;} +#productsBox > label {padding: 8px 15px; border:1px solid #ddd; min-width: 31%} #productsBox > label > input {margin-left: 0; margin-right: 5px;} #productsBox > label:hover {background: #f1f1f1} #productsBox > label.checked, #productsBox > label.checked:hover {background: #E5FFE6; border: 1px solid #229F24;} diff --git a/module/project/view/manageproducts.html.php b/module/project/view/manageproducts.html.php index f971cffd2c..d8a8dca4f0 100644 --- a/module/project/view/manageproducts.html.php +++ b/module/project/view/manageproducts.html.php @@ -24,7 +24,4 @@
-
- -
diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 9ecfa4858c..f990e06ad7 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -22,7 +22,7 @@ id", $lang->project->manageMembers, '', "class='btn btn-primary'");?> - +
diff --git a/module/testtask/view/cases.html.php b/module/testtask/view/cases.html.php index 481ecb89e2..03a20bfbad 100644 --- a/module/testtask/view/cases.html.php +++ b/module/testtask/view/cases.html.php @@ -126,10 +126,10 @@ var moduleID = ''; if($canBatchAssign) { $actionLink = inLink('batchAssign', "taskID=$task->id"); - echo "
"; + echo "
"; echo html::select('assignedTo', $users, '', 'class="form-control"'); echo ""; - echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\""); + echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\" style='border-left:none'"); echo '
'; } if($canBatchRun) diff --git a/www/theme/default/style.css b/www/theme/default/style.css index f987a418ca..660d30d420 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -275,6 +275,7 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin .fileBox .form-control[type='text'] + .input-group-btn > .btn {border-left: 0} .fileBox .form-control[type='text'] {height: 30px;} .fileBox .input-control {display: table-cell; border: 1px solid #ccc; padding: 0 10px; border-radius: 2px 0 0 2px} +.fileBox .input-control > input[type='file'] {width: 100%; height: 100%; height: 26px; padding: 0 5px; line-height: 26px; border: none; position: relative; top: 0;} /* Bug status */ .bug-closed, .bug-closed a {color: #808080; text-decoration: line-through;} @@ -361,7 +362,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #qrcodePopover.popover.top .arrow {left: inherit; right: 10px} /* Feature bar. */ -#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; min-height: 30px; box-sizing:content-box;} +#featurebar {margin: -20px -20px 20px; padding: 8px 10px 7px; font-size: 14px; background: #F8FAFE; border-bottom: 1px solid #ddd; line-height: 30px; overflow:auto;_height:1%} #featurebar .heading {float: left; padding: 0 5px; color: #666} #featurebar .heading:after {content: "\e6e1"; font-family: ZenIcon; font-size: 14px; color: #999; display: inline-block; margin-left: 5px;} #featurebar .heading > i {color: #808080} @@ -414,10 +415,10 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;} #featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover, .main > .actions:not(.actions-form) .btn:not(.btn-primary):hover {background: #ddd; border-color: #ddd; color: #333} /* Following style to fixed ie8 */ -#featurebar > .actions .btn, #titlebar > .actions .btn {border-color: transparent\0; background: none\0; box-shadow: none\0; padding: 4px 8px\0;} -#featurebar > .actions .btn:hover, #titlebar > .actions .btn:hover {background: #ddd\0; border-color: #ddd\0;} -#featurebar > .actions .btn.btn-primary, #titlebar > .actions .btn.btn-primary{border-color: #103152\0; background: #1A4F85\0; padding: 4px 8px\0; color: #e5e5e5} -#featurebar > .actions .btn.btn-primary:hover, #titlebar > .actions .btn.btn-primary:hover {background: #133B63\0; border-color: #0C243C\0; color: #fff} +#featurebar > .actions .btn, #titlebar > .actions .btn, .main > .actions .btn {border-color: transparent\0; background: none\0; box-shadow: none\0; padding: 4px 8px\0;; color: #036\0} +#featurebar > .actions .btn:hover, #titlebar > .actions .btn:hover, .main > .actions .btn:hover {background: #ddd\0; border-color: #ddd\0; color: #333\0;} +#featurebar > .actions .btn.btn-primary, #titlebar > .actions .btn.btn-primary, .main > .actions .btn.btn-primary {border-color: #103152\0; background: #1A4F85\0; padding: 4px 8px\0; color: #e5e5e5} +#featurebar > .actions .btn.btn-primary:hover, #titlebar > .actions .btn.btn-primary:hover, .main > .actions .btn.btn-primary:hover {background: #133B63\0; border-color: #0C243C\0; color: #fff} /* table in outer */ .outer .table {margin-bottom: 0; border: 1px solid #ddd;}
team->account;?>