From 8ea4360f6e713e91ccc7882e8ade07599b4e2368 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 17 Nov 2020 15:04:42 +0300 Subject: [PATCH] [SSE, PE] changed @gray-dark to @border-toolbar --- .../main/resources/less/app.less | 1 + .../main/resources/less/leftmenu.less | 12 +++++------ .../main/resources/less/rightmenu.less | 6 +++--- .../main/resources/less/statusbar.less | 4 ++-- .../main/resources/less/app.less | 1 + .../main/resources/less/celleditor.less | 14 ++++++------- .../main/resources/less/layout.less | 4 ++-- .../main/resources/less/leftmenu.less | 14 ++++++------- .../main/resources/less/rightmenu.less | 6 +++--- .../main/resources/less/statusbar.less | 20 +++++++++---------- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/apps/presentationeditor/main/resources/less/app.less b/apps/presentationeditor/main/resources/less/app.less index 7d38ffd86..1da57c2d0 100644 --- a/apps/presentationeditor/main/resources/less/app.less +++ b/apps/presentationeditor/main/resources/less/app.less @@ -9,6 +9,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; +@import "../../../../common/main/resources/less/colors-table.less"; // // Bootstrap diff --git a/apps/presentationeditor/main/resources/less/leftmenu.less b/apps/presentationeditor/main/resources/less/leftmenu.less index df7ffd857..7d69c96e2 100644 --- a/apps/presentationeditor/main/resources/less/leftmenu.less +++ b/apps/presentationeditor/main/resources/less/leftmenu.less @@ -6,7 +6,7 @@ overflow: hidden; .tool-menu-btns { - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; } } } @@ -17,8 +17,8 @@ border-right: 0 none; &.move { - border-left: 1px solid @gray-dark; - border-right: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; + border-right: 1px solid @border-toolbar; opacity: 0.4; } } @@ -39,7 +39,7 @@ .left-panel { padding-left: 40px; height: 100%; - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; #left-panel-chat { height: 100%; @@ -91,7 +91,7 @@ .panel-menu { width: 260px; float: left; - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; background-color: @gray-light; li { @@ -354,7 +354,7 @@ } .dataview { - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { display: block; diff --git a/apps/presentationeditor/main/resources/less/rightmenu.less b/apps/presentationeditor/main/resources/less/rightmenu.less index 2f371c1d9..de34db69f 100644 --- a/apps/presentationeditor/main/resources/less/rightmenu.less +++ b/apps/presentationeditor/main/resources/less/rightmenu.less @@ -2,7 +2,7 @@ .tool-menu.right { .tool-menu-btns { position: absolute; - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; background-color: @gray-light; right: 0; overflow: hidden; @@ -16,7 +16,7 @@ padding: 0 10px 0 15px; position: relative; overflow: hidden; - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; line-height: 15px; } @@ -70,7 +70,7 @@ width: 100%; resize: none; margin-bottom: 5px; - border: 1px solid @gray-dark; + border: 1px solid @border-toolbar; height: 100%; &.disabled { diff --git a/apps/presentationeditor/main/resources/less/statusbar.less b/apps/presentationeditor/main/resources/less/statusbar.less index 595a0bdea..74bf73dfc 100644 --- a/apps/presentationeditor/main/resources/less/statusbar.less +++ b/apps/presentationeditor/main/resources/less/statusbar.less @@ -3,7 +3,7 @@ padding: 2px; height: 25px; background-color: @gray-light; - .box-inner-shadow(0 1px 0 @gray-dark); + .box-inner-shadow(0 1px 0 @border-toolbar); .status-label { font-weight: bold; @@ -173,7 +173,7 @@ height: 12px; display: inline-block; vertical-align: middle; - border: 1px solid @gray-dark; + border: 1px solid @border-toolbar; } .name { diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index d73ccfb91..d0b4e1f00 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -9,6 +9,7 @@ // Bootstrap overwrite @import "../../../../common/main/resources/less/variables.less"; +@import "../../../../common/main/resources/less/colors-table.less"; // // Bootstrap diff --git a/apps/spreadsheeteditor/main/resources/less/celleditor.less b/apps/spreadsheeteditor/main/resources/less/celleditor.less index 3cbb6c018..ba00cd590 100644 --- a/apps/spreadsheeteditor/main/resources/less/celleditor.less +++ b/apps/spreadsheeteditor/main/resources/less/celleditor.less @@ -1,13 +1,13 @@ #cell-editing-box { - border-bottom: solid 1px @gray-dark; - border-left: solid 1px @gray-dark; + border-bottom: solid 1px @border-toolbar; + border-left: solid 1px @border-toolbar; min-height: 20px; background-color: #fff; .ce-group-name { float: left; height: 20px; - border-bottom: 1px solid @gray-dark; + border-bottom: 1px solid @border-toolbar; background-color: @gray-light; #ce-cell-name { @@ -17,7 +17,7 @@ vertical-align: top; display: inline-block; border: 0 none; - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; transition: none; -webkit-transition: none; @@ -75,7 +75,7 @@ padding-left: 1px; margin: 0 16px 0 120px; height: 100%; - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; #ce-cell-content { height: 100%; @@ -102,8 +102,8 @@ border-bottom: 0 none; &.move { - border-top: 1px solid @gray-dark; - border-bottom: 1px solid @gray-dark; + border-top: 1px solid @border-toolbar; + border-bottom: 1px solid @border-toolbar; opacity: 0.4; } } diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less index 9d7149026..8a5ec5a6d 100644 --- a/apps/spreadsheeteditor/main/resources/less/layout.less +++ b/apps/spreadsheeteditor/main/resources/less/layout.less @@ -52,8 +52,8 @@ label { } #editor_sdk { - border-top: 1px solid @gray-dark; - border-left: 1px solid @gray-dark; + border-top: 1px solid @border-toolbar; + border-left: 1px solid @border-toolbar; } .layout-resizer { diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 3700d16ba..e160b7aef 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -6,7 +6,7 @@ overflow: hidden; .tool-menu-btns { - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; } } } @@ -17,8 +17,8 @@ border-right: 0 none; &.move { - border-left: 1px solid @gray-dark; - border-right: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; + border-right: 1px solid @border-toolbar; opacity: 0.4; } } @@ -39,7 +39,7 @@ .left-panel { padding-left: 40px; height: 100%; - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; #left-panel-chat { height: 100%; @@ -91,7 +91,7 @@ .panel-menu { width: 260px; float: left; - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; background-color: @gray-light; li { @@ -209,7 +209,7 @@ #id-settings-menu { .dataview { - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { display: block; @@ -418,7 +418,7 @@ } .dataview { - border-right: 1px solid @gray-dark; + border-right: 1px solid @border-toolbar; & > div:not([class^=ps-scrollbar]) { display: block; diff --git a/apps/spreadsheeteditor/main/resources/less/rightmenu.less b/apps/spreadsheeteditor/main/resources/less/rightmenu.less index 6dadc6928..63b3a0fee 100644 --- a/apps/spreadsheeteditor/main/resources/less/rightmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/rightmenu.less @@ -2,7 +2,7 @@ .tool-menu.right { .tool-menu-btns { position: absolute; - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; background-color: @gray-light; right: 0; overflow: hidden; @@ -16,7 +16,7 @@ padding: 0 10px 0 15px; position: relative; overflow: hidden; - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; line-height: 15px; } @@ -70,7 +70,7 @@ width: 100%; resize: none; margin-bottom: 5px; - border: 1px solid @gray-dark; + border: 1px solid @border-toolbar; height: 100%; &.disabled { diff --git a/apps/spreadsheeteditor/main/resources/less/statusbar.less b/apps/spreadsheeteditor/main/resources/less/statusbar.less index 605376404..46d9b20c5 100644 --- a/apps/spreadsheeteditor/main/resources/less/statusbar.less +++ b/apps/spreadsheeteditor/main/resources/less/statusbar.less @@ -2,7 +2,7 @@ padding: 0 2px 0; height: 25px; background-color: @gray-light; - .box-inner-shadow(0 1px 0 @gray-dark); + .box-inner-shadow(0 1px 0 @border-toolbar); z-index: 500; #status-tabs-scroll { @@ -96,7 +96,7 @@ height: 12px; display: inline-block; vertical-align: middle; - border: 1px solid @gray-dark; + border: 1px solid @border-toolbar; } .name { @@ -114,8 +114,8 @@ #status-addtabs-box { float: left; padding: 3px 8px 0 8px; - border-left: 1px solid @gray-dark; - border-right: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; + border-right: 1px solid @border-toolbar; height: 25px; } @@ -180,13 +180,13 @@ margin-right: -1px; background-color: @gray-light; outline: none; - border-left: 1px solid @gray-dark; - border-right: 1px solid @gray-dark; - border-top: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; + border-right: 1px solid @border-toolbar; + border-top: 1px solid @border-toolbar; &:hover { - border-top-color: @gray-dark; - border-bottom-color: @gray-dark; + border-top-color: @border-toolbar; + border-bottom-color: @border-toolbar; color: @black !important; } } @@ -278,7 +278,7 @@ &.right { > span { - border-left: 1px solid @gray-dark; + border-left: 1px solid @border-toolbar; border-right: 2px solid @gray-deep; padding-right: 9px; padding-left: 10px;