diff --git a/apps/common/main/lib/controller/Themes.js b/apps/common/main/lib/controller/Themes.js index 48ea99edc..0a5bc48e7 100644 --- a/apps/common/main/lib/controller/Themes.js +++ b/apps/common/main/lib/controller/Themes.js @@ -61,6 +61,9 @@ define([ "text-secondary", "text-tertiary", "text-link", + "text-link-hover", + "text-link-active", + "text-link-visited", "text-inverse", "text-toolbar-header", "text-contrast-background", diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index f944eb714..fcc28aefd 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -39,6 +39,9 @@ --text-secondary: #a5a5a5; --text-tertiary: #a5a5a5; --text-link: #acbfff; + --text-link-hover: #acbfff; + --text-link-active: #acbfff; + --text-link-visited: #acbfff; --text-inverse: #fff; --text-toolbar-header: #fff; --text-contrast-background: #fff; @@ -116,6 +119,11 @@ --component-active-hover-icon-opacity: .8; --component-disabled-opacity: .3; + --header-component-normal-icon-opacity: 1; + --header-component-hover-icon-opacity: 1; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; + --menu-icon-item-checked-offset-x: -20px; } } diff --git a/apps/common/main/resources/less/colors-table-dark.less b/apps/common/main/resources/less/colors-table-dark.less index 28c206b53..8707a7755 100644 --- a/apps/common/main/resources/less/colors-table-dark.less +++ b/apps/common/main/resources/less/colors-table-dark.less @@ -39,6 +39,9 @@ --text-secondary: fade(#fff, 60%); --text-tertiary: fade(#fff, 40%); --text-link: #b5e4ff; + --text-link-hover: #b5e4ff; + --text-link-active: #b5e4ff; + --text-link-visited: #b5e4ff; --text-inverse: #333; --text-toolbar-header: fade(#fff, 80%); --text-contrast-background: #fff; @@ -116,6 +119,11 @@ --component-active-hover-icon-opacity: 1; --component-disabled-opacity: .3; + --header-component-normal-icon-opacity: .8; + --header-component-hover-icon-opacity: .8; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; + --menu-icon-item-checked-offset-x: -20px; } } diff --git a/apps/common/main/resources/less/colors-table.less b/apps/common/main/resources/less/colors-table.less index 7fc2a1a22..799715513 100644 --- a/apps/common/main/resources/less/colors-table.less +++ b/apps/common/main/resources/less/colors-table.less @@ -49,6 +49,9 @@ --text-secondary: fade(#000, 60%); --text-tertiary: fade(#000, 40%); --text-link: #445799; + --text-link-hover: #445799; + --text-link-active: #445799; + --text-link-visited: #445799; --text-inverse: #fff; --text-toolbar-header: #fff; --text-contrast-background: #fff; @@ -127,6 +130,11 @@ --component-active-icon-opacity: 1; --component-active-hover-icon-opacity: 1; --component-disabled-opacity: .4; + + --header-component-normal-icon-opacity: 1; + --header-component-hover-icon-opacity: 1; + --header-component-active-icon-opacity: 1; + --header-component-active-hover-icon-opacity: 1; //--button-icon-opacity: 1; } @@ -172,6 +180,9 @@ @text-secondary: var(--text-secondary); @text-tertiary: var(--text-tertiary); @text-link: var(--text-link); +@text-link-hover: var(--text-link-hover); +@text-link-active: var(--text-link-active); +@text-link-visited: var(--text-link-visited); @text-inverse: var(--text-inverse); @text-toolbar-header: var(--text-toolbar-header); @text-contrast-background: var(--text-contrast-background); @@ -207,6 +218,11 @@ @component-disabled-opacity: var(--component-disabled-opacity, .4); //@button-icon-opacity: var(--button-icon-opacity, 1); +@header-component-normal-icon-opacity: var(--header-component-normal-icon-opacity, 1); +@header-component-hover-icon-opacity: var(--header-component-hover-icon-opacity, 1); +@header-component-active-icon-opacity: var(--header-component-active-icon-opacity, 1); +@header-component-active-hover-icon-opacity: var(--header-component-active-hover-icon-opacity, 1); + @menu-icon-item-checked-offset-x: var(--menu-icon-item-checked-offset-x, 0); // Canvas diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 82a03b18e..9bed1c0f7 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -327,13 +327,24 @@ } .btn& { + &:not(:disabled) .icon { + opacity: @header-component-normal-icon-opacity; + } + &:active, &.active { .icon.toolbar__icon { &.icon--inverse { background-position-x: @button-header-active-icon-offset-x-ie; + opacity: @header-component-active-icon-opacity; } } } + + &:hover:not(:disabled) { + .icon { + opacity: @header-component-hover-icon-opacity; + } + } } svg.icon { diff --git a/apps/common/main/resources/less/synchronize-tip.less b/apps/common/main/resources/less/synchronize-tip.less index 64ebe4bc6..63cad1831 100644 --- a/apps/common/main/resources/less/synchronize-tip.less +++ b/apps/common/main/resources/less/synchronize-tip.less @@ -360,6 +360,16 @@ color: @text-link-ie; color: @text-link; cursor: pointer; + + &:hover:not(:disabled) { + color: @text-link-hover; + border-bottom-color: dotted @text-link-hover; + } + + &:active { + color: @text-link-active; + border-bottom-color: dotted @text-link-hover; + } } .asc-synchronizetip .close {