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

* removed icno in some buttons.

Browse Source 
* ajusted margin value of buttons on featurebar.
This commit is contained in:
Catouse
2014-04-23 15:48:05 +08:00
parent 5221918158
commit c70e1bcb4e
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/product/view/index.html.php
View File

@@ -75,7 +75,7 @@
<td colspan='11'>
<div class='table-actions clearfix'>
<?php echo "<div class='btn-group'>" . html::selectAll() . html::selectReverse() . '</div>';?>
<?php echo html::submitButton("<i class='icon-pencil'></i> " . $lang->product->batchEdit, '', '');?>
<?php echo html::submitButton($lang->product->batchEdit, '', '');?>
</div>
</td>
</tr>

4
module/project/view/story.html.php
View File

@@ -112,12 +112,12 @@
if($canBatchEdit)
{
$actionLink = $this->createLink('story', 'batchEdit', "productID=0&projectID=$project->id");
echo html::commonButton("<i class='icon-pencil'></i> " . $lang->edit, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton($lang->edit, "onclick=\"setFormAction('$actionLink')\"");
}
if($canBatchClose)
{
$actionLink = $this->createLink('story', 'batchClose', "productID=0&projectID=$project->id");
echo html::commonButton("<i class='icon-off'></i> " . $lang->close, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton($lang->close, "onclick=\"setFormAction('$actionLink')\"");
}
echo '</div>';
}

2
module/project/view/task.html.php
View File

@@ -152,7 +152,7 @@ var browseType = '<?php echo $browseType;?>';
$misc = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
echo "<div class='btn-group dropup'>";
echo html::commonButton("<i class='icon-pencil'></i> " . $lang->edit, $misc);
echo html::commonButton($lang->edit, $misc);
echo "<button id='moreAction' type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu' id='moreActionMenu'>";
$actionLink = $this->createLink('task', 'batchClose');

8
www/theme/default/style.css
View File

@@ -350,7 +350,6 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#qrcodePopover.show {display: block; position: fixed; right: 5px; bottom: 40px; left: inherit; top: inherit;}
#qrcodePopover.popover.top .arrow {left: inherit; right: 10px}
/* Feature bar. */
#featurebar {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 .heading {float: left; padding: 0 5px; color: #666}
@@ -365,9 +364,10 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#featurebar .nav > li > a {padding: 0px 4px; border-radius: 2px}
#featurebar .nav > li > a:hover {background: #ddd; color: #333}
#featurebar .nav > li.active > a, #featurebar .nav > li.active > a:hover, #featurebar .nav > li.active > a:active, #featurebar .nav > li.active > a:focus {font-weight: bold; color: #333}
#featurebar .nav > li.active > a > .caret {border-top-color: #666}
#featurebar .nav > li.active > .form-control, #featurebar .nav > li.active > .form-control:hover, #featurebar .nav > li.active > .form-control:active, #featurebar .nav > li.active > .form-control:focus {border-color: #009900}
#featurebar .btn-group {margin-right: 5px;}
#featurebar .btn-group > .btn-group {margin-right: 0;}
#featurebar .btn-group {margin-right: -4px;}
#featurebar .actions > .btn-group:last-child, #featurebar .btn-group > .btn-group {margin-right: 0;}
#featurebar .btn {padding: 4px 12px}
#featurebar .btn > i {display: inline-block; margin-right: 2px; opacity: 0.8}
#featurebar .actions {float: right; margin-top: -2px;}
@@ -396,7 +396,7 @@ body {font-size: 13px; color:#141414;padding-bottom: 40px;}
#titlebar .actions > .text {display: inline-block; margin-left: 8px; line-height: 30px}
/* Button in titlebar and featurebar */
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), #featurebar > .pull-right .btn:not(.btn-primary), #titlebar > .pull-right .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 8px; border-radius: 2px; text-shadow: none; color: #036}
#featurebar > .actions .btn:not(.btn-primary), #titlebar > .actions .btn:not(.btn-primary), #featurebar > .pull-right .btn:not(.btn-primary), #titlebar > .pull-right .btn:not(.btn-primary) {border-color: transparent; background: none; box-shadow: none; padding: 4px 7px; border-radius: 2px; text-shadow: none; color: #036}
#featurebar > .actions .btn:not(.btn-primary):hover, #titlebar > .actions .btn:not(.btn-primary):hover ,#featurebar > .pull-right .btn:not(.btn-primary):hover, #titlebar > .pull-right .btn:not(.btn-primary):hover{background: #ddd; border-color: #ddd; color: #333}
/* Following style to fixed ie8 */