From 8d26480b51eea0a37777d00dbc6671587ea39b25 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Mon, 28 Aug 2023 08:33:43 +0800
Subject: [PATCH] * Adjust tabbar style of devops module.

---
 module/account/css/common.ui.css    | 3 ++-
 module/host/css/common.ui.css       | 3 ++-
 module/instance/ui/view.html.php    | 2 +-
 module/mr/css/diff.ui.css           | 2 +-
 module/mr/lang/zh-cn.php            | 2 +-
 module/ops/css/common.ui.css        | 4 +++-
 module/repo/control.php             | 2 +-
 module/repo/css/common.ui.css       | 2 +-
 module/serverroom/css/common.ui.css | 3 ++-
 module/system/css/common.ui.css     | 3 ++-
 10 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/module/account/css/common.ui.css b/module/account/css/common.ui.css
index abb7ff0a03..2952ffd473 100644
--- a/module/account/css/common.ui.css
+++ b/module/account/css/common.ui.css
@@ -1,6 +1,7 @@
 #accountCreateForm .form-row {max-width: 500px;}
 
-#mainNavbar .nav {justify-content: left;}
+#mainNavbar>.container {padding-top: 8px}
+#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
 #mainNavbar {background: none;}
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
diff --git a/module/host/css/common.ui.css b/module/host/css/common.ui.css
index a574a11a59..8229f548ad 100644
--- a/module/host/css/common.ui.css
+++ b/module/host/css/common.ui.css
@@ -1,7 +1,8 @@
 #status {flex-direction: row;}
 #hostCreateForm .form-row:last-child {width: 66%;}
 
