From bd800e4604d348f225e08e321a670bfc866df531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96=E8=AF=97=E9=9B=85?= Date: Wed, 29 Apr 2020 08:57:38 +0800 Subject: [PATCH] =?UTF-8?q?!970=20=E4=BF=AE=E5=A4=8D:=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E4=B8=BB=E9=A2=98=E7=9A=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/ToolBar/PropertiesPanel.less | 2 - src/UI/Css/blue.less | 2 +- src/UI/Css/golden.less | 102 ++++++++---------- src/UI/Css/switchTheme.less | 16 ++- 4 files changed, 49 insertions(+), 73 deletions(-) diff --git a/src/UI/Components/ToolBar/PropertiesPanel.less b/src/UI/Components/ToolBar/PropertiesPanel.less index e37fb8725..fb8874f26 100644 --- a/src/UI/Components/ToolBar/PropertiesPanel.less +++ b/src/UI/Components/ToolBar/PropertiesPanel.less @@ -11,7 +11,6 @@ margin: 10px 0; display: flex; justify-content: space-between; - background: #ced9e0; padding: 0 5px; align-items: center; } @@ -34,7 +33,6 @@ ul{//.props width: 100% !important; .li-title{ - background: #BFCCD6; padding: 5px; margin: 5px 0 0 0; width: 100%; diff --git a/src/UI/Css/blue.less b/src/UI/Css/blue.less index 3155432bc..e766b9992 100644 --- a/src/UI/Css/blue.less +++ b/src/UI/Css/blue.less @@ -94,7 +94,7 @@ } } -//tabs改颜色(详见颜色切换管理 .changeGolden) +//tabs改颜色(详见颜色切换管理 ..changeGoldenTheme) .tabs-unstyle .bp3-tab-list>*:not(:last-child) { margin: 0; } diff --git a/src/UI/Css/golden.less b/src/UI/Css/golden.less index 4316672f7..93fea3ce8 100644 --- a/src/UI/Css/golden.less +++ b/src/UI/Css/golden.less @@ -1,31 +1,26 @@ -//因为该样式被蓝图破坏,所以修正它. -.changeGolden( - @lm_header_bg:#202B33, - @lm_tab_bg:#30404D, - @lm_tab_active_shadow:#5C7080, +//因为某些样式被蓝图破坏,所以修正它. +//用于切换主题色 本文件在switchTheme.less中被引用 +//配色方案见https://blueprintjs.com/docs/#core/colors +.changeGoldenTheme( @lm_content_bg:#2C343A, @standrad_shadow:#000, @text_color_unactive:#76838E, @text_color_active:#fff, - @toolbar_bg:#30404D, - // @lm_vertical_opacity:1, + @toolbar_bg:#5C7080, @fileName_bg: #30404d, - @downpanel_bg: #5C7080, + @downpanel_bg: #4B6070, @command_result_text:#C4E1A4, @recommand_cmd_bg:#5C7080, @recommand_cmd_bg_hover:#8A9BA8, - @lm_close_tab_invert:0%, - @lm_splitter_bg:#000000, - @lm_splitter_hover_bg:#444444, - @topToolsBlock_btn_bg:#2d3a46, - @topToolsBlock_btn_bg_hover:#202b33, + @topToolsBlock_btn_bg:#394b59, + @topToolsBlock_btn_bg_hover:#4B6070, @topToolBar_bg:#5C7080, @topToolBar_ul_bg:#5C7080, - @topToolBar_smallIconList_btn_bg:#2D3A46, - @topToolBar_smallIconList_btn_bg_hover:#202b33, - @topToolBar_tablist_bg:#202b33, - @topToolBar_tablist_bg_hover:#394b59, + @topToolBar_smallIconList_btn_bg:#394b59, + @topToolBar_smallIconList_btn_bg_hover:#4B6070, + @topToolBar_tablist_bg:#4B6070, + @topToolBar_tablist_bg_hover:#5C7080, @topToolBar_tablist_color:#f5f8fa, @topToolBar_li_hover:#738694, @verticalTab_selected_bg:#394b59, @@ -33,51 +28,13 @@ @rightPanel_tabs_border:#25313a, @commandInput_bg:#2c343a, @commandInput_dragArea_bg:#394b59, - @terminalCommandResult_bg:#808080, - @commandPanel_li_bg_hover:#394B59, + @terminalCommandResult_bg:#5C7080, + @commandPanel_li_bg_hover:#8A9BA8, + @properties_header_bg:#202B33, + @properties_li_title_bg:#293742, + @templateParam_detail_title_bg:#394b59, ){ -/*-----GoldenLayout-CSS-----*/ -.lm_header{ - background: @lm_header_bg; -} -.lm_header .lm_tab { - line-height: 20px; - padding-bottom:6px; - background: @lm_tab_bg; - color: @text_color_unactive; - &:hover{ - color: @text_color_active; - } -} -.lm_header .lm_tab.lm_active { - padding-bottom:6px; - background: @lm_tab_bg; - - color: @text_color_active; - - width: 120px; - text-align: center; -} -.lm_content { - background: @lm_content_bg; -} -.lm_splitter{ - background:@lm_splitter_bg; - opacity:1; - transition:opacity 200ms ease; -} -.lm_splitter:hover,.lm_dragging{ - background:@lm_splitter_hover_bg; - opacity:1; -} -.lm-title{ - color: #000 !important; -} -.lm_close_tab { - filter: invert(@lm_close_tab_invert); -} - /*-----FileItem文件名-----*/ #bp3-tab-panel_Tabs_fl li[id] input { background-color: @fileName_bg; @@ -186,4 +143,29 @@ background-color:@fileName_bg } } +/*---------特性面板----------*/ +.properties{ + .bp3-card{ + .header{ + background: @properties_header_bg; + } + ul{//.props + .li-title{ + background: @properties_li_title_bg; + } + } + } +} +/*-------右侧模板参数--------*/ +#templateParam{ + .template-detail{ + &>ul{ + &>li:first-child{ + span { + background: @templateParam_detail_title_bg; + } + } + } + } +} } diff --git a/src/UI/Css/switchTheme.less b/src/UI/Css/switchTheme.less index 34ad5d225..4a8aa025f 100644 --- a/src/UI/Css/switchTheme.less +++ b/src/UI/Css/switchTheme.less @@ -1,27 +1,20 @@ @charset "utf-8"; @import (less) "golden.less"; .dark-golden{ - .changeGolden(); //黑夜 + .changeGoldenTheme(); //黑夜 } .light-golden{ - .changeGolden( - #d8e1e8,//@lm_header_bg - #EBF1F5,//@lm_tab_bg - #ffffff,//@lm_tab_active_shadow + .changeGoldenTheme( #cbd7e7,//@lm_content_bg #394B59,//@standrad_shadow #999999,//@text_color_unactive #10161A,//@text_color_active #f5f8fa,//@toolbar_bg - // 0, //@lm_vertical_opacity #ffffff,//@fileName_bg #E1E8ED,//@downpanel_bg #1D7324,//@command_result_text #E1E8ED,//@recommand_cmd_bg #A7B6C2,//@recommand_cmd_bg_hover - 100%, //@lm_close_tab_invert - #999999,//@lm_splitter_bg - #bbbbbb,//@lm_splitter_hover_bg #ced9e0,//@topToolsBlock_btn_bg #E1E8ED,//@topToolsBlock_btn_bg_hover #f5f8fa,//@topToolBar_bg @@ -38,6 +31,9 @@ #CED9E0,//@commandInput_bg #8A9BA8, //@commandInput_dragArea_bg #DCDCDC, //@terminalCommandResult_bg - #E1E8ED//@commandPanel_li_bg_hover + #E1E8ED,//@commandPanel_li_bg_hover + #BFCCD6,//@properties_header_bg + #ced9e0,//@properties_li_title_bg + #ccc//@templateParam_detail_title_bg ); //白天 }