From d9b58e46aee48a6f26ae009c1efd74f47e77697e Mon Sep 17 00:00:00 2001 From: vben Date: Thu, 31 Dec 2020 00:20:41 +0800 Subject: [PATCH] style(layout): update layout style #149 --- src/components/Table/src/components/TableAction.vue | 4 ++-- src/layouts/default/header/index.less | 1 + src/layouts/default/index.vue | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue index fd0aa425..5ff4d908 100644 --- a/src/components/Table/src/components/TableAction.vue +++ b/src/components/Table/src/components/TableAction.vue @@ -49,13 +49,13 @@ return props.actions.map((action) => { const { popConfirm } = action; return { + type: 'link', + size: 'small', ...action, ...(popConfirm || {}), onConfirm: popConfirm?.confirm, onCancel: popConfirm?.cancel, enable: !!popConfirm, - type: 'link', - size: 'small', }; }); }); diff --git a/src/layouts/default/header/index.less b/src/layouts/default/header/index.less index a29212ff..1648967e 100644 --- a/src/layouts/default/header/index.less +++ b/src/layouts/default/header/index.less @@ -135,6 +135,7 @@ &--light { background: @white; border-bottom: 1px solid @header-light-bottom-border-color; + border-left: 1px solid @header-light-bottom-border-color; .@{header-prefix-cls}-logo { color: @text-color-base; diff --git a/src/layouts/default/index.vue b/src/layouts/default/index.vue index c686c8ac..63905829 100644 --- a/src/layouts/default/index.vue +++ b/src/layouts/default/index.vue @@ -83,9 +83,5 @@ > .ant-layout { min-height: 100%; } - - &__main { - margin-left: 1px; - } } -- GitLab