diff --git a/common/css/blockly.css b/common/css/blockly.css index 47964051..ec498bdc 100644 --- a/common/css/blockly.css +++ b/common/css/blockly.css @@ -16,8 +16,16 @@ .blocklyToolboxDiv { overflow-x: hidden; - overflow-y: scroll; - padding: 0px; + overflow-y: auto; + padding: 0 2px 0 0; +} + +.classic-theme .blocklyToolboxDiv { + border-right: 1px solid #c9c9c9; +} + +.dark-theme .blocklyToolboxDiv { + border-right: 1px solid rgba(128, 128, 128, 0.35); } .blocklyTreeLabel { diff --git a/common/css/main.css b/common/css/main.css index 102bc0c5..80b9d4cf 100644 --- a/common/css/main.css +++ b/common/css/main.css @@ -6,7 +6,6 @@ @import "../ui/layui/css/layui-theme-dark.css"; @import "./interface.css"; @import "./fontello.css"; -@import "./nav.css"; @import "./library.css"; @import "./drag.css"; @import "./button.css"; diff --git a/common/css/nav.css b/common/css/nav.css deleted file mode 100644 index 23076178..00000000 --- a/common/css/nav.css +++ /dev/null @@ -1,124 +0,0 @@ -#table_whole { - height: calc(100vh - 2.6em) !important; -} - -.layui-form-label > .layui-unselect.layui-form-checkbox > span { - height: 25px; -} - -.layui-layout-left { - position: absolute !important; - left: 0px; - top: 0; -} - -.layui-nav .layui-nav-item a { - position: relative; - overflow: hidden; -} - -.layui-nav .layui-nav-item a:after { - content: ""; - display: block; - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - pointer-events: none; - background-image: radial-gradient(circle, #666 10%, transparent 10.01%); - background-repeat: no-repeat; - background-position: 50%; - transform: scale(10, 10); - opacity: 0; - transition: transform 0.3s, opacity 0.5s; -} - -.layui-nav .layui-nav-item a:active:after { - transform: scale(0, 0); - opacity: 0.3; - transition: 0s; -} - -html[data-bs-theme=light] .layui-layer-tips .layui-layer-content { - background-color: #f2f2f2; - color: #000; - box-shadow: 1px 1px 3px rgb(0 0 0 / 20%); -} - -html[data-bs-theme=dark] .layui-layer-tips .layui-layer-content { - background-color: #646363; - color: #fff; - box-shadow: 1px 1px 3px rgb(0 0 0 / 20%); -} - -.footer-tips .layui-layer-content { - padding: 3px 12px; -} - -html[data-bs-theme=light] .layui-layer-tips i.layui-layer-TipsL { - border-left-color: #f2f2f2; -} - -html[data-bs-theme=dark] .layui-layer-tips i.layui-layer-TipsL { - border-left-color: #646363; -} - -html[data-bs-theme=light] .layui-layer-tips i.layui-layer-TipsR { - border-right-color: #f2f2f2; -} - -html[data-bs-theme=dark] .layui-layer-tips i.layui-layer-TipsR { - border-right-color: #646363; -} - -html[data-bs-theme=light] .layui-layer-tips i.layui-layer-TipsT { - border-top-color: #f2f2f2; -} - -html[data-bs-theme=dark] .layui-layer-tips i.layui-layer-TipsT { - border-top-color: #646363; -} - -html[data-bs-theme=light] .layui-layer-tips i.layui-layer-TipsB { - border-bottom-color: #f2f2f2; -} - -html[data-bs-theme=dark] .layui-layer-tips i.layui-layer-TipsB { - border-bottom-color: #646363; -} - -.layui-table-fixed-r > .layui-table-header { - border-bottom-width: 0px; -} - -.layui-table-fixed-r > .layui-table-body > table { - width: 100%; -} - -html[data-bs-theme=dark] .layui-table-body .layui-none { - color: #fff; -} - -html[data-bs-theme=dark] .layui-form-checkbox[lay-skin=primary] span { - color: #fff; -} - -html[data-bs-theme=light] .layui-table-tips-main { - background-color: #fff; - color: #5f5f5f; -} - -html[data-bs-theme=dark] .layui-table-tips-main { - background-color: #8d8888; - color: #fff; -} - -html[data-bs-theme=light] input[m-id="search-area"] { - background-color: #f3efef; - border-color: #ddd; -} - -html[data-bs-theme=light] input[m-id="search-area"] + button.layui-btn-disabled { - background-color: #f3efef !important; -} \ No newline at end of file diff --git a/common/css/scrollbar.css b/common/css/scrollbar.css index bbc18d3e..6141e215 100644 --- a/common/css/scrollbar.css +++ b/common/css/scrollbar.css @@ -10,7 +10,7 @@ body ::-webkit-scrollbar { /* 设置滚动条滑槽 */ ::-webkit-scrollbar-track, body ::-webkit-scrollbar-track { - background-color: rgba(255, 255, 255, 0.1); + background-color: transparent; border-radius: 1px; } @@ -74,7 +74,7 @@ html[data-bs-theme=dark] body ::-webkit-scrollbar-thumb:active { /* 设置滚动条滑槽 */ .mixly-scrollbar ::-webkit-scrollbar-track, .mixly-scrollbar::-webkit-scrollbar-track { - background-color: rgba(255, 255, 255, 0.1); + background-color: transparent; border-radius: 0px; } @@ -142,7 +142,7 @@ html[data-bs-theme=dark] ::-webkit-scrollbar-corner { /* 设置滚动条滑槽 */ .blocklyDropDownDiv ::-webkit-scrollbar-track, .blocklyWidgetDiv ::-webkit-scrollbar-track { - background-color: rgba(255, 255, 255, 0.1); + background-color: transparent; border-radius: 0px; } diff --git a/common/templates/html/nav/nav.html b/common/templates/html/nav/nav.html index 091a8267..13f523d5 100644 --- a/common/templates/html/nav/nav.html +++ b/common/templates/html/nav/nav.html @@ -11,6 +11,14 @@ color: var(--lay-color-white) !important; } + html[data-bs-theme=light] ul[m-id="{{d.mId}}"] { + border-bottom: 1px solid #c9c9c9; + } + + html[data-bs-theme=dark] ul[m-id="{{d.mId}}"] { + border-bottom: 1px solid rgba(128, 128, 128, 0.35); + } + ul[m-id="{{d.mId}}"] button { position: relative; overflow: hidden;