From 8b0da7b97c9fd995563b6ddef089cbf24efc3f9f Mon Sep 17 00:00:00 2001 From: liyuchun Date: Wed, 8 Dec 2021 09:53:08 +0800 Subject: [PATCH] * Finish task #45491. --- module/group/lang/resource.php | 11 ++++++----- module/repo/css/browse.css | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 95771093fe..3d5c81242d 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1246,10 +1246,10 @@ $lang->resource->gitlab->createUser = 'createUser'; $lang->resource->gitlab->editUser = 'editUser'; $lang->resource->gitlab->deleteUser = 'deleteUser'; $lang->resource->gitlab->createBranch = 'createBranch'; +$lang->resource->gitlab->browseBranch = 'browseBranch'; $lang->resource->gitlab->webhook = 'webhook'; $lang->resource->gitlab->createWebhook = 'createWebhook'; $lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers'; -$lang->resource->gitlab->browseBranch = 'browseBranch'; $lang->gitlab->methodOrder[5] = 'browse'; $lang->gitlab->methodOrder[10] = 'create'; @@ -1271,10 +1271,11 @@ $lang->gitlab->methodOrder[90] = 'browseUser'; $lang->gitlab->methodOrder[95] = 'createUser'; $lang->gitlab->methodOrder[100] = 'editUser'; $lang->gitlab->methodOrder[105] = 'deleteUser'; -$lang->gitlab->methodOrder[110] = 'webhook'; -$lang->gitlab->methodOrder[115] = 'createWebhook'; -$lang->gitlab->methodOrder[120] = 'manageProjectMembers'; -$lang->gitlab->methodOrder[125] = 'browseBranch'; +$lang->gitlab->methodOrder[110] = 'createBranch'; +$lang->gitlab->methodOrder[115] = 'browseBranch'; +$lang->gitlab->methodOrder[120] = 'webhook'; +$lang->gitlab->methodOrder[125] = 'createWebhook'; +$lang->gitlab->methodOrder[130] = 'manageProjectMembers'; /* merge request. */ $lang->resource->mr = new stdclass(); diff --git a/module/repo/css/browse.css b/module/repo/css/browse.css index d8570a6143..35ae8663e8 100644 --- a/module/repo/css/browse.css +++ b/module/repo/css/browse.css @@ -1,4 +1,5 @@ #mainMenu > .btn-toolbar {height: 35px; line-height: 35px;} +#mainMenu > .pull-right {padding-right: 1%;} #sidebar>.sidebar-toggle>.icon {right: -2px; left: auto;} .main-row {width: 99%;} .btn-toolbar > .last-sync-time {display: inline-block; float: left; margin-right: 10px;}