Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fixed style for firefox, oprea 12 and ie 8.

Browse Source
This commit is contained in:
Catouse
2014-04-26 22:06:18 +08:00
parent d2decf65fc
commit c10aa876e4
11 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/front/front.class.php
+1 -1
View File
@@ -504,7 +504,7 @@ EOT;
{
global $lang;
if(isonlybody()) return false;
return "<input type='button' onClick='javascript:history.go(-1);' value='{$lang->goback}' class='btn btn-back' $misc/>";
return "<a href='javascript:history.go(-1);' class='btn btn-back' $misc >{$lang->goback}</a>";
}
/**
module/common/view/action.html.php
+2 -2
View File
@@ -152,8 +152,8 @@ $(function(){
<?php if($canEditComment):?>
<div class='hide' id='lastCommentBox'>
<form method='post' action='<?php echo $this->createLink('action', 'editComment', "actionID=$action->id")?>'>
<table align='center' class='table table-form'>
<tr><td><?php echo html::textarea('lastComment', htmlspecialchars($action->comment),"rows='5' class='form-control'");?></td></tr>
<table align='center' class='table table-form bd-0'>
<tr><td style='padding-right: 0'><?php echo html::textarea('lastComment', htmlspecialchars($action->comment),"rows='5' class='form-control'");?></td></tr>
<tr><td><?php echo html::submitButton() . html::a("javascript:toggleComment($action->id)", $lang->goback, '', "class='btn'");?></td></tr>
</table>
</form>
module/common/view/footer.lite.html.php
-1
View File
@@ -1,7 +1,6 @@
<?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
<?php include 'debug.html.php';?>
<script laguage='Javascript'>
$().ready(function(){setDebugWin('white')})
<?php if(isset($pageJS)) echo $pageJS;?>
</script>
</body>
module/company/css/browse.css
+2 -1
View File
@@ -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}
module/doc/view/create.html.php
+2 -2
View File
@@ -49,11 +49,11 @@
<th><?php echo $lang->doc->title;?></th>
<td colspan='2'><?php echo html::input('title', '', "class='form-control'");?></td>
</tr>
<tr id='urlBox' class='hidden'>
<tr id='urlBox' class='hide'>
<th><?php echo $lang->doc->url;?></th>
<td colspan='2'><?php echo html::input('url', '', "class='form-control'");?></td>
</tr>
<tr id='contentBox' class='hidden'>
<tr id='contentBox' class='hide'>
<th><?php echo $lang->doc->content;?></th>
<td colspan='2'><?php echo html::textarea('content', '', "class='form-control' style='width:90%; height:200px'");?></td>
</tr>
module/file/view/buildform.html.php
+1 -1
View File
@@ -3,7 +3,7 @@
/* Define the html code of a file row. */
$fileRow = <<<EOT
<div class='fileBox input-group' id='fileBox\$i'>
<span class='input-control w-p45'><input type='file' name='files[]' class='fileControl' tabindex='-1' /></span>
<span class='input-control w-p45 pd-0'><input type='file' name='files[]' class='fileControl' tabindex='-1' /></span>
<span class="input-group-addon">{$lang->file->label}</span>
<input type='text' name='labels[]' class='form-control' placeholder='{$lang->file->label}' tabindex='-1' />
<span class='input-group-btn'>
module/project/css/manageproducts.css
+2 -2
View File
@@ -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;}
module/project/view/manageproducts.html.php
-3
View File
@@ -24,7 +24,4 @@
</div>
</form>
</div>
<form method='post'>
</form>
<?php include '../../common/view/footer.html.php';?>
module/project/view/team.html.php
+1 -1
View File
@@ -22,7 +22,7 @@
<?php common::printLink('project', 'managemembers', "projectID=$project->id", $lang->project->manageMembers, '', "class='btn btn-primary'");?>
</div>
</div>
<table class='table tablesorter' id='memberList'>
<table class='table tablesorter bd-0' id='memberList'>
<thead>
<tr>
<th><?php echo $lang->team->account;?></th>
module/testtask/view/cases.html.php
+2 -2
View File
@@ -126,10 +126,10 @@ var moduleID = '<?php echo $moduleID;?>';
if($canBatchAssign)
{
$actionLink = inLink('batchAssign', "taskID=$task->id");
echo "<div class='input-group'>";
echo "<div class='input-group w-200px'>";
echo html::select('assignedTo', $users, '', 'class="form-control"');
echo "<span class='input-group-btn'>";
echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton($lang->testtask->assign, "onclick=\"setFormAction('$actionLink')\" style='border-left:none'");
echo '</span></div>';
}
if($canBatchRun)
www/theme/default/style.css
+6 -5
View File
@@ -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;}