diff --git a/private/less/size.less b/private/less/size.less deleted file mode 100644 index a5089addc..000000000 --- a/private/less/size.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/size"; -@import "var"; \ No newline at end of file diff --git a/public/less/size.less b/public/less/size.less deleted file mode 100644 index a5089addc..000000000 --- a/public/less/size.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/size"; -@import "var"; \ No newline at end of file diff --git a/src/less/core/normalize2.less b/src/less/core/normalize2.less index 9ca67b7b7..cb936708d 100644 --- a/src/less/core/normalize2.less +++ b/src/less/core/normalize2.less @@ -15,59 +15,6 @@ p, padding: 0; } -html { - height: 100%; - overflow: hidden; -} - -body { - position: absolute; - width: 100%; - height: 100%; - margin: 0; - padding: 0; - top: 0; - left: 0; - background-repeat: repeat; - .user-select-disable(); - color: @color-bi-text-normal; - font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - text-decoration: none; - -kthml-user-focus: normal; - -moz-user-focus: normal; - -moz-outline: 0 none; - outline: 0 none; -} - -div, textarea { - &::-webkit-scrollbar { - -webkit-appearance: none; - width: 10px; - height: 10px; - } - &::-webkit-scrollbar-track { - .border-radius(5px); - .background-color(@scroll-color, 5%); - &:hover { - .background-color(@scroll-color, 5%); - } - } - &::-webkit-scrollbar-thumb { - border: 2px solid transparent; - background-clip: padding-box; - .border-radius(10px); - .background-color(@scroll-color, 10%); - &:hover { - .background-color(@scroll-color, 30%); - } - } - &::-webkit-scrollbar-corner { - background-color: transparent; - } -} - a { outline: none; text-decoration: none; diff --git a/src/less/core/utils/size.less b/src/less/core/utils/size.less new file mode 100644 index 000000000..e14cca14c --- /dev/null +++ b/src/less/core/utils/size.less @@ -0,0 +1,17 @@ +@import "../../lib/constant"; +@import "../../image"; + +.iconSize(icon-size-12, @font-size-12); +.iconSize(icon-size-13, @font-size-13); +.iconSize(icon-size-14, @font-size-14); +.iconSize(icon-size-15, @font-size-15); +.iconSize(icon-size-16, @font-size-16); +.iconSize(icon-size-18, @font-size-18); +.iconSize(icon-size-20, @font-size-20); +.iconSize(icon-size-22, @font-size-22); +.iconSize(icon-size-24, @font-size-24); +.iconSize(icon-size-30, @font-size-30); +.iconSize(icon-size-40, @font-size-40); +.iconSize(icon-size-50, @font-size-50); +.iconSize(icon-size-60, @font-size-60); +.iconSize(icon-size-70, @font-size-70); diff --git a/src/less/resource/app.less b/src/less/resource/app.less index ace45dfb5..be0fc512d 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -1,21 +1,83 @@ @import "../index"; +html { + height: 100%; + overflow: hidden; +} + +body { + position: absolute; + width: 100%; + height: 100%; + margin: 0; + padding: 0; + top: 0; + left: 0; + background-repeat: repeat; + .user-select-disable(); + color: @color-bi-text-normal; + font: normal 12px "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Heiti, "黑体", sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + text-decoration: none; + -kthml-user-focus: normal; + -moz-user-focus: normal; + -moz-outline: 0 none; + outline: 0 none; +} + +div, textarea { + &::-webkit-scrollbar { + -webkit-appearance: none; + width: 10px; + height: 10px; + } + + &::-webkit-scrollbar-track { + .border-radius(5px); + .background-color(@scroll-color, 5%); + + &:hover { + .background-color(@scroll-color, 5%); + } + } + + &::-webkit-scrollbar-thumb { + border: 2px solid transparent; + background-clip: padding-box; + .border-radius(10px); + .background-color(@scroll-color, 10%); + + &:hover { + .background-color(@scroll-color, 30%); + } + } + + &::-webkit-scrollbar-corner { + background-color: transparent; + } +} + .bi-theme-dark { div, textarea { &::-webkit-scrollbar { -webkit-appearance: none; } + &::-webkit-scrollbar-track { .background-color(@scroll-color-theme-dark, 5%); + &:hover { .background-color(@scroll-color-theme-dark, 5%); } } + &::-webkit-scrollbar-thumb { .background-color(@scroll-color-theme-dark, 10%); + &:hover { .background-color(@scroll-color-theme-dark, 30%); } } } -} \ No newline at end of file +} diff --git a/src/less/resource/size.less b/src/less/resource/size.less deleted file mode 100644 index 11e8a57ce..000000000 --- a/src/less/resource/size.less +++ /dev/null @@ -1,9 +0,0 @@ -@import "../lib/constant"; -@import "../image"; - -.iconSize(icon-size-12, @font-size-12); -.iconSize(icon-size-16, @font-size-16); -.iconSize(icon-size-24, @font-size-24); -.iconSize(icon-size-40, @font-size-40); -.iconSize(icon-size-50, @font-size-50); -.iconSize(icon-size-70, @font-size-70); \ No newline at end of file diff --git a/ui/less/size.less b/ui/less/size.less deleted file mode 100644 index a5089addc..000000000 --- a/ui/less/size.less +++ /dev/null @@ -1,2 +0,0 @@ -@import "../../src/less/resource/size"; -@import "var"; \ No newline at end of file diff --git a/webpack/attachments.js b/webpack/attachments.js index 7655c1408..2f15597bc 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -134,8 +134,8 @@ const bundleWithoutNormalize = [].concat( sync([ "src/less/base/**/*.less", "src/less/widget/**/*.less", - "public/less/app.less", "public/less/**/*.less", + "!public/less/app.less", // ts的less ]), );