diff options
author | Aleksejs Cikuns <aleksejs.cikuns@zabbix.com> | 2022-03-03 15:45:08 +0300 |
---|---|---|
committer | Aleksejs Cikuns <aleksejs.cikuns@zabbix.com> | 2022-03-03 15:47:39 +0300 |
commit | 1f1b2d653e3f4c4654ddabf4bd9319b34ecd5b8c (patch) | |
tree | 05d5a975ce5de254b8892f187f877b2c4b4409b8 /sass | |
parent | 707e2608f206d77722d2377da09f7c79a629e11a (diff) |
..F....... [ZBX-20049] implemented keyboard control for info icons
Diffstat (limited to 'sass')
-rw-r--r-- | sass/stylesheets/sass/base/_colors.scss | 1 | ||||
-rw-r--r-- | sass/stylesheets/sass/hc-dark.scss | 22 | ||||
-rw-r--r-- | sass/stylesheets/sass/hc-light.scss | 26 | ||||
-rw-r--r-- | sass/stylesheets/sass/screen.scss | 110 |
4 files changed, 123 insertions, 36 deletions
diff --git a/sass/stylesheets/sass/base/_colors.scss b/sass/stylesheets/sass/base/_colors.scss index 65d603dce45..5e9f9b51e9f 100644 --- a/sass/stylesheets/sass/base/_colors.scss +++ b/sass/stylesheets/sass/base/_colors.scss @@ -154,6 +154,7 @@ $btn-form-font-color: #1f2c33 !default; $btn-form-bg-color: $form-bg-color !default; $btn-form-hover-color: #e8f5ff !default; $btn-form-border-color: $form-border-color !default; +$btn-border-focus-color: rgba(#1e87e3, .35) !default; $btn-disabled-font-color: #acbbc2 !default; $btn-disabled-bg-color: #ebebeb !default; diff --git a/sass/stylesheets/sass/hc-dark.scss b/sass/stylesheets/sass/hc-dark.scss index ecd33b9eed7..f37e7a1f3e6 100644 --- a/sass/stylesheets/sass/hc-dark.scss +++ b/sass/stylesheets/sass/hc-dark.scss @@ -440,23 +440,21 @@ $diff-removed-bg-color: transparent; } $var-icons: ( - maint: url($sprite-path) no-repeat -357px -802px, - depend-up: url($sprite-path) no-repeat -361px -729px, - depend-down: url($sprite-path) no-repeat -361px -765px, - ackn: url($sprite-path) no-repeat -357px -693px + maintenance: -359px -803px, + depend-up: -359px -731px, + depend-down: -359px -766px, + ackn: -357px -693px ); // Dynamically generated classes: -// .icon-maint +// .icon-maintenance // .icon-depend-up // .icon-depend-down // .icon-ackn @each $var-icons, $bgimage in $var-icons { .icon-#{$var-icons} { - margin: 0 18px 0 0; &::before { - background: $bgimage; - @extend %var-icons; + background-position: $bgimage; } } } @@ -934,8 +932,12 @@ a.link-action { } } - .icon-maint::before { - background-position: -360px -804px; + .icon-depend-up::before { + background-position: -361px -731px, + } + + .icon-depend-down::before { + background-position: -361px -767px } .icon-wzrd-action { diff --git a/sass/stylesheets/sass/hc-light.scss b/sass/stylesheets/sass/hc-light.scss index c43aabe3d8f..6193a5539cb 100644 --- a/sass/stylesheets/sass/hc-light.scss +++ b/sass/stylesheets/sass/hc-light.scss @@ -367,23 +367,21 @@ $diff-removed-bg-color: transparent; } $var-icons: ( - maint: url($sprite-path) no-repeat -203px -802px, - depend-up: url($sprite-path) no-repeat -208px -729px, - depend-down: url($sprite-path) no-repeat -208px -765px, - ackn: url($sprite-path) no-repeat -203px -693px + maintenance: -205px -803px, + depend-up: -206px -731px, + depend-down: -206px -766px, + ackn: -203px -693px ); // Dynamically generated classes: -// .icon-maint +// .icon-maintenance // .icon-depend-up // .icon-depend-down // .icon-ackn @each $var-icons, $bgimage in $var-icons { .icon-#{$var-icons} { - margin: 0 18px 0 0; &::before { - background: $bgimage; - @extend %var-icons; + background-position: $bgimage; } } } @@ -811,8 +809,16 @@ a.link-action { box-shadow: inset 0 -1px 0 0 $table-border-color; - .icon-maint::before { - background-position: -206px -804px; + .icon-depend-up::before { + background-position: -208px -731px; + } + + .icon-depend-down::before { + background-position: -208px -767px; + } + + .icon-wzrd-action { + background: transparent url($sprite-path) no-repeat -318px -624px; } .icon-wzrd-action { diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index 701caa71484..2d451b56bed 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -307,6 +307,18 @@ form { } } + td { + .icon-maintenance { + margin: 0 0 -3px 4px; + } + + .icon-depend-up, + .icon-depend-down, + .icon-ackn { + margin: 0 4px -3px 0; + } + } + &.compact-view { tr { &[class*='flh-'] { @@ -427,6 +439,7 @@ form { &::after { margin: 0; line-height: 14px; + top: 0; } &:last-of-type { @@ -434,11 +447,6 @@ form { } } - [class*='icon-depend-'] { - width: 12px; - margin-right: 0; - } - .rel-container { span { margin: 0; @@ -465,12 +473,11 @@ form { } } - .icon-maint { - position: relative; - display: inline-block; + .icon-maintenance { height: 12px; width: 12px; - margin: 3px 1px 2px 2px !important; + margin: 3px 1px 2px 4px; + &::before { height: 12px; @@ -479,6 +486,19 @@ form { } } + .icon-depend-up, + .icon-depend-down { + width: 12px; + } + + .icon-depend-up::before { + background-position: -49px -731px; + } + + .icon-depend-down::before { + background-position: -49px -767px; + } + .icon-wzrd-action { background: url($sprite-path) no-repeat -6px -624px; height: 12px; @@ -2605,23 +2625,43 @@ button[disabled] { } $var-icons: ( - maint: url($sprite-path) no-repeat -46px -802px, - depend-up: url($sprite-path) no-repeat -49px -729px, - depend-down: url($sprite-path) no-repeat -49px -765px, - ackn: url($sprite-path) no-repeat -45px -693px + maintenance: url($sprite-path) no-repeat -47px -803px, + depend-up: url($sprite-path) no-repeat -47px -731px, + depend-down: url($sprite-path) no-repeat -47px -767px, + ackn: url($sprite-path) no-repeat -47px -694px ); // Dynamically generated classes: -// .icon-maint +// .icon-maintenance // .icon-depend-up // .icon-depend-down // .icon-ackn @each $var-icons, $bgimage in $var-icons { .icon-#{$var-icons} { margin: 0 18px 0 0; + position: relative; + display: inline-block; + width: 16px; + height: 16px; + border-radius: 2px; + &::before { - background: $bgimage; @extend %var-icons; + background: $bgimage; + width: 14px; + height: 14px; + left: 1px; + top: 1px; + } + + &:link, + &:hover, + &:focus { + border-bottom: none; + } + + &:focus { + box-shadow: 0 0 0 2px $btn-border-focus-color; } } } @@ -2730,6 +2770,16 @@ $form-icon-btn: ( cursor: pointer; margin: -12px 0 -4px; + &:link, + &:hover, + &:focus { + border-bottom: 1px solid; + } + + &:focus { + box-shadow: 0 0 0 2px $btn-border-focus-color; + } + &::before { content: ''; display: inline-block; @@ -2740,6 +2790,22 @@ $form-icon-btn: ( height: 14px; background: url($sprite-path) no-repeat -47px -659px; } + + &.status-red { + &:link, + &:hover, + &:focus { + border-color: darken(desaturate($alt-red, 10%), 9%); + } + } + + &.status-yellow { + &:link, + &:hover, + &:focus { + border-color: darken(desaturate($alt-yellow, 9%), 20%); + } + } } // Installation. @@ -5657,7 +5723,19 @@ button { } .icon-description { - margin: 0 0 0 5px; + margin: 0 0 -5px 5px; + vertical-align: baseline; + border-radius: 2px; + + &:link, + &:hover, + &:focus { + border-bottom: none; + } + + &:focus { + box-shadow: 0 0 0 2px $btn-border-focus-color; + } &::after { content: '?'; |