diff --git a/package/component/src/component/header/index.less b/package/component/src/component/header/index.less index 95847f50..89d283d7 100644 --- a/package/component/src/component/header/index.less +++ b/package/component/src/component/header/index.less @@ -3,4 +3,4 @@ .layui-header { box-sizing: border-box; height: 60px; -} +} \ No newline at end of file diff --git a/package/component/src/component/logo/index.less b/package/component/src/component/logo/index.less new file mode 100644 index 00000000..b0c8edf7 --- /dev/null +++ b/package/component/src/component/logo/index.less @@ -0,0 +1,12 @@ +@import (reference) "../../theme/variable.less"; + +.layui-logo { + left: 0; + top: 0; + width: 200px; + height: 60px; + line-height: 60px; + text-align: center; + color: @global-primary-color; + font-size: 16px; +} \ No newline at end of file diff --git a/package/component/src/component/logo/index.vue b/package/component/src/component/logo/index.vue index a215ebf4..4c5cfe6f 100644 --- a/package/component/src/component/logo/index.vue +++ b/package/component/src/component/logo/index.vue @@ -10,4 +10,6 @@ export default { }; - + diff --git a/package/component/src/resolver/index.ts b/package/component/src/resolver/index.ts index 8d7fae72..055bf12e 100644 --- a/package/component/src/resolver/index.ts +++ b/package/component/src/resolver/index.ts @@ -47,6 +47,14 @@ const matchComponents = [ pattern: /^LayBadge$/, styleDir: "badge", }, + { + pattern: /^(LayHeader)$/, + styleDir: "header", + }, + { + pattern: /^LayLogo$/, + styleDir: "logo", + }, // .... { pattern: /^LayAvatarList$/, @@ -86,18 +94,10 @@ const matchComponents = [ pattern: /^(LayForm|LayFormItem)$/, styleDir: "formItem", }, - { - pattern: /^(LayHeader)$/, - styleDir: "", - }, { pattern: /^LayLine$/, styleDir: "", }, - { - pattern: /^LayLogo$/, - styleDir: "", - }, { pattern: /^(LayMenuItem|LaySubMenu)$/, styleDir: "menu", diff --git a/package/component/src/theme/index.less b/package/component/src/theme/index.less index ed5d04f9..0a04ba61 100644 --- a/package/component/src/theme/index.less +++ b/package/component/src/theme/index.less @@ -267,17 +267,6 @@ a cite { margin: 0 auto; } -.layui-logo { - left: 0; - top: 0; - width: 200px; - height: 60px; - line-height: 60px; - text-align: center; - color: @global-primary-color; - font-size: 16px; -} - .layui-layout-left { position: absolute !important; left: 200px;