Merge branch 'master' into test

apolloconfig · Dec 16, 2022 · 6a52293 · 6a52293
2 parents 5c2b730 + 0b9ade6
commit 6a52293
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/apollo-portal/src/main/resources/static/config_export.html b/apollo-portal/src/main/resources/static/config_export.html
@@ -32,15 +32,15 @@
 <body>
 <apollonav></apollonav>
 <div class="container-fluid" ng-controller="ConfigExportController">
-    <div class="col-md-8 col-md-offset-2 panel">
+    <div class="col-md-10 col-md-offset-1 panel">
         <section class="panel-body">
             <header class="panel-heading">
                 {{'ConfigExport.Title' | translate }}
                 <small>{{'ConfigExport.TitleTips' | translate }}</small>
             </header>
             <form class="form-horizontal" style="padding-top: 15px;">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">{{'ConfigExport.SelectExportEnv' | translate }}</label>
+                    <label class="col-sm-2 control-label">{{'ConfigExport.SelectExportEnv' | translate }}</label>
                     <div class="col-sm-2">
                         <table class="table table-hover">
                             <tbody>
@@ -55,7 +55,7 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label"></label>
+                    <label class="col-sm-2 control-label"></label>
                     <div class="col-sm-9">
                         <a type="button" class="btn btn-primary" ng-click="export()">{{'ConfigExport.Export' | translate }}</a>
                         <p class="help-block">（{{'ConfigExport.ExportTips' | translate }}）</p>
@@ -67,7 +67,7 @@
 
             <form class="form-horizontal">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">{{'ConfigExport.SelectImportEnv' | translate }}</label>
+                    <label class="col-sm-2 control-label">{{'ConfigExport.SelectImportEnv' | translate }}</label>
                     <div class="col-sm-2">
                         <table class="table table-hover">
                             <tbody>
@@ -82,7 +82,7 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">{{'ConfigExport.ImportConflictLabel' | translate }}</label>
+                    <label class="col-sm-2 control-label">{{'ConfigExport.ImportConflictLabel' | translate }}</label>
                     <div class="col-sm-9">
                         <div class="radio">
                             <input type="radio" name="conflictAction" value="ignore" checked ng-model="conflictAction">
@@ -95,13 +95,13 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">{{'ConfigExport.UploadFile' | translate }}</label>
+                    <label class="col-sm-2 control-label">{{'ConfigExport.UploadFile' | translate }}</label>
                     <div class="col-sm-9">
                         <input type="file" id="fileUpload">
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-sm-3 control-label"></label>
+                    <label class="col-sm-2 control-label"></label>
                     <div class=" col-sm-9">
                         <a type="button" class="btn btn-primary" ng-click="import()">{{'ConfigExport.Import' | translate }}</a>
                         <br>

diff --git a/apollo-portal/src/main/resources/static/server_config_manage.html b/apollo-portal/src/main/resources/static/server_config_manage.html
@@ -34,7 +34,7 @@
 
     <apollonav></apollonav>
     <div class="container-fluid apollo-container" ng-controller="ServerConfigController" ng-show="isRootUser">
-        <div class="col-md-8 col-md-offset-2 panel">
+        <div class="col-md-10 col-md-offset-1 panel">
             <ul class="nav nav-tabs">
                 <li role="presentation" ng-class="{false:'disabled'}[allowSwitchingTabs]" class="active" >
                     <a ng-disabled="!allowSwitchingTabs" style="border-left-style:none" href="#portal_db" data-toggle="tab">{{'ServiceConfig.PortalDB.Tab' | translate}}</a>

diff --git a/apollo-portal/src/main/resources/static/user-manage.html b/apollo-portal/src/main/resources/static/user-manage.html
@@ -34,7 +34,7 @@
 
     <apollonav></apollonav>
     <div id ="user-list" class="container-fluid apollo-container" ng-controller="UserController">
-        <div class="col-md-8 col-md-offset-2 panel">
+        <div class="col-md-10 col-md-offset-1 panel">
             <section class="panel-body" ng-show="isRootUser">
                 <div class="main-table"></div>
                 <div class="row">