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

Merge branch 'zenops_46' into zenops_46_tanghucheng

Browse Source
This commit is contained in:
tanghucheng
2022-12-02 08:34:22 +08:00
parent 319f587f77 0e2f1d1bfc
commit ff66528a4e
9 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/repo/css/ajaxgeteditorcontent.css
+3 -3
View File
@@ -1,14 +1,14 @@
.m-repo-ajaxgeteditorcontent {overflow: hidden;}
#monacoEditor .tip-circular {background: #2e7fff; border-radius: 10px; padding: 0px 7px;}
#log {margin-top: 2px; display: none; padding: 5px; justify-content: space-between; height: 25px; line-height: 20px;}
#log {margin-top: 8px; display: none; padding: 5px; justify-content: space-between; height: 25px; line-height: 20px; background: #efefef;}
#log .history {margin-left: 5px;}
#log .action-btn .btn {border: none; background: none;}
#related {display: none; margin-top: 2px; background: #fff;}
#related {display: none; margin-top: 2px; background: #fff; height: 0px;}
#relationTabs .nav > li > a {padding: 8px 10px; display: flex; white-space: pre;}
#relationTabs .nav-tabs > li > a > span {margin-right: 5px;}
#relationTabs .tab-pane {display: none;}
#relationTabs .tabs-navbar {background: #F4F5F7;}
#relationTabs .tabs-navbar {background: #FFFFFF;}
#relationTabs .tab-pane.active {display: block;}
#relationTabs .tab-nav-item {max-width: none !important;}
#relationTabs .tab-nav-item .icon {line-height: inherit;}
module/repo/css/common.css
+10 -2
View File
@@ -230,8 +230,16 @@ h3 {font-size: 16px;}
#fileTree ul > li.tree-single-item:before {height: 23px;}
#fileTree ul > li.has-list:after {width: 14px;}
#filesTree .tree li.has-list.open:before {border: none;}
#fileTabs .nav-tabs > li.tab-nav-item > a {background: linear-gradient( 109deg, transparent 10%, #9b9494 10%) 0 0, linear-gradient(-109deg, transparent 10%, #9b9494 10%) 100% 0; background-size: 90% 100%; background-repeat: no-repeat;}
#fileTabs .nav-tabs > li.active > a {color: #2e7fff !important; background: linear-gradient( 109deg, transparent 10%, #ffffff 10%) 0 0, linear-gradient(-109deg, transparent 10%, #ffffff 10%) 100% 0; background-size: 90% 100%; background-repeat: no-repeat;}
#fileTabs .nav-tabs > li.tab-nav-item > a {z-index: 1; background: none;}
#fileTabs .nav-tabs > li > a::after {content: ''; position: absolute; top: 2px; left: 10px; width: 85%; right: 6px; bottom: 0; background: #f8f8f8; border: none; border-radius: 10px 10px 0 0; height: 70%; transform: perspective(4px)scale(1.1, 1.3) rotateX(5deg); z-index: -1;}
#fileTabs .nav-tabs > li.active > a::after {background: #FFFFFF;}
#fileTabs > .tabs-navbar {overflow: hidden; padding-bottom: 10px; position: relative; height: 35px; background: #efefef;}
#fileTabs > .tabs-navbar > .nav-tabs {position: absolute; display: flex; padding-left: 25px;}
.repoCode .content, .repoCode .btn {background-color: #efefef; border: none;}
.repoCode .btn.btn-right, .repoCode .btn.btn-left {margin-right: 0; padding: 6px 6px;}
#related .btn-right, #related .btn-left {padding-top: 9px;}
#log .action-btn {margin-top: -7px;}
#relationTabs .nav-tabs >li > a .tab-nav-close {display: none;}
#relationTabs .nav-tabs > li > a > i, #relationTabs .nav-tabs > li > a > span {background: #EDEEF2; font-weight: normal; padding: 1px 5px;}
#relationTabs .nav-tabs > li.active > a > i, #relationTabs .nav-tabs > li.active > a > span {background: #E6F0FF; color: #2e7fff;}
module/repo/css/diff.css
+5 -3
View File
@@ -25,13 +25,15 @@ table.diff {margin-bottom: 0px;}
.body-modal #mainMenu {padding-bottom: 40px;}
.repoCode td.code {white-space: inherit;}
.repoCode .content, .repoCode .btn {background-color: #F4F5F7; border: none;}
.repoCode .nav-tabs > li.active > a:before {background: none; height: 0;}
#fileTabs .tab-pane {display: none;}
#fileTabs .tab-pane.active {display: block;}
#fileTabs .tab-nav-item {max-width: none !important;}
#fileTabs > .tabs-navbar {overflow: hidden; padding-bottom: 10px; position: relative; height: 35px;}
#fileTabs > .tabs-navbar > .nav-tabs {position: absolute; display: flex;}
#filesTree #modules {margin-top: 5px;}
#filesTree {overflow-y: auto;}
.file-tree {padding: 0;}
#sidebar > .sidebar-toggle {left: auto; right: 3px;}
#sidebar > .sidebar-toggle > .icon {left : -1px;}
.hide-sidebar #sidebar {width: 0 !important;}
module/repo/css/monaco.css
-3
View File
@@ -11,8 +11,6 @@
#fileTabs .tab-pane {display: none;}
#fileTabs .tab-pane.active {display: block;}
#fileTabs .tab-nav-item {max-width: none !important;}
#fileTabs > .tabs-navbar {overflow: hidden; padding-bottom: 10px; position: relative; height: 35px;}
#fileTabs > .tabs-navbar > .nav-tabs {position: absolute; display: flex;}
.repoCode .content {margin-left: 5px;}
.repoCode .nav > li > a {display: flex; white-space: pre;}
#sourceSwapper {border: 1px solid #D8DBDE; border-radius: 2px; width: 100%;}
@@ -23,5 +21,4 @@
.version-name {max-width: 90%}
#filesTree #modules {margin-top: 5px;}
#filesTree {overflow-y: auto;}
.repoCode .content, .repoCode .btn {background-color: #F4F5F7; border: none;}
.repoCode .nav-tabs > li.active > a:before {background: none; height: 0;}
module/repo/js/common.js
+1 -1
View File
@@ -86,7 +86,7 @@ function arrowTabs(domID, shift, hideRightBtn)
var tabItemWidth = $('#' + domID + ' > .tabs-navbar > .nav-tabs')[0].clientWidth;
var tabsWidth = $('#' + domID)[0].clientWidth;
if($('#' + domID + ' .close').length) tabsWidth = tabsWidth * 0.6;
if($('#' + domID + ' .close-bugs').length) tabsWidth = tabsWidth * 0.7;
if(tabItemWidth < tabsWidth)
{
module/repo/js/diff.js
+1 -1
View File
@@ -117,7 +117,7 @@ $(document).ready(function()
var paneHeight = $(window).height() - 120;
if(isonlybody) paneHeight = 500;
$('#fileTabs .tab-pane').css('height', paneHeight + 'px')
$('#filesTree').css('height', paneHeight + 45)
$('#filesTree').css('height', paneHeight + 35)
}
setHeight();
module/repo/js/monaco.js
+1 -1
View File
@@ -48,7 +48,7 @@ $(function()
$tabs.open(createTab(name, path));
setHeight();
arrowTabs('fileTabs', -2);
arrowTabs('fileTabs', -1);
});
/* Remove file path for opened files. */
module/repo/view/ajaxgetrelationinfo.html.php
+12 -13
View File
@@ -17,51 +17,50 @@ js::set('objectID', $object->id);
<div class="content pane">
<div class="fade main-row split-row in col-md-12">
<div class="left-content col-md-8">
<table class="menu-title">
<table class="table table-borderless">
<?php if($objectType == 'story'):?>
<tr>
<td class="text">
<span class="detail-title"><?php echo $lang->story->title;?></span>
<strong class='text-primary'><?php echo $object->title;?></strong>
</td>
<td></td>
</tr>
<tr>
<td class="text">
<div class="spec-content detail-content article-content">
<span class="strong detail-title"><?php echo $lang->story->spec;?></span><?php echo $object->spec; ?>
<?php echo $object->spec; ?>
</div>
</td>
<td class="text right-content">
</tr>
<tr>
<td class="text">
<div class="detail-content article-content">
<span class="strong detail-title"><?php echo $lang->story->verify;?></span><?php echo $object->verify; ?>
<?php echo $object->verify; ?>
</div>
</td>
</tr>
<?php elseif($objectType == 'task'):?>
<tr>
<td class="text">
<span class="detail-title"><?php echo $lang->task->name;?></span>
<strong class='text-primary'><?php echo $object->name;?></strong>
</td>
<td></td>
</tr>
<tr>
<td class="text">
<div class="spec-content detail-content article-content">
<div class="strong detail-title"><?php echo $lang->task->desc;?></div><?php echo $object->desc; ?>
<?php echo $object->desc; ?>
</div>
</td>
<td class="text right-content">
</tr>
<tr>
<td class="text">
<div class="detail-content article-content">
<div class="strong detail-title"><?php echo $lang->task->story;?></div><?php echo $object->storyTitle; ?>
<?php echo $object->storyTitle; ?>
</div>
</td>
</tr>
<?php elseif($objectType == 'bug'):?>
<tr>
<td class="text">
<span class="detail-title"><?php echo $lang->bug->title;?></span>
<strong class='text-primary' data-id='<?php echo $object->id;?>'><?php echo $object->title;?></strong>
</td>
</tr>
@@ -69,7 +68,7 @@ js::set('objectID', $object->id);
<tr>
<td class="text">
<div class="spec-content detail-content article-content">
<span class="strong detail-title"><?php echo $lang->bug->steps;?></span><?php echo $object->steps; ?>
<?php echo $object->steps; ?>
</div>
</td>
</tr>
module/repo/view/diffeditor.html.php
+5 -4
View File
@@ -13,16 +13,17 @@ js::set('openedFiles', array($entry));
js::set('urlParams', "repoID=$repoID&objectID=$objectID&entry=%s&oldRevision=$oldRevision&newRevision=$newRevision&showBug=$showBug&encoding=$encoding");
?>
<?php if(!isonlybody()):?>
<div id="mainContent" class="main-row fade">
<div id="mainContent" class="main-row fade diff-page">
<?php $sideWidth = common::checkNotCN() ? '270' : '240';?>
<div class="side-col" style="width: <?php echo $sideWidth;?>px; padding-top: <?php echo isonlybody() ? 22 : 0;?>px;">
<div class="side-col file-tree" style="width: <?php echo $sideWidth;?>px;" data-min-width="<?php echo $sideWidth;?>">
<div class="side-col" id='sidebar' style="width: <?php echo $sideWidth + 15;?>px; padding-top: <?php echo isonlybody() ? 22 : 0;?>px;">
<div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
<div class="cell file-tree" style="width: <?php echo $sideWidth;?>px;" data-min-width="<?php echo $sideWidth;?>">
<div id="filesTree" class="cell load-indicator <?php if(isonlybody()) echo 'pull-left';?>">
<?php echo $this->repo->getFileTree($repo, '', $diffs);?>
</div>
</div>
</div>
<?php endif;?>
<?php endif;?>
<div class="main-col repoCode main">
<div class="content panel">
<div class='btn-toolbar'>