From a0f06dc51c2fc2a8e013d7c0e77b37532c7b8a91 Mon Sep 17 00:00:00 2001 From: Dmitry-Ilyushechkin Date: Mon, 27 Oct 2025 17:39:38 +0300 Subject: [PATCH] Removing unused color tokens --- apps/common/main/lib/controller/Themes.js | 8 -------- .../resources/less/colors-table-classic.less | 8 -------- .../less/colors-table-dark-contrast.less | 8 -------- .../main/resources/less/colors-table-dark.less | 8 -------- .../main/resources/less/colors-table-gray.less | 8 -------- .../main/resources/less/colors-table-ie-fix.less | 1 - .../main/resources/less/colors-table-night.less | 8 -------- .../main/resources/less/colors-table-white.less | 8 -------- .../common/main/resources/less/colors-table.less | 16 ---------------- .../themes/full-theme-dark.json.example | 8 -------- .../themes/full-theme-light.json.example | 8 -------- 11 files changed, 89 deletions(-) diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 6aae3e6608..ef68f858c8 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -201,7 +201,6 @@ define([ "background-normal", "background-toolbar", - "background-toolbar-additional", "background-primary-dialog-button", "background-notification-popover", "background-notification-badge", @@ -218,8 +217,6 @@ define([ "highlight-header-button-hover", "highlight-header-button-pressed", "highlight-text-select", - "highlight-accent-button-hover", - "highlight-accent-button-pressed", "highlight-toolbar-tab-underline-document", "highlight-toolbar-tab-underline-spreadsheet", "highlight-toolbar-tab-underline-presentation", @@ -234,12 +231,10 @@ define([ "border-toolbar", "border-divider", "border-regular-control", - "border-toolbar-button-hover", "border-preview-hover", "border-preview-select", "border-control-focus", "border-color-shading", - "border-error", "border-contrast-popover", "text-normal", @@ -257,10 +252,7 @@ define([ "icon-normal", "icon-normal-pressed", - "icon-inverse", "icon-toolbar-header", - "icon-notification-badge", - "icon-contrast-popover", "icon-success", "canvas-background", diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index 674959c11c..e1d6a34afd 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -16,7 +16,6 @@ --background-normal: #fff; --background-toolbar: #f1f1f1; --background-toolbar-tab: var(--background-toolbar); - --background-toolbar-additional: #f1f1f1; --background-primary-dialog-button: #7d858c; --background-accent-button: #446995; --background-notification-popover: #fcfed7; @@ -33,8 +32,6 @@ --highlight-button-pressed-hover: #7d858c; --highlight-primary-dialog-button-hover: #666d73; --highlight-primary-dialog-button-pressed: var(--highlight-primary-dialog-button-hover); - --highlight-accent-button-hover: #375478; - --highlight-accent-button-pressed: #293f59; --highlight-header-button-hover: fade(#000, 15%); --highlight-header-button-pressed: fade(#000, 25%); --highlight-text-select: #3494fb; @@ -58,12 +55,10 @@ --border-toolbar-active-tab: var(--background-toolbar); --border-divider: #cbcbcb; --border-regular-control: #cfcfcf; - --border-toolbar-button-hover: #d8dadc; --border-preview-hover: #cfcfcf; --border-preview-select: #848484; --border-control-focus: #848484; --border-color-shading: fade(#000, 20%); - --border-error: #d9534f; --border-contrast-popover: #fff; --border-button-pressed-focus: #444444; @@ -82,10 +77,7 @@ --icon-normal: #444; --icon-normal-pressed: #fff; - --icon-inverse: #444; --icon-toolbar-header: #fff; - --icon-notification-badge: #000; - --icon-contrast-popover: #fff; --icon-success: #5b9f27; // Canvas diff --git a/apps/common/main/resources/less/colors-table-dark-contrast.less b/apps/common/main/resources/less/colors-table-dark-contrast.less index 91c12b24aa..6fab023882 100644 --- a/apps/common/main/resources/less/colors-table-dark-contrast.less +++ b/apps/common/main/resources/less/colors-table-dark-contrast.less @@ -16,7 +16,6 @@ --background-normal: #212121; --background-toolbar: #2a2a2a; --background-toolbar-tab: var(--background-toolbar); - --background-toolbar-additional: #2a2a2a; --background-primary-dialog-button: #E6E6E6; --background-accent-button: #4d76a8; --background-notification-popover: #5f5d81; @@ -34,8 +33,6 @@ --highlight-button-pressed-hover: #828282; --highlight-primary-dialog-button-hover: #a6a6a6; --highlight-primary-dialog-button-pressed: var(--highlight-primary-dialog-button-hover); - --highlight-accent-button-hover: #75a2d6; - --highlight-accent-button-pressed: #89afdc; --highlight-header-button-hover: fade(#fff, 20%); --highlight-header-button-pressed: fade(#fff, 35%); --highlight-text-select: #96c8fd; @@ -47,12 +44,10 @@ --border-toolbar-active-panel-top: var(--border-toolbar); --border-toolbar-active-tab: var(--border-toolbar); --border-regular-control: #696969; - --border-toolbar-button-hover: #616161; --border-preview-hover: #828282; --border-preview-select: #888; --border-control-focus: #b8b8b8; --border-color-shading: fade(#fff, 15%); - --border-error: #f62211; --border-contrast-popover: #616161; --border-button-pressed-focus: #b8b8b8; @@ -71,10 +66,7 @@ --icon-normal: #e8e8e8; --icon-normal-pressed: #e8e8e8; - --icon-inverse: #2a2a2a; --icon-toolbar-header: #d0d0d0; - --icon-notification-badge: #121212; - --icon-contrast-popover: #fff; --icon-success: #090; --highlight-header-tab-underline-document: var(--text-toolbar-header); diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index 2a2247c9da..6fa9435a9b 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -17,7 +17,6 @@ --background-normal: #333; --background-toolbar: #404040; --background-toolbar-tab: var(--background-toolbar); - --background-toolbar-additional: #505050; --background-primary-dialog-button: #ddd; --background-accent-button: #486F9E; --background-notification-popover: #3e5968; @@ -35,8 +34,6 @@ --highlight-button-pressed-hover: #808080; --highlight-primary-dialog-button-hover: #fcfcfc; --highlight-primary-dialog-button-pressed: var(--highlight-primary-dialog-button-hover); - --highlight-accent-button-hover: #75a2d6; - --highlight-accent-button-pressed: #89afdc; --highlight-header-button-hover: fade(#fff, 15%); --highlight-header-button-pressed: fade(#fff, 25%); --highlight-text-select: #96c8fd; @@ -48,12 +45,10 @@ --border-toolbar-active-tab: var(--background-toolbar); --border-divider: #505050; --border-regular-control: #666; - --border-toolbar-button-hover: #5a5a5a; --border-preview-hover: #757575; --border-preview-select: #bdbdbd; --border-control-focus: #ccc; --border-color-shading: fade(#fff, 10%); - --border-error: #f62211; --border-contrast-popover: #666; --border-button-pressed-focus: #ccc; @@ -72,10 +67,7 @@ --icon-normal: fade(#fff, 80%); --icon-normal-pressed: fade(#fff, 80%); - --icon-inverse: #444; --icon-toolbar-header: fade(#fff, 80%); - --icon-notification-badge: #000; - --icon-contrast-popover: #fff; --icon-success: #090; --highlight-header-tab-underline-document: var(--text-toolbar-header); diff --git a/apps/common/main/resources/less/colors-table-gray.less b/apps/common/main/resources/less/colors-table-gray.less index 338c0541c0..8fa10668c4 100644 --- a/apps/common/main/resources/less/colors-table-gray.less +++ b/apps/common/main/resources/less/colors-table-gray.less @@ -17,7 +17,6 @@ --background-normal: #fff; --background-toolbar: #f7f7f7; --background-toolbar-tab: #cbcbcb; - --background-toolbar-additional: #efefef; --background-primary-dialog-button: #444; --background-accent-button: #446995; --background-notification-popover: #fcfed7; @@ -36,8 +35,6 @@ --highlight-button-pressed-hover: #bababa; --highlight-primary-dialog-button-hover: #1c1c1c; --highlight-primary-dialog-button-pressed: var(--highlight-primary-dialog-button-hover); - --highlight-accent-button-hover: #375478; - --highlight-accent-button-pressed: #293f59; --highlight-header-button-hover: #e0e0e0; --highlight-header-button-pressed: #cbcbcb; --highlight-text-select: #3494fb; @@ -49,12 +46,10 @@ --border-toolbar-active-tab: var(--background-toolbar-tab); --border-divider: #dfdfdf; --border-regular-control: #c0c0c0; - --border-toolbar-button-hover: #e0e0e0; --border-preview-hover: #bababa; --border-preview-select: #888; --border-control-focus: #848484; --border-color-shading: fade(#000, 15%); - --border-error: #f62211; --border-contrast-popover: #fff; --border-button-pressed-focus: #848484; @@ -73,10 +68,7 @@ --icon-normal: #444; --icon-normal-pressed: #444; - --icon-inverse: #444; --icon-toolbar-header: #444; - --icon-notification-badge: #000; - --icon-contrast-popover: #fff; --icon-success: #090; --highlight-header-tab-underline-document: var(--text-toolbar-header); diff --git a/apps/common/main/resources/less/colors-table-ie-fix.less b/apps/common/main/resources/less/colors-table-ie-fix.less index 62965de5e8..366d1090c8 100644 --- a/apps/common/main/resources/less/colors-table-ie-fix.less +++ b/apps/common/main/resources/less/colors-table-ie-fix.less @@ -61,7 +61,6 @@ @border-preview-select-ie: #848484; @border-control-focus-ie: #848484; @border-color-shading-ie: fade(#000, 20%); -@border-error-ie: #d9534f; @border-contrast-popover-ie: #fff; @border-button-pressed-focus-ie: #666d73; diff --git a/apps/common/main/resources/less/colors-table-night.less b/apps/common/main/resources/less/colors-table-night.less index e7e1b887b6..8e743a5e22 100644 --- a/apps/common/main/resources/less/colors-table-night.less +++ b/apps/common/main/resources/less/colors-table-night.less @@ -17,7 +17,6 @@ --background-normal: #404040; --background-toolbar: #404040; --background-toolbar-tab: #404040; - --background-toolbar-additional: #404040; --background-primary-dialog-button: #6e9fec; --background-accent-button: #6e9fec; --background-notification-popover: #1F2C5C; @@ -36,8 +35,6 @@ --highlight-button-pressed-hover: #7f7f7f; --highlight-primary-dialog-button-hover: #4a87e7; --highlight-primary-dialog-button-pressed: #446eca; - --highlight-accent-button-hover: #375478; - --highlight-accent-button-pressed: #293f59; --highlight-header-button-hover: #585858; --highlight-header-button-pressed: #686868; --highlight-text-select: #3494fb; @@ -49,12 +46,10 @@ --border-toolbar-active-tab: var(--background-toolbar-tab); --border-divider: #585858; --border-regular-control: #686868; - --border-toolbar-button-hover: #eaeaea; --border-preview-hover: #92B7F0; --border-preview-select: #4A87E7; --border-control-focus: #4A87E7; --border-color-shading: #686868; - --border-error: #f62211; --border-contrast-popover: #686868; --border-button-pressed-focus: #4A87E7; @@ -73,10 +68,7 @@ --icon-normal: #eaeaea; --icon-normal-pressed: #eaeaea; - --icon-inverse: #171717; --icon-toolbar-header: #eaeaea; - --icon-notification-badge: #eaeaea; - --icon-contrast-popover: #fff; --icon-success: #78b588; --highlight-header-tab-underline-document: #4a87e7; diff --git a/apps/common/main/resources/less/colors-table-white.less b/apps/common/main/resources/less/colors-table-white.less index 9ef1f04faa..8f90212cf7 100644 --- a/apps/common/main/resources/less/colors-table-white.less +++ b/apps/common/main/resources/less/colors-table-white.less @@ -17,7 +17,6 @@ --background-normal: #fff; --background-toolbar: #FFFFFF; --background-toolbar-tab: #fff; - --background-toolbar-additional: #efefef; --background-primary-dialog-button: #4A87E7; --background-accent-button: #4A87E7; --background-notification-popover: #fcfed7; @@ -36,8 +35,6 @@ --highlight-button-pressed-hover: #bababa; --highlight-primary-dialog-button-hover: #2566D5; --highlight-primary-dialog-button-pressed: #1E53AE; - --highlight-accent-button-hover: #375478; - --highlight-accent-button-pressed: #293f59; --highlight-header-button-hover: #eaeaea; --highlight-header-button-pressed: #e1e1e1; --highlight-text-select: #3494fb; @@ -49,12 +46,10 @@ --border-toolbar-active-tab: var(--background-toolbar-tab); --border-divider: #EAEAEA; --border-regular-control: #E1E1E1; - --border-toolbar-button-hover: #eaeaea; --border-preview-hover: #92B7F0; --border-preview-select: #4A87E7; --border-control-focus: #4A87E7; --border-color-shading: fade(#000, 15%); - --border-error: #f62211; --border-contrast-popover: #fff; --border-button-pressed-focus: #4A87E7; @@ -73,10 +68,7 @@ --icon-normal: #444; --icon-normal-pressed: #444; - --icon-inverse: #444; --icon-toolbar-header: #444; - --icon-notification-badge: #000; - --icon-contrast-popover: #fff; --icon-success: #090; --highlight-header-tab-underline-document: #446995; diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 418ed91866..374e524009 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -26,7 +26,6 @@ --background-normal: #fff; --background-toolbar: #f7f7f7; --background-toolbar-tab: var(--background-toolbar); - --background-toolbar-additional: #efefef; --background-primary-dialog-button: #444; --background-accent-button: #446995; --background-notification-popover: #fcfed7; @@ -45,8 +44,6 @@ --highlight-button-pressed-hover: #bababa; --highlight-primary-dialog-button-hover: #1c1c1c; --highlight-primary-dialog-button-pressed: var(--highlight-primary-dialog-button-hover); - --highlight-accent-button-hover: #375478; - --highlight-accent-button-pressed: #293f59; --highlight-header-button-hover: fade(#000, 15%); --highlight-header-button-pressed: fade(#000, 25%); --highlight-text-select: #3494fb; @@ -58,12 +55,10 @@ --border-toolbar-active-tab: var(--background-toolbar); --border-divider: #dfdfdf; --border-regular-control: #c0c0c0; - --border-toolbar-button-hover: #e0e0e0; --border-preview-hover: #bababa; --border-preview-select: #888; --border-control-focus: #848484; --border-color-shading: fade(#000, 15%); - --border-error: #f62211; --border-contrast-popover: #fff; --border-button-pressed-focus: #848484; @@ -82,10 +77,7 @@ --icon-normal: #444; --icon-normal-pressed: #444; - --icon-inverse: #fff; --icon-toolbar-header: #fff; - --icon-notification-badge: #000; - --icon-contrast-popover: #fff; --icon-success: #090; --highlight-header-tab-underline-document: var(--text-toolbar-header); @@ -398,7 +390,6 @@ @background-normal: var(--background-normal); @background-toolbar: var(--background-toolbar); @background-toolbar-tab: var(--background-toolbar-tab); -@background-toolbar-additional: var(--background-toolbar-additional); @background-primary-dialog-button: var(--background-primary-dialog-button); @background-notification-popover: var(--background-notification-popover); @background-notification-badge: var(--background-notification-badge); @@ -422,8 +413,6 @@ @highlight-header-button-hover: var(--highlight-header-button-hover); @highlight-header-button-pressed: var(--highlight-header-button-pressed); @highlight-text-select: var(--highlight-text-select); -@highlight-accent-button-hover: var(--highlight-accent-button-hover); -@highlight-accent-button-pressed: var(--highlight-accent-button-pressed); @highlight-fill-button-hover: var(--highlight-fill-button-hover); @highlight-fill-button-pressed: var(--highlight-fill-button-pressed); @@ -434,12 +423,10 @@ @border-regular-control: var(--border-regular-control); @border-toolbar-active-panel-top: var(--border-toolbar-active-panel-top); @border-toolbar-active-tab: var(--border-toolbar-active-tab); -@border-toolbar-button-hover: var(--border-toolbar-button-hover); @border-preview-hover: var(--border-preview-hover); @border-preview-select: var(--border-preview-select); @border-control-focus: var(--border-control-focus); @border-color-shading: var(--border-color-shading); -@border-error: var(--border-error); @border-contrast-popover: var(--border-contrast-popover); @border-button-pressed-focus: var(--border-button-pressed-focus); @@ -462,10 +449,7 @@ // ------------------------- @icon-normal: var(--icon-normal); @icon-normal-pressed: var(--icon-normal-pressed); -@icon-inverse: var(--icon-inverse); @icon-toolbar-header: var(--icon-toolbar-header); -@icon-contrast-popover: var(--icon-contrast-popover); -@icon-notification-badge: var(--icon-notification-badge); @icon-success: var(--icon-success); @button-small-normal-icon-offset-x: var(--button-small-normal-icon-offset-x,0); diff --git a/apps/common/main/resources/themes/full-theme-dark.json.example b/apps/common/main/resources/themes/full-theme-dark.json.example index 3f2c0b9d4e..3cfd23d1d4 100644 --- a/apps/common/main/resources/themes/full-theme-dark.json.example +++ b/apps/common/main/resources/themes/full-theme-dark.json.example @@ -17,7 +17,6 @@ "background-normal": "#333", "background-toolbar": "#404040", - "background-toolbar-additional": "#505050", "background-primary-dialog-button": "#c681ff", "background-accent-button": "#486F9E", "background-notification-popover": "#3e5968", @@ -31,8 +30,6 @@ "highlight-button-pressed": "#49617D", "highlight-button-pressed-hover": "#808080", "highlight-primary-dialog-button-hover": "#d39eff", - "highlight-accent-button-hover": "#75a2d6", - "highlight-accent-button-pressed": "#89afdc", "highlight-header-button-hover": "rgba(255, 255, 255, 0.05)", "highlight-header-button-pressed": "rgba(255, 255, 255, 0.15)", "highlight-text-select": "#96c8fd", @@ -41,12 +38,10 @@ "border-toolbar-active-panel-top": "#616161", "border-divider": "#505050", "border-regular-control": "#666", - "border-toolbar-button-hover": "#5a5a5a", "border-preview-hover": "#757575", "border-preview-select": "#bdbdbd", "border-control-focus": "#b948ff", "border-color-shading": "rgba(255, 255, 255, 0.1)", - "border-error": "#f62211", "border-contrast-popover": "#666", "text-normal": "rgba(255, 255, 255, 0.8)", @@ -64,10 +59,7 @@ "icon-normal": "rgba(255, 255, 255, 0.8)", "icon-normal-pressed": "rgba(255, 255, 255, 0.8)", - "icon-inverse": "#444", "icon-toolbar-header": "rgba(255, 255, 255, 0.8)", - "icon-notification-badge": "#000", - "icon-contrast-popover": "#fff", "icon-success": "#090", "canvas-background": "#555", diff --git a/apps/common/main/resources/themes/full-theme-light.json.example b/apps/common/main/resources/themes/full-theme-light.json.example index 159837d390..7dc4bded75 100644 --- a/apps/common/main/resources/themes/full-theme-light.json.example +++ b/apps/common/main/resources/themes/full-theme-light.json.example @@ -17,7 +17,6 @@ "background-normal": "#fff", "background-toolbar": "#f7f7f7", - "background-toolbar-additional": "#efefef", "background-primary-dialog-button": "#2e8df2", "background-accent-button": "#446995", "background-notification-popover": "#fcfed7", @@ -32,8 +31,6 @@ "highlight-button-pressed": "#cbcbcb", "highlight-button-pressed-hover": "#bababa", "highlight-primary-dialog-button-hover": "#52a6ff", - "highlight-accent-button-hover": "#375478", - "highlight-accent-button-pressed": "#293f59", "highlight-header-button-hover": "rgba(255, 255, 255, 0.15)", "highlight-header-button-pressed": "rgba(255, 255, 255, 0.25)", "highlight-text-select": "#3494fb", @@ -42,12 +39,10 @@ "border-toolbar-active-panel-top": "var(--background-toolbar)", "border-divider": "#dfdfdf", "border-regular-control": "#c0c0c0", - "border-toolbar-button-hover": "#e0e0e0", "border-preview-hover": "#bababa", "border-preview-select": "#888", "border-control-focus": "#2e8df2", "border-color-shading": "rgba(0, 0, 0, 0.15)", - "border-error": "#f62211", "border-contrast-popover": "#fff", "text-normal": "rgba(0, 0, 0, 0.8)", @@ -65,10 +60,7 @@ "icon-normal": "#444", "icon-normal-pressed": "#444", - "icon-inverse": "#fff", "icon-toolbar-header": "#fff", - "icon-notification-badge": "#000", - "icon-contrast-popover": "#fff", "icon-success": "#090", "canvas-background": "#eee",