Merge remote-tracking branch 'origin/release/11.0' into release/11.0

# Conflicts: # src/modules/pages/setting/setting.ts
1 year ago · 80e6344383
1 changed files with 3 additions and 5 deletions
--- a/src/modules/pages/setting/setting.ts
+++ b/src/modules/pages/setting/setting.ts
@ -47,9 +47,8 @@ export class TimeOutSetting extends BI.Widget {
                vgap: 10,
                items: [
                    {
-                        el: {
+                        el:{
                            type: 'bi.vertical_adapt',
-                            hgap: 16,
                            cls: 'bi-border-bottom',
                            height: 40,
                            items: [{
@ -58,9 +57,8 @@ export class TimeOutSetting extends BI.Widget {
                                width: 120,
                                cls: 'dec-font-weight-bold',
                                text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'),
-                            }],
-                        }
-                        ,tgap: -10,
+                            }]
+                        }, tgap: -10,  hgap: 16,
                    },
                    {
                        type: 'bi.vertical_adapt',