-#mainNavbar .nav {justify-content: left;}
+#mainNavbar>.container {padding-top: 8px}
+#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
 #mainNavbar {background: none;}
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
diff --git a/module/instance/ui/view.html.php b/module/instance/ui/view.html.php
index 35cb631f0e..8f8223258f 100644
--- a/module/instance/ui/view.html.php
+++ b/module/instance/ui/view.html.php
@@ -55,7 +55,7 @@ detailHeader(
 );
 div
 (
-    setClass('flex flex-normal gap-x-5'),
+    setClass('flex flex-normal gap-x-5 justify-center'),
     div
     (
         setClass('basis-2/3'),
diff --git a/module/mr/css/diff.ui.css b/module/mr/css/diff.ui.css
index 67eb378a4c..6a22df286a 100644
--- a/module/mr/css/diff.ui.css
+++ b/module/mr/css/diff.ui.css
@@ -36,7 +36,7 @@
 #monacoTabs .tab-nav-item .icon {line-height: inherit;}
 #monacoTabs {overflow: hidden; padding-bottom: 10px; position: relative; height: 100%;}
 #monacoTabs > .nav-tabs {position: absolute; display: flex; padding-right: 20px;}
-#fileTabs .arrow-left, #fileTabs .arrow-right {line-height: 26px; padding: 6px; width: 26px; background: #efefef; cursor: pointer;}
+#fileTabs .arrow-left, #fileTabs .arrow-right {line-height: 27px; padding: 6px; width: 26px; background: #efefef; cursor: pointer;}
 #fileTabs .arrow-right {right: 40px; cursor: pointer;}
 #monacoTabs ul {min-width: 100%; padding-left: 25px; z-index: 1;}
 #monacoTabs .tab-content {margin-top: 40px;}
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 31cde8ee47..7c1a98fa83 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -4,7 +4,7 @@ $lang->mr->common       = "合并请求";
 $lang->mr->server       = "服务器";
 $lang->mr->view         = "概况";
 $lang->mr->viewAction   = "{$lang->mr->common}详情";
-$lang->mr->create       = "提{$lang->mr->common}";
+$lang->mr->create       = "创建{$lang->mr->common}";
 $lang->mr->apiCreate    = "接口：创建{$lang->mr->common}";
 $lang->mr->browse       = "浏览{$lang->mr->common}";
 $lang->mr->browseAction = "{$lang->mr->common}列表";
diff --git a/module/ops/css/common.ui.css b/module/ops/css/common.ui.css
index a30ab24370..28950255c2 100644
--- a/module/ops/css/common.ui.css
+++ b/module/ops/css/common.ui.css
@@ -7,8 +7,10 @@
 .osOpsList>a.active:hover, .osOpsList>a:hover {color: #fff; background-color: #2e7fff;}
 .ops-ml-0 {margin-left: 0!important;}
 
-#mainNavbar .nav {justify-content: left;}
+#mainNavbar>.container {padding-top: 8px}
+#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
 #mainNavbar {background: none;}
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
 #mainNavbar .nav-item>a.active:after {position: absolute; content: ''; border-bottom: 2px solid #2e7fff; inset: 0 6px 0 15px;}
+.panel-form{max-width: inherit;}
\ No newline at end of file
diff --git a/module/repo/control.php b/module/repo/control.php
index 453ed7115b..b69e1ab975 100644
--- a/module/repo/control.php
+++ b/module/repo/control.php
@@ -532,7 +532,7 @@ class repo extends control
      * @access public
      * @return void
      */
-    public function browse($repoID = 0, $branchID = '', $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0, $branchOrTag = 'branch',  $type = 'dir', $recTotal = 0, $recPerPage = 10, $pageID = 1)
+    public function browse($repoID = 0, $branchID = '', $objectID = 0, $path = '', $revision = 'HEAD', $refresh = 0, $branchOrTag = 'branch',  $type = 'dir', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         $repoID                 = $this->repo->saveState($repoID, $objectID);
         $originBranchID         = $branchID;
diff --git a/module/repo/css/common.ui.css b/module/repo/css/common.ui.css
index e213e5d74b..35926f4b75 100644
--- a/module/repo/css/common.ui.css
+++ b/module/repo/css/common.ui.css
@@ -35,7 +35,7 @@
 #monacoTabs .tab-nav-item .icon {line-height: inherit;}
 #monacoTabs {overflow: hidden; position: relative; height: 100%;}
 #monacoTabs > .nav-tabs {position: absolute; display: flex; padding-right: 20px;}
-#fileTabs .arrow-left, #fileTabs .arrow-right {line-height: 26px; padding: 6px; width: 26px; background: #efefef; cursor: pointer;}
+#fileTabs .arrow-left, #fileTabs .arrow-right {line-height: 27px; padding: 6px; width: 26px; background: #efefef; cursor: pointer;}
 #fileTabs .arrow-right {right: 40px; cursor: pointer;}
 #monacoTabs ul {min-width: 100%; padding-left: 25px; z-index: 1;}
 #monacoTabs .tab-content {margin-top: 40px;}
diff --git a/module/serverroom/css/common.ui.css b/module/serverroom/css/common.ui.css
index fb716c248c..4b34c14053 100644
--- a/module/serverroom/css/common.ui.css
+++ b/module/serverroom/css/common.ui.css
@@ -1,6 +1,7 @@
 #serverroomCreateForm .form-row {width: 600px;}
 
-#mainNavbar .nav {justify-content: left;}
+#mainNavbar>.container {padding-top: 8px}
+#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
 #mainNavbar {background: none;}
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}
diff --git a/module/system/css/common.ui.css b/module/system/css/common.ui.css
index 15f508484c..b7a915dd27 100644
--- a/module/system/css/common.ui.css
+++ b/module/system/css/common.ui.css
@@ -1,4 +1,5 @@
-#mainNavbar .nav {justify-content: left;}
+#mainNavbar>.container {padding-top: 8px}
+#mainNavbar .nav {justify-content: left; position: relative; left: -12px; top: -4px;}
 #mainNavbar {background: none;}
 #mainNavbar .nav-item>a {padding-right: 0.5rem}
 #mainNavbar .nav-item>.active {color: unset; font-weight: 700;}