From 25e012a1d451722413072f811e7f3452819158bd Mon Sep 17 00:00:00 2001 From: guofeilong Date: Thu, 9 Feb 2023 10:27:07 +0800 Subject: [PATCH 1/3] * Code for adjust .side.penl's height --- module/admin/css/index.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 520491a9aa..639dc806f5 100755 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -78,6 +78,7 @@ .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;} /* css in side */ +#mainContent > .side.panel {height: 100%;} .time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;} .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;} .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;} From 7e20b4813f4e5b7713818d471917f644e041d7e8 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 9 Feb 2023 10:38:05 +0800 Subject: [PATCH 2/3] * Modify sub menu active. --- module/admin/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/admin/config.php b/module/admin/config.php index b930c1662d..3c3eb79a5f 100755 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -11,7 +11,7 @@ $config->admin->menuGroup['system'] = array('custom|mode', 'backup', 'cron', $config->admin->menuGroup['user'] = array('dept', 'company', 'user', 'group'); $config->admin->menuGroup['switch'] = array('admin|setmodule'); $config->admin->menuGroup['model'] = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|estimate', 'subject', 'process'); -$config->admin->menuGroup['feature'] = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban'); +$config->admin->menuGroup['feature'] = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder'); $config->admin->menuGroup['template'] = array('custom|set', 'baseline'); $config->admin->menuGroup['message'] = array('mail', 'webhook', 'sms', 'message'); $config->admin->menuGroup['dev'] = array('dev', 'entry'); From cbbe375ebbe6179c1dd0b83dccb0baa05994cd2d Mon Sep 17 00:00:00 2001 From: guofeilong Date: Thu, 9 Feb 2023 10:37:31 +0800 Subject: [PATCH 3/3] * admin: css refacotrs. --- module/admin/css/index.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/admin/css/index.css b/module/admin/css/index.css index 639dc806f5..2806765475 100755 --- a/module/admin/css/index.css +++ b/module/admin/css/index.css @@ -30,8 +30,9 @@ .admin > .main {flex: 1 1 70%;} .admin > .side {flex: 1 1 30%; margin-left: 16px; padding-right: 16px;} .panel-title {padding: 10px 0px;} -.panel {padding: 0 0 0 16px;} +.panel {padding-left: 16px;} .settings.panel, .plug.panel {margin-bottom: 16px;} +.main > .panel {padding-right: 8px;} .settings-list {display: flex; flex-wrap: wrap; padding: 0 4px 16px 4px;} .settings-list > .setting-box {border: unset; flex: 0 1 20%; padding: 8px;}