From a620b62ab40633df663bc0cb58b37baff70c8176 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com> Date: Sun, 24 Apr 2022 13:37:10 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=E4=BF=AE=E5=A4=8D:=20=E4=B8=BA?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E4=B8=BB=E9=94=AE=E5=BC=95=E5=85=A5=20public?= =?UTF-8?q?.less?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/src/component/avatar/index.less | 1 + .../src/component/avatarList/index.less | 3 +- .../src/component/backTop/index.less | 1 + .../component/src/component/badge/index.less | 1 + .../component/src/component/body/index.less | 1 + .../src/component/breadcrumb/index.less | 1 + .../component/src/component/button/index.less | 1 + .../src/component/buttonContainer/index.less | 1 + .../src/component/buttonGroup/index.less | 1 + .../component/src/component/card/index.less | 1 + .../src/component/carousel/index.less | 1 + .../src/component/checkbox/index.less | 1 + .../src/component/collapse/index.less | 1 + .../src/component/colorPicker/index.less | 1 + .../src/component/container/index.less | 1 + .../src/component/datePicker/index.less | 617 +++++++++++++----- .../src/component/dropdown/index.less | 1 + .../component/src/component/empty/index.less | 1 + .../src/component/exception/index.less | 1 + .../component/src/component/field/index.less | 1 + .../component/src/component/footer/index.less | 1 + .../component/src/component/form/index.less | 1 + .../src/component/fullscreen/index.less | 1 + .../component/src/component/header/index.less | 1 + .../component/src/component/icon/index.less | 3 +- .../src/component/iconPicker/index.less | 1 + .../component/src/component/input/index.less | 1 + .../src/component/inputNumber/index.less | 1 + .../src/component/keyboard/index.less | 1 + .../component/src/component/layout/index.less | 1 + .../component/src/component/line/index.less | 1 + .../component/src/component/logo/index.less | 1 + .../component/src/component/menu/index.less | 1 + .../component/src/component/page/index.less | 1 + .../component/src/component/panel/index.less | 1 + .../src/component/progress/index.less | 1 + .../component/src/component/quote/index.less | 1 + .../component/src/component/radio/index.less | 1 + .../component/src/component/rate/index.less | 1 + .../component/src/component/result/index.less | 1 + .../component/src/component/ripple/index.less | 3 + .../component/src/component/row/index.less | 1 + .../component/src/component/scroll/index.less | 3 + .../component/src/component/select/index.less | 1 + .../component/src/component/side/index.less | 1 + .../src/component/skeleton/index.less | 1 + .../component/src/component/slider/index.less | 1 + .../src/component/splitPanel/index.less | 1 + .../component/src/component/step/index.less | 1 + .../component/src/component/switch/index.less | 1 + .../component/src/component/tab/index.less | 1 + .../component/src/component/table/index.less | 1 + .../src/component/textarea/index.less | 1 + .../src/component/timeline/index.less | 1 + .../src/component/timeline/index.vue | 2 +- .../src/component/timelineItem/index.vue | 2 +- .../src/component/transfer/index.less | 1 + .../component/src/component/tree/index.less | 1 + .../component/src/component/upload/index.less | 5 +- .../component/src/component/upload/index.vue | 1 + package/component/src/theme/public.less | 2 +- 61 files changed, 526 insertions(+), 166 deletions(-) diff --git a/package/component/src/component/avatar/index.less b/package/component/src/component/avatar/index.less index f97e79f0..058bfb3c 100644 --- a/package/component/src/component/avatar/index.less +++ b/package/component/src/component/avatar/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-avatar { box-sizing: border-box; diff --git a/package/component/src/component/avatarList/index.less b/package/component/src/component/avatarList/index.less index dc8cfd81..adcb011c 100644 --- a/package/component/src/component/avatarList/index.less +++ b/package/component/src/component/avatarList/index.less @@ -1 +1,2 @@ -@import (reference) "../../theme/variable.less"; \ No newline at end of file +@import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; \ No newline at end of file diff --git a/package/component/src/component/backTop/index.less b/package/component/src/component/backTop/index.less index cfad5faf..bd643ac0 100644 --- a/package/component/src/component/backTop/index.less +++ b/package/component/src/component/backTop/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; /** backtop **/ @width: 50px; diff --git a/package/component/src/component/badge/index.less b/package/component/src/component/badge/index.less index 0966ab5a..99316d30 100644 --- a/package/component/src/component/badge/index.less +++ b/package/component/src/component/badge/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-badge, .layui-badge-dot, diff --git a/package/component/src/component/body/index.less b/package/component/src/component/body/index.less index 1d35d673..c0d037cc 100644 --- a/package/component/src/component/body/index.less +++ b/package/component/src/component/body/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-body { display: block; diff --git a/package/component/src/component/breadcrumb/index.less b/package/component/src/component/breadcrumb/index.less index 285ce09a..a4fae31d 100644 --- a/package/component/src/component/breadcrumb/index.less +++ b/package/component/src/component/breadcrumb/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-breadcrumb { font-size: 0; diff --git a/package/component/src/component/button/index.less b/package/component/src/component/button/index.less index 9f97849a..9eb5ebbe 100644 --- a/package/component/src/component/button/index.less +++ b/package/component/src/component/button/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; :root { --button-primary-text-color: #fff; diff --git a/package/component/src/component/buttonContainer/index.less b/package/component/src/component/buttonContainer/index.less index 432a0dfa..34a63a2a 100644 --- a/package/component/src/component/buttonContainer/index.less +++ b/package/component/src/component/buttonContainer/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-btn-container { font-size: 0; diff --git a/package/component/src/component/buttonGroup/index.less b/package/component/src/component/buttonGroup/index.less index dfca95ce..6d2315c0 100644 --- a/package/component/src/component/buttonGroup/index.less +++ b/package/component/src/component/buttonGroup/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @button-primary-color: @global-primary-color; @button-border-radius: @global-border-radius; diff --git a/package/component/src/component/card/index.less b/package/component/src/component/card/index.less index 22e88f76..13421853 100644 --- a/package/component/src/component/card/index.less +++ b/package/component/src/component/card/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; :root { --card-border-radius: var(--global-border-radius); diff --git a/package/component/src/component/carousel/index.less b/package/component/src/component/carousel/index.less index f21bee59..72bcb0b1 100644 --- a/package/component/src/component/carousel/index.less +++ b/package/component/src/component/carousel/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-carousel { position: relative; diff --git a/package/component/src/component/checkbox/index.less b/package/component/src/component/checkbox/index.less index 3b0ed897..37f766b2 100644 --- a/package/component/src/component/checkbox/index.less +++ b/package/component/src/component/checkbox/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-form-checkbox { position: relative; diff --git a/package/component/src/component/collapse/index.less b/package/component/src/component/collapse/index.less index cbba81f2..4e05e0b0 100644 --- a/package/component/src/component/collapse/index.less +++ b/package/component/src/component/collapse/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-collapse { border-width: 1px; diff --git a/package/component/src/component/colorPicker/index.less b/package/component/src/component/colorPicker/index.less index 49dcc629..3849d438 100644 --- a/package/component/src/component/colorPicker/index.less +++ b/package/component/src/component/colorPicker/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-color-picker { position: relative; diff --git a/package/component/src/component/container/index.less b/package/component/src/component/container/index.less index a14b954e..451fd0ef 100644 --- a/package/component/src/component/container/index.less +++ b/package/component/src/component/container/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-container { position: relative; diff --git a/package/component/src/component/datePicker/index.less b/package/component/src/component/datePicker/index.less index 20d85df8..c8bbcf47 100644 --- a/package/component/src/component/datePicker/index.less +++ b/package/component/src/component/datePicker/index.less @@ -1,160 +1,461 @@ -/** 图标字体 **/ -@font-face {font-family: 'laydate-icon'; - src: url('./font/iconfont.eot'); - src: url('./font/iconfont.eot#iefix') format('embedded-opentype'), - url('./font/iconfont.svg#iconfont') format('svg'), - url('./font/iconfont.woff') format('woff'), - url('./font/iconfont.ttf') format('truetype'); +@import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; + +@font-face { + font-family: "laydate-icon"; + src: url("./font/iconfont.eot"); + src: url("./font/iconfont.eot#iefix") format("embedded-opentype"), + url("./font/iconfont.svg#iconfont") format("svg"), + url("./font/iconfont.woff") format("woff"), + url("./font/iconfont.ttf") format("truetype"); +} + +.laydate-icon { + font-family: "laydate-icon" !important; + font-size: 16px; + font-style: normal; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +html #layuicss-laydate { + display: none; + position: absolute; + width: 1989px; +} + +/* 初始化 */ +.layui-laydate * { + margin: 0; + padding: 0; +} + +/* 主体结构 */ +.layui-laydate, +.layui-laydate * { + box-sizing: border-box; +} +.layui-laydate { + z-index: 66666666; + border-radius: 2px; + font-size: 14px; + -webkit-animation-duration: 0.2s; + animation-duration: 0.2s; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; +} +.layui-laydate-main { + width: 272px; +} +.layui-laydate-header *, +.layui-laydate-content td, +.layui-laydate-list li { + transition-duration: 0.3s; + -webkit-transition-duration: 0.3s; +} + +/* 微微往下滑入 */ +@keyframes laydate-downbit { + 0% { + opacity: 0.3; + transform: translate3d(0, -5px, 0); } - - .laydate-icon{ - font-family:"laydate-icon" !important; - font-size: 16px; - font-style: normal; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + 100% { + opacity: 1; + transform: translate3d(0, 0, 0); } - - html #layuicss-laydate{display: none; position: absolute; width: 1989px;} - - /* 初始化 */ - .layui-laydate *{margin: 0; padding: 0;} - - /* 主体结构 */ - .layui-laydate, .layui-laydate *{box-sizing: border-box;} - .layui-laydate{ z-index: 66666666; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.2s; animation-duration: 0.2s; -webkit-animation-fill-mode: both; animation-fill-mode: both;} - .layui-laydate-main{width: 272px;} - .layui-laydate-header *, - .layui-laydate-content td, - .layui-laydate-list li{transition-duration: .3s; -webkit-transition-duration: .3s;} - - /* 微微往下滑入 */ - @keyframes laydate-downbit { - 0% {opacity: 0.3; transform: translate3d(0, -5px, 0);} - 100% {opacity: 1; transform: translate3d(0, 0, 0);} - } - - .layui-laydate{animation-name: laydate-downbit;} - .layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;} - - /* 展开年月列表时 */ - .laydate-ym-show .laydate-prev-m, - .laydate-ym-show .laydate-next-m{display: none !important;} - .laydate-ym-show .laydate-prev-y, - .laydate-ym-show .laydate-next-y{display: inline-block !important;} - .laydate-ym-show .laydate-set-ym span[lay-type="month"]{display: none !important;} - - /* 展开时间列表时 */ - .laydate-time-show .layui-laydate-header .layui-icon, - .laydate-time-show .laydate-set-ym span[lay-type="year"], - .laydate-time-show .laydate-set-ym span[lay-type="month"]{display: none !important;} - - /* 头部结构 */ - .layui-laydate-header{position: relative; line-height:30px; padding: 10px 70px 5px;} - .layui-laydate-header *{display: inline-block; vertical-align: bottom;} - .layui-laydate-header i{position: absolute; top: 10px; padding: 0 5px; color: #999; font-size: 18px; cursor: pointer;} - .layui-laydate-header i.laydate-prev-y{left: 15px;} - .layui-laydate-header i.laydate-prev-m{left: 45px;} - .layui-laydate-header i.laydate-next-y{right: 15px;} - .layui-laydate-header i.laydate-next-m{right: 45px;} - .laydate-set-ym{width: 100%; text-align: center; box-sizing: border-box; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;} - .laydate-set-ym span{padding: 0 10px; cursor: pointer;} - .laydate-time-text{cursor: default !important;} - - /* 主体结构 */ - .layui-laydate-content{position: relative; padding: 10px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;} - .layui-laydate-content table{border-collapse: collapse; border-spacing: 0;} - .layui-laydate-content th, - .layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;} - .layui-laydate-content th{font-weight: 400;} - .layui-laydate-content td{position: relative; cursor: pointer;} - .laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;} - .laydate-day-mark::after{position: absolute; content:''; right: 2px; top: 2px; width: 5px; height: 5px; border-radius: 50%;} - - /* 底部结构 */ - .layui-laydate-footer{position: relative; height: 46px; line-height: 26px; padding: 10px;} - .layui-laydate-footer span{display: inline-block; vertical-align: top; height: 26px; line-height: 24px; padding: 0 10px; border: 1px solid #C9C9C9; border-radius: 2px; background-color: #fff; font-size: 12px; cursor: pointer; white-space: nowrap; transition: all .3s;} - .layui-laydate-footer span:hover{color: #5FB878;} - .layui-laydate-footer span.layui-laydate-preview{cursor: default; border-color: transparent !important;} - .layui-laydate-footer span.layui-laydate-preview:hover{color: #666;} - .layui-laydate-footer span:first-child.layui-laydate-preview{padding-left: 0;} - .laydate-footer-btns{position: absolute; right: 10px; top: 10px;} - .laydate-footer-btns span{margin: 0 0 0 -1px;} - - /* 年月列表 */ - .layui-laydate-list{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 10px; box-sizing: border-box; background-color: #fff;} - .layui-laydate-list>li{position: relative; display: inline-block; width: 33.3%; height: 36px; line-height: 36px; margin: 3px 0; vertical-align: middle; text-align: center; cursor: pointer;} - .laydate-month-list>li{width: 25%; margin: 17px 0;} - .laydate-time-list>li{height: 100%; margin: 0; line-height: normal; cursor: default;} - .laydate-time-list p{position: relative; top: -4px; line-height: 29px;} - .laydate-time-list ol{height: 181px; overflow: hidden;} - .laydate-time-list>li:hover ol{overflow-y: auto;} - .laydate-time-list ol li{width: 130%; padding-left: 4px; height: 30px; line-height: 30px; text-align: left; cursor: pointer;} - - /* 提示 */ - .layui-laydate-hint{ top: 115px; left: 50%; width: 250px; margin-left: -125px; line-height: 20px; padding: 15px; text-align: center; font-size: 12px; color: #FF5722;} - - - /* 双日历 */ - .layui-laydate-range{width: 546px;} - .layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;} - .layui-laydate-range .laydate-main-list-1 .layui-laydate-header, - .layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left: 1px solid #e2e2e2;} - - - /* 默认简约主题 */ - .layui-laydate, .layui-laydate-hint{background-color: #fff; color: #666;} - .layui-laydate-header{border-bottom: 1px solid #e2e2e2;} - .layui-laydate-header i:hover, - .layui-laydate-header span:hover{color: #5FB878;} - .layui-laydate-content{border-top: none 0; border-bottom: none 0;} - .layui-laydate-content th{color: #333;} - .layui-laydate-content td{color: #666;} - .layui-laydate-content td.laydate-selected{background-color: #B5FFF8;} - .laydate-selected:hover{background-color: #00F7DE !important;} - .layui-laydate-content td:hover, - .layui-laydate-list li:hover{background-color: #eee; color: #333;} - .laydate-time-list li ol{margin: 0; padding: 0; border: 1px solid #e2e2e2;} - .laydate-time-list li:first-child ol{border-left-width: 1px;} - .laydate-time-list>li:hover{background: none;} - .layui-laydate-content .laydate-day-prev, - .layui-laydate-content .laydate-day-next{color: #d2d2d2;} - .laydate-selected.laydate-day-prev, - .laydate-selected.laydate-day-next{background-color: #f8f8f8 !important;} - .layui-laydate-footer{border-top: 1px solid #e2e2e2;} - .layui-laydate-hint{color: #FF5722;} - .laydate-day-mark::after{background-color: #5FB878;} - .layui-laydate-content td.layui-this .laydate-day-mark::after{display: none;} - .layui-laydate-footer span[lay-type="date"]{color: #5FB878;} - .layui-laydate .layui-this{background-color: #009688 !important; color: #fff !important;} - .layui-laydate .laydate-disabled, - .layui-laydate .laydate-disabled:hover{background:none !important; color: #d2d2d2 !important; cursor: not-allowed !important; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;} - - /* 墨绿/自定义背景色主题 */ - .laydate-theme-molv{border: none;} - .laydate-theme-molv.layui-laydate-range{width: 548px} - .laydate-theme-molv .layui-laydate-main{width: 274px;} - .laydate-theme-molv .layui-laydate-header{border: none; background-color: #009688;} - .laydate-theme-molv .layui-laydate-header i, - .laydate-theme-molv .layui-laydate-header span{color: #f6f6f6;} - .laydate-theme-molv .layui-laydate-header i:hover, - .laydate-theme-molv .layui-laydate-header span:hover{color: #fff;} - .laydate-theme-molv .layui-laydate-content{border: 1px solid #e2e2e2; border-top: none; border-bottom: none;} - .laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left: none;} - .laydate-theme-molv .layui-laydate-footer{border: 1px solid #e2e2e2;} - - /* 格子主题 */ - .laydate-theme-grid .layui-laydate-content td, - .laydate-theme-grid .layui-laydate-content thead, - .laydate-theme-grid .laydate-year-list>li, - .laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;} - .laydate-theme-grid .laydate-selected, - .laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;} - .laydate-theme-grid .laydate-selected.laydate-day-prev, - .laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;} - .laydate-theme-grid .laydate-year-list, - .laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;} - .laydate-theme-grid .laydate-year-list>li, - .laydate-theme-grid .laydate-month-list>li{margin: 0 -1px -1px 0;} - .laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;} - .laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;} \ No newline at end of file +} + +.layui-laydate { + animation-name: laydate-downbit; +} +.layui-laydate-static { + position: relative; + z-index: 0; + display: inline-block; + margin: 0; + -webkit-animation: none; + animation: none; +} + +/* 展开年月列表时 */ +.laydate-ym-show .laydate-prev-m, +.laydate-ym-show .laydate-next-m { + display: none !important; +} +.laydate-ym-show .laydate-prev-y, +.laydate-ym-show .laydate-next-y { + display: inline-block !important; +} +.laydate-ym-show .laydate-set-ym span[lay-type="month"] { + display: none !important; +} + +/* 展开时间列表时 */ +.laydate-time-show .layui-laydate-header .layui-icon, +.laydate-time-show .laydate-set-ym span[lay-type="year"], +.laydate-time-show .laydate-set-ym span[lay-type="month"] { + display: none !important; +} + +/* 头部结构 */ +.layui-laydate-header { + position: relative; + line-height: 30px; + padding: 10px 70px 5px; +} +.layui-laydate-header * { + display: inline-block; + vertical-align: bottom; +} +.layui-laydate-header i { + position: absolute; + top: 10px; + padding: 0 5px; + color: #999; + font-size: 18px; + cursor: pointer; +} +.layui-laydate-header i.laydate-prev-y { + left: 15px; +} +.layui-laydate-header i.laydate-prev-m { + left: 45px; +} +.layui-laydate-header i.laydate-next-y { + right: 15px; +} +.layui-laydate-header i.laydate-next-m { + right: 45px; +} +.laydate-set-ym { + width: 100%; + text-align: center; + box-sizing: border-box; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; +} +.laydate-set-ym span { + padding: 0 10px; + cursor: pointer; +} +.laydate-time-text { + cursor: default !important; +} + +/* 主体结构 */ +.layui-laydate-content { + position: relative; + padding: 10px; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; +} +.layui-laydate-content table { + border-collapse: collapse; + border-spacing: 0; +} +.layui-laydate-content th, +.layui-laydate-content td { + width: 36px; + height: 30px; + padding: 5px; + text-align: center; +} +.layui-laydate-content th { + font-weight: 400; +} +.layui-laydate-content td { + position: relative; + cursor: pointer; +} +.laydate-day-mark { + position: absolute; + left: 0; + top: 0; + width: 100%; + line-height: 30px; + font-size: 12px; + overflow: hidden; +} +.laydate-day-mark::after { + position: absolute; + content: ""; + right: 2px; + top: 2px; + width: 5px; + height: 5px; + border-radius: 50%; +} + +/* 底部结构 */ +.layui-laydate-footer { + position: relative; + height: 46px; + line-height: 26px; + padding: 10px; +} +.layui-laydate-footer span { + display: inline-block; + vertical-align: top; + height: 26px; + line-height: 24px; + padding: 0 10px; + border: 1px solid #c9c9c9; + border-radius: 2px; + background-color: #fff; + font-size: 12px; + cursor: pointer; + white-space: nowrap; + transition: all 0.3s; +} +.layui-laydate-footer span:hover { + color: #5fb878; +} +.layui-laydate-footer span.layui-laydate-preview { + cursor: default; + border-color: transparent !important; +} +.layui-laydate-footer span.layui-laydate-preview:hover { + color: #666; +} +.layui-laydate-footer span:first-child.layui-laydate-preview { + padding-left: 0; +} +.laydate-footer-btns { + position: absolute; + right: 10px; + top: 10px; +} +.laydate-footer-btns span { + margin: 0 0 0 -1px; +} + +/* 年月列表 */ +.layui-laydate-list { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + padding: 10px; + box-sizing: border-box; + background-color: #fff; +} +.layui-laydate-list > li { + position: relative; + display: inline-block; + width: 33.3%; + height: 36px; + line-height: 36px; + margin: 3px 0; + vertical-align: middle; + text-align: center; + cursor: pointer; +} +.laydate-month-list > li { + width: 25%; + margin: 17px 0; +} +.laydate-time-list > li { + height: 100%; + margin: 0; + line-height: normal; + cursor: default; +} +.laydate-time-list p { + position: relative; + top: -4px; + line-height: 29px; +} +.laydate-time-list ol { + height: 181px; + overflow: hidden; +} +.laydate-time-list > li:hover ol { + overflow-y: auto; +} +.laydate-time-list ol li { + width: 130%; + padding-left: 4px; + height: 30px; + line-height: 30px; + text-align: left; + cursor: pointer; +} + +/* 提示 */ +.layui-laydate-hint { + top: 115px; + left: 50%; + width: 250px; + margin-left: -125px; + line-height: 20px; + padding: 15px; + text-align: center; + font-size: 12px; + color: #ff5722; +} + +/* 双日历 */ +.layui-laydate-range { + width: 546px; +} +.layui-laydate-range .layui-laydate-main { + display: inline-block; + vertical-align: middle; +} +.layui-laydate-range .laydate-main-list-1 .layui-laydate-header, +.layui-laydate-range .laydate-main-list-1 .layui-laydate-content { + border-left: 1px solid #e2e2e2; +} + +/* 默认简约主题 */ +.layui-laydate, +.layui-laydate-hint { + background-color: #fff; + color: #666; +} +.layui-laydate-header { + border-bottom: 1px solid #e2e2e2; +} +.layui-laydate-header i:hover, +.layui-laydate-header span:hover { + color: #5fb878; +} +.layui-laydate-content { + border-top: none 0; + border-bottom: none 0; +} +.layui-laydate-content th { + color: #333; +} +.layui-laydate-content td { + color: #666; +} +.layui-laydate-content td.laydate-selected { + background-color: #b5fff8; +} +.laydate-selected:hover { + background-color: #00f7de !important; +} +.layui-laydate-content td:hover, +.layui-laydate-list li:hover { + background-color: #eee; + color: #333; +} +.laydate-time-list li ol { + margin: 0; + padding: 0; + border: 1px solid #e2e2e2; +} +.laydate-time-list li:first-child ol { + border-left-width: 1px; +} +.laydate-time-list > li:hover { + background: none; +} +.layui-laydate-content .laydate-day-prev, +.layui-laydate-content .laydate-day-next { + color: #d2d2d2; +} +.laydate-selected.laydate-day-prev, +.laydate-selected.laydate-day-next { + background-color: #f8f8f8 !important; +} +.layui-laydate-footer { + border-top: 1px solid #e2e2e2; +} +.layui-laydate-hint { + color: #ff5722; +} +.laydate-day-mark::after { + background-color: #5fb878; +} +.layui-laydate-content td.layui-this .laydate-day-mark::after { + display: none; +} +.layui-laydate-footer span[lay-type="date"] { + color: #5fb878; +} +.layui-laydate .layui-this { + background-color: #009688 !important; + color: #fff !important; +} +.layui-laydate .laydate-disabled, +.layui-laydate .laydate-disabled:hover { + background: none !important; + color: #d2d2d2 !important; + cursor: not-allowed !important; + -moz-user-select: none; + -webkit-user-select: none; + -ms-user-select: none; +} + +/* 墨绿/自定义背景色主题 */ +.laydate-theme-molv { + border: none; +} +.laydate-theme-molv.layui-laydate-range { + width: 548px; +} +.laydate-theme-molv .layui-laydate-main { + width: 274px; +} +.laydate-theme-molv .layui-laydate-header { + border: none; + background-color: #009688; +} +.laydate-theme-molv .layui-laydate-header i, +.laydate-theme-molv .layui-laydate-header span { + color: #f6f6f6; +} +.laydate-theme-molv .layui-laydate-header i:hover, +.laydate-theme-molv .layui-laydate-header span:hover { + color: #fff; +} +.laydate-theme-molv .layui-laydate-content { + border: 1px solid #e2e2e2; + border-top: none; + border-bottom: none; +} +.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content { + border-left: none; +} +.laydate-theme-molv .layui-laydate-footer { + border: 1px solid #e2e2e2; +} + +/* 格子主题 */ +.laydate-theme-grid .layui-laydate-content td, +.laydate-theme-grid .layui-laydate-content thead, +.laydate-theme-grid .laydate-year-list > li, +.laydate-theme-grid .laydate-month-list > li { + border: 1px solid #e2e2e2; +} +.laydate-theme-grid .laydate-selected, +.laydate-theme-grid .laydate-selected:hover { + background-color: #f2f2f2 !important; + color: #009688 !important; +} +.laydate-theme-grid .laydate-selected.laydate-day-prev, +.laydate-theme-grid .laydate-selected.laydate-day-next { + color: #d2d2d2 !important; +} +.laydate-theme-grid .laydate-year-list, +.laydate-theme-grid .laydate-month-list { + margin: 1px 0 0 1px; +} +.laydate-theme-grid .laydate-year-list > li, +.laydate-theme-grid .laydate-month-list > li { + margin: 0 -1px -1px 0; +} +.laydate-theme-grid .laydate-year-list > li { + height: 43px; + line-height: 43px; +} +.laydate-theme-grid .laydate-month-list > li { + height: 71px; + line-height: 71px; +} diff --git a/package/component/src/component/dropdown/index.less b/package/component/src/component/dropdown/index.less index 996f5232..29465de0 100644 --- a/package/component/src/component/dropdown/index.less +++ b/package/component/src/component/dropdown/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-dropdown { position: relative; diff --git a/package/component/src/component/empty/index.less b/package/component/src/component/empty/index.less index a3c1385b..c41632af 100644 --- a/package/component/src/component/empty/index.less +++ b/package/component/src/component/empty/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-empty { margin: 0 8px; diff --git a/package/component/src/component/exception/index.less b/package/component/src/component/exception/index.less index 69e0be92..a792d3e5 100644 --- a/package/component/src/component/exception/index.less +++ b/package/component/src/component/exception/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-exception { .layui-exception-image { diff --git a/package/component/src/component/field/index.less b/package/component/src/component/field/index.less index 81e1f0a4..151e7540 100644 --- a/package/component/src/component/field/index.less +++ b/package/component/src/component/field/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @field-border-color: var(--field-border-color); @field-border-radius: var(--field-border-radius); diff --git a/package/component/src/component/footer/index.less b/package/component/src/component/footer/index.less index aa98bd9a..5f15e708 100644 --- a/package/component/src/component/footer/index.less +++ b/package/component/src/component/footer/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-footer { box-sizing: border-box; diff --git a/package/component/src/component/form/index.less b/package/component/src/component/form/index.less index 68f45ae9..565ee2d7 100644 --- a/package/component/src/component/form/index.less +++ b/package/component/src/component/form/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-form-item { margin-bottom: 20px; diff --git a/package/component/src/component/fullscreen/index.less b/package/component/src/component/fullscreen/index.less index da9971fd..a96c1b92 100644 --- a/package/component/src/component/fullscreen/index.less +++ b/package/component/src/component/fullscreen/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-fullscreen { position: fixed; diff --git a/package/component/src/component/header/index.less b/package/component/src/component/header/index.less index 89d283d7..ee396d21 100644 --- a/package/component/src/component/header/index.less +++ b/package/component/src/component/header/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-header { box-sizing: border-box; diff --git a/package/component/src/component/icon/index.less b/package/component/src/component/icon/index.less index dc8cfd81..adcb011c 100644 --- a/package/component/src/component/icon/index.less +++ b/package/component/src/component/icon/index.less @@ -1 +1,2 @@ -@import (reference) "../../theme/variable.less"; \ No newline at end of file +@import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; \ 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 4710f195..3bd8b80f 100644 --- a/package/component/src/component/iconPicker/index.less +++ b/package/component/src/component/iconPicker/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @icon-picker-border-radius: var(--icon-picker-border-radius); @icon-picker-checked-color: var(--icon-picker-checked-color); diff --git a/package/component/src/component/input/index.less b/package/component/src/component/input/index.less index 72ecf071..d6b35053 100644 --- a/package/component/src/component/input/index.less +++ b/package/component/src/component/input/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @input-border-radius: var(--input-border-radius); @input-border-color: var(--input-border-color); diff --git a/package/component/src/component/inputNumber/index.less b/package/component/src/component/inputNumber/index.less index 624b4bff..0ce0ca99 100644 --- a/package/component/src/component/inputNumber/index.less +++ b/package/component/src/component/inputNumber/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @border-color: #eee; @hover-border-color: @global-primary-color; diff --git a/package/component/src/component/keyboard/index.less b/package/component/src/component/keyboard/index.less index 9466d8b9..c6cec05c 100644 --- a/package/component/src/component/keyboard/index.less +++ b/package/component/src/component/keyboard/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-keyboard-header { height: 40px; diff --git a/package/component/src/component/layout/index.less b/package/component/src/component/layout/index.less index 5a94c19d..e6cdcc2f 100644 --- a/package/component/src/component/layout/index.less +++ b/package/component/src/component/layout/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-layout { flex: 1; diff --git a/package/component/src/component/line/index.less b/package/component/src/component/line/index.less index 29a4a834..f4481b22 100644 --- a/package/component/src/component/line/index.less +++ b/package/component/src/component/line/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-line { &-horizontal { diff --git a/package/component/src/component/logo/index.less b/package/component/src/component/logo/index.less index b0c8edf7..1d1a90e4 100644 --- a/package/component/src/component/logo/index.less +++ b/package/component/src/component/logo/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-logo { left: 0; diff --git a/package/component/src/component/menu/index.less b/package/component/src/component/menu/index.less index 189dd4f4..e1558694 100644 --- a/package/component/src/component/menu/index.less +++ b/package/component/src/component/menu/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-nav .layui-show.layui-anim-upbit .layui-show.layui-anim-upbit { top: 0px; diff --git a/package/component/src/component/page/index.less b/package/component/src/component/page/index.less index 57208881..951ba0c1 100644 --- a/package/component/src/component/page/index.less +++ b/package/component/src/component/page/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-laypage { display: inline-block; diff --git a/package/component/src/component/panel/index.less b/package/component/src/component/panel/index.less index b91b6383..4110c619 100644 --- a/package/component/src/component/panel/index.less +++ b/package/component/src/component/panel/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @panel-border-color: var(--panel-border-color); @panel-border-radius: var(--panel-border-radius); diff --git a/package/component/src/component/progress/index.less b/package/component/src/component/progress/index.less index f99e5d7b..217a7dec 100644 --- a/package/component/src/component/progress/index.less +++ b/package/component/src/component/progress/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-progress { position: relative; diff --git a/package/component/src/component/quote/index.less b/package/component/src/component/quote/index.less index 9c7e941d..721ffd16 100644 --- a/package/component/src/component/quote/index.less +++ b/package/component/src/component/quote/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @block-default-color: var(--block-default-color); @block-border-radius: var(--block-border-radius); diff --git a/package/component/src/component/radio/index.less b/package/component/src/component/radio/index.less index 23a11acc..080e8588 100644 --- a/package/component/src/component/radio/index.less +++ b/package/component/src/component/radio/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-form-radio, .layui-form-radio * { diff --git a/package/component/src/component/rate/index.less b/package/component/src/component/rate/index.less index a1916500..53b656ee 100644 --- a/package/component/src/component/rate/index.less +++ b/package/component/src/component/rate/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-rate, .layui-rate * { diff --git a/package/component/src/component/result/index.less b/package/component/src/component/result/index.less index ae3a07ab..6ad80111 100644 --- a/package/component/src/component/result/index.less +++ b/package/component/src/component/result/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .result { text-align: center; diff --git a/package/component/src/component/ripple/index.less b/package/component/src/component/ripple/index.less index f5920597..1a81f29b 100644 --- a/package/component/src/component/ripple/index.less +++ b/package/component/src/component/ripple/index.less @@ -1,3 +1,6 @@ +@import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; + .layui-water-ripples-container { position: relative; display: inline-block; diff --git a/package/component/src/component/row/index.less b/package/component/src/component/row/index.less index c9864ccf..f0dd6fb3 100644 --- a/package/component/src/component/row/index.less +++ b/package/component/src/component/row/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-row:after, .layui-row:before { diff --git a/package/component/src/component/scroll/index.less b/package/component/src/component/scroll/index.less index 62cb2a55..49f9e109 100644 --- a/package/component/src/component/scroll/index.less +++ b/package/component/src/component/scroll/index.less @@ -1,3 +1,6 @@ +@import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; + .scrollbar-box { height: 100%; overflow: hidden !important; diff --git a/package/component/src/component/select/index.less b/package/component/src/component/select/index.less index 1872d380..8799f9af 100644 --- a/package/component/src/component/select/index.less +++ b/package/component/src/component/select/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; dl.layui-anim-upbit > dd input[type="checkbox"] { display: none; diff --git a/package/component/src/component/side/index.less b/package/component/src/component/side/index.less index 3f9ed87c..cc1d35b4 100644 --- a/package/component/src/component/side/index.less +++ b/package/component/src/component/side/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-side { overflow: auto; diff --git a/package/component/src/component/skeleton/index.less b/package/component/src/component/skeleton/index.less index dff27b9a..cadf7f45 100644 --- a/package/component/src/component/skeleton/index.less +++ b/package/component/src/component/skeleton/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .lay-skeleton { .lay-skeleton-item { diff --git a/package/component/src/component/slider/index.less b/package/component/src/component/slider/index.less index ee353eac..1f29bc74 100644 --- a/package/component/src/component/slider/index.less +++ b/package/component/src/component/slider/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; // 横向样式 .layui-slider-v { diff --git a/package/component/src/component/splitPanel/index.less b/package/component/src/component/splitPanel/index.less index a061a5bf..0e719856 100644 --- a/package/component/src/component/splitPanel/index.less +++ b/package/component/src/component/splitPanel/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .lay-split-panel { height: 100%; diff --git a/package/component/src/component/step/index.less b/package/component/src/component/step/index.less index 6a1a6d70..801e747c 100644 --- a/package/component/src/component/step/index.less +++ b/package/component/src/component/step/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @width-height-pace: 24px; @step-color: @step-success-color; diff --git a/package/component/src/component/switch/index.less b/package/component/src/component/switch/index.less index 5ab56f0d..e86bde9a 100644 --- a/package/component/src/component/switch/index.less +++ b/package/component/src/component/switch/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-form-switch { position: relative; diff --git a/package/component/src/component/tab/index.less b/package/component/src/component/tab/index.less index 3e5b0b25..0321c1dd 100644 --- a/package/component/src/component/tab/index.less +++ b/package/component/src/component/tab/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-tab { margin: 10px 0; diff --git a/package/component/src/component/table/index.less b/package/component/src/component/table/index.less index e8d7610a..2e46f2db 100644 --- a/package/component/src/component/table/index.less +++ b/package/component/src/component/table/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-table-col-special { width: 34px; diff --git a/package/component/src/component/textarea/index.less b/package/component/src/component/textarea/index.less index 419fe293..48b78325 100644 --- a/package/component/src/component/textarea/index.less +++ b/package/component/src/component/textarea/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @textarea-border-radius: var(--textarea-border-radius); @textarea-border-color: var(--textarea-border-color); diff --git a/package/component/src/component/timeline/index.less b/package/component/src/component/timeline/index.less index 34fa5105..00ba5adf 100644 --- a/package/component/src/component/timeline/index.less +++ b/package/component/src/component/timeline/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-timeline { padding-left: 5px; diff --git a/package/component/src/component/timeline/index.vue b/package/component/src/component/timeline/index.vue index 7fd98ead..f9194acd 100644 --- a/package/component/src/component/timeline/index.vue +++ b/package/component/src/component/timeline/index.vue @@ -26,4 +26,4 @@ const timeLineClass = computed(() => [ - \ No newline at end of file + diff --git a/package/component/src/component/timelineItem/index.vue b/package/component/src/component/timelineItem/index.vue index 7cb932d6..1ed8873a 100644 --- a/package/component/src/component/timelineItem/index.vue +++ b/package/component/src/component/timelineItem/index.vue @@ -33,4 +33,4 @@ const props = defineProps(); - \ No newline at end of file + diff --git a/package/component/src/component/transfer/index.less b/package/component/src/component/transfer/index.less index 410b59cb..12896f54 100644 --- a/package/component/src/component/transfer/index.less +++ b/package/component/src/component/transfer/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @transfer-box-border-radius: var(--transfer-box-border-radius); diff --git a/package/component/src/component/tree/index.less b/package/component/src/component/tree/index.less index df34adbc..f1b91944 100644 --- a/package/component/src/component/tree/index.less +++ b/package/component/src/component/tree/index.less @@ -1,4 +1,5 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; .layui-tree { line-height: 22px; diff --git a/package/component/src/component/upload/index.less b/package/component/src/component/upload/index.less index 78b595f5..7a008370 100644 --- a/package/component/src/component/upload/index.less +++ b/package/component/src/component/upload/index.less @@ -1,5 +1,7 @@ @import (reference) "../../theme/variable.less"; +@import (reference) "../../theme/public.less"; @import "./cropper.min.css"; + .layui-upload-file { // display: none !important; opacity: 0.01; @@ -93,9 +95,6 @@ cursor: not-allowed; } -.copper-container{ - // width:1000px; -} ._lay_upload_img{ display: block; max-width: 100%; diff --git a/package/component/src/component/upload/index.vue b/package/component/src/component/upload/index.vue index c1cd2ed8..3ca4e4ad 100644 --- a/package/component/src/component/upload/index.vue +++ b/package/component/src/component/upload/index.vue @@ -317,6 +317,7 @@ const getUploadChange = (e: any) => { setTimeout(() => { let _imgs = document.getElementsByClassName("_lay_upload_img"); let _img = _imgs[0]; + // @ts-ignore _cropper = new Cropper(_img, { aspectRatio: 16 / 9, }); diff --git a/package/component/src/theme/public.less b/package/component/src/theme/public.less index 65dd215d..a142d0b8 100644 --- a/package/component/src/theme/public.less +++ b/package/component/src/theme/public.less @@ -739,4 +739,4 @@ a:hover { .layui-anim-fadeout { -webkit-animation-name: layui-fadeout; animation-name: layui-fadeout; -} +} \ No newline at end of file