diff --git a/package/component/src/component/dropdown/index.less b/package/component/src/component/dropdown/index.less index ab487edd..a171eb4b 100644 --- a/package/component/src/component/dropdown/index.less +++ b/package/component/src/component/dropdown/index.less @@ -26,4 +26,4 @@ .layui-dropdown-up > dl { display: block; -} +} \ No newline at end of file diff --git a/package/component/src/component/iconPicker/index.less b/package/component/src/component/iconPicker/index.less index 9c56bf80..4710f195 100644 --- a/package/component/src/component/iconPicker/index.less +++ b/package/component/src/component/iconPicker/index.less @@ -118,8 +118,9 @@ } .layui-iconpicker-scroll .layui-iconpicker-list { - max-height: 220px; overflow: auto; + max-height: 220px; + overflow-x: hidden; } .layui-iconpicker-page { diff --git a/package/component/src/resolver/index.ts b/package/component/src/resolver/index.ts index 3b703472..e428ed23 100644 --- a/package/component/src/resolver/index.ts +++ b/package/component/src/resolver/index.ts @@ -99,6 +99,14 @@ const matchComponents = [ pattern: /^LayLine$/, styleDir: "line", }, + { + pattern: /^LayStepItem$/, + styleDir: "step", + }, + { + pattern: /^LayStep$/, + styleDir: "step", + }, // .... { pattern: /^(LayCarousel|LayCarouselItem)$/, @@ -154,10 +162,6 @@ const matchComponents = [ pattern: /^LaySplitPanelItem$/, styleDir: "splitPanel", }, - { - pattern: /^LayStepItem$/, - styleDir: "step", - }, { pattern: /^LaySwitch$/, styleDir: "", diff --git a/package/component/src/theme/index.less b/package/component/src/theme/index.less index 518e4d6b..89630f03 100644 --- a/package/component/src/theme/index.less +++ b/package/component/src/theme/index.less @@ -2,12 +2,6 @@ @import "./public.less"; @import "./date.less"; -.layui-inline, -img { - display: inline-block; - vertical-align: middle; -} - h1, h2, h3, @@ -22,38 +16,20 @@ body { color: #333; } -.layui-edge, -.layui-inline -{ +li { + list-style: none; +} + +.layui-inline { position: relative; -} - -.layui-edge, -hr { - height: 0; - overflow: hidden; -} - -.layui-edge, -.layui-elip, -hr { - overflow: hidden; -} - -.layui-btn, -.layui-edge, -.layui-inline, -img { + display: inline-block; vertical-align: middle; } .layui-btn, -.layui-disabled, -.layui-icon, -.layui-unselect { - -moz-user-select: none; - -webkit-user-select: none; - -ms-user-select: none; +.layui-edge, +.layui-inline { + vertical-align: middle; } .layui-elip, @@ -87,20 +63,12 @@ th, ul { margin: 0; padding: 0; - -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -} - -a:active, -a:hover { - outline: 0; } img { border: none; -} - -li { - list-style: none; + display: inline-block; + vertical-align: middle; } table { @@ -134,11 +102,11 @@ body { } hr { + padding: 0; line-height: 0; margin: 10px 0; - padding: 0; border: none !important; - border-bottom: 1px solid @global-neutral-color-3 !important; + border-bottom: 1px solid #EEEEEE!important; clear: both; background: 0 0; } @@ -151,21 +119,11 @@ a:hover { color: #777; } -a cite { - font-style: normal; - *cursor: pointer; -} - .layui-border-box, .layui-border-box * { box-sizing: border-box; } -.layui-inline { - *display: inline; - *zoom: 1; -} - .layui-btn, .layui-btn-group, .layui-edge { @@ -241,8 +199,8 @@ a cite { .layui-colorpicker-alpha-slider, .layui-colorpicker-side-slider, -.layui-menu, .layui-menu *, +.layui-menu, .layui-nav { box-sizing: border-box; } \ No newline at end of file diff --git a/package/component/src/theme/public.less b/package/component/src/theme/public.less index 27f0b09c..0146ee38 100644 --- a/package/component/src/theme/public.less +++ b/package/component/src/theme/public.less @@ -1,7 +1,8 @@ -// 特殊的三角符号 +// 三角符号 .layui-edge { width: 0; border-width: 6px; + position: relative; border-style: dashed; border-color: transparent; } @@ -37,7 +38,7 @@ display: none !important; } -// layui border.css +// 边框样式 .layui-border, .layui-border-black, .layui-border-blue, @@ -79,7 +80,7 @@ color: #393d49 !important; } -// layui background-color.css +// 背景色 .layui-bg-black, .layui-bg-blue, .layui-bg-cyan, @@ -118,7 +119,7 @@ color: #666 !important; } -// layui font-color.css +// 前景色 .layui-font-red { color: #ff5722 !important; } @@ -147,8 +148,7 @@ color: #c2c2c2 !important; } -// layui font-size.css - +// 字体尺寸 .layui-font-12 { font-size: 12px !important; } @@ -189,7 +189,7 @@ font-size: 30px !important; } -// layui anim.css +// 通用动画 .layui-anim { -webkit-animation-duration: 0.3s; -webkit-animation-fill-mode: both; diff --git a/package/document/src/document/zh-CN/components/avatar.md b/package/document/src/document/zh-CN/components/avatar.md index 0bb36144..2499d087 100644 --- a/package/document/src/document/zh-CN/components/avatar.md +++ b/package/document/src/document/zh-CN/components/avatar.md @@ -22,7 +22,7 @@ import { ref } from 'vue' export default { setup() { - const src = ref("https://portrait.gitee.com/uploads/avatars/user/2813/8441097_shaynas_1610801433.png") + const src = ref("https://portrait.gitee.com/uploads/avatars/user/1611/4835367_Jmysy_1578975358.png") return { src @@ -47,7 +47,7 @@ import { ref } from 'vue' export default { setup() { - const src = "https://portrait.gitee.com/uploads/avatars/user/2813/8441097_shaynas_1610801433.png" + const src = "https://portrait.gitee.com/uploads/avatars/user/1611/4835367_Jmysy_1578975358.png" return { src @@ -79,7 +79,7 @@ import { ref } from 'vue' export default { setup() { - const src = "https://portrait.gitee.com/uploads/avatars/user/2813/8441097_shaynas_1610801433.png" + const src = "https://portrait.gitee.com/uploads/avatars/user/1611/4835367_Jmysy_1578975358.png" return { src @@ -111,7 +111,7 @@ import { ref } from 'vue' export default { setup() { - const src = "https://portrait.gitee.com/uploads/avatars/user/2813/8441097_shaynas_1610801433.png" + const src = "https://portrait.gitee.com/uploads/avatars/user/1611/4835367_Jmysy_1578975358.png" return { src