diff options
author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2022-01-28 14:34:31 +0300 |
---|---|---|
committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2022-01-28 14:34:31 +0300 |
commit | 6d231ffc6945d8a31fd4f1268cc01ad90c2378b6 (patch) | |
tree | 4842de9e7d944887d15e4a32721cbfc43cde06f9 /sass | |
parent | f419747d3a4771afd950148c02b2908c57bfd810 (diff) | |
parent | dbd5c05608fb95df80e64704537e2b2edccdb161 (diff) |
.......... [ZBX-17748] updated to latest master; no conflicts
Diffstat (limited to 'sass')
-rwxr-xr-x | sass/stylesheets/sass/components/_color-picker.scss | 10 | ||||
-rwxr-xr-x | sass/stylesheets/sass/components/_z-bar-gauge.scss | 13 | ||||
-rw-r--r-- | sass/stylesheets/sass/components/dashboard/_widget-tophosts.scss | 41 | ||||
-rw-r--r-- | sass/stylesheets/sass/screen.scss | 2 |
4 files changed, 59 insertions, 7 deletions
diff --git a/sass/stylesheets/sass/components/_color-picker.scss b/sass/stylesheets/sass/components/_color-picker.scss index 0baf9aa3597..668c08977a8 100755 --- a/sass/stylesheets/sass/components/_color-picker.scss +++ b/sass/stylesheets/sass/components/_color-picker.scss @@ -5,7 +5,6 @@ background: url($sprite-path) no-repeat -323px -411px; border: 1px solid $form-border-color; color: $font-color; - vertical-align: inherit; } .use-default { @@ -18,23 +17,20 @@ right: 0; left: 0; text-align: center; + line-height: 22px; } } } .color-picker { display: inline-block; - line-height: 1.2; - vertical-align: sub; + line-height: 24px; .color-picker-preview { padding: 0; background-position: -321px -409px; width: 24px; - - &:after { - line-height: 22px; - } + vertical-align: top; } input:disabled + button { diff --git a/sass/stylesheets/sass/components/_z-bar-gauge.scss b/sass/stylesheets/sass/components/_z-bar-gauge.scss new file mode 100755 index 00000000000..2baf0c85ab3 --- /dev/null +++ b/sass/stylesheets/sass/components/_z-bar-gauge.scss @@ -0,0 +1,13 @@ +z-bar-gauge { + position: relative; + display: block; + height: 24px; + + &::part(bar) { + position: absolute; + top: 0; + left: 0; + border: 1px solid $form-border-color; + border-radius: 3px; + } +} diff --git a/sass/stylesheets/sass/components/dashboard/_widget-tophosts.scss b/sass/stylesheets/sass/components/dashboard/_widget-tophosts.scss new file mode 100644 index 00000000000..5b51a424cb2 --- /dev/null +++ b/sass/stylesheets/sass/components/dashboard/_widget-tophosts.scss @@ -0,0 +1,41 @@ +// Widget configuration. + +form.dashboard-grid-widget-tophosts { + $width-small: 150px; + + #list_columns .text { + @extend %overflow-ellipsis; + max-width: $width-small; + } + + #column { + max-width: $width-small; + } +} + +// Widget view. + +div.dashboard-grid-widget-tophosts { + $bar-gauge-height: 20px; + + .list-table th.center { + text-align: center; + } + + td { + line-height: $bar-gauge-height; + } + + .link-action { + white-space: nowrap; + } + + .item-value { + text-align: center; + } + + z-bar-gauge { + min-width: 64px; + height: $bar-gauge-height; + } +} diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index 2cb1116bd5b..7fda3e38897 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -31,6 +31,7 @@ $browser-sprite-path: '../img/browser-sprite.png?20211222'; @import "components/color-picker"; @import "components/dashboard/dashboard"; @import "components/dashboard/widget-item"; +@import "components/dashboard/widget-tophosts"; @import "components/diff"; @import "components/form-search"; @import "components/inline-filter"; @@ -42,6 +43,7 @@ $browser-sprite-path: '../img/browser-sprite.png?20211222'; @import "components/subfilter"; @import "components/tabfilter"; @import "components/toc"; +@import "components/z-bar-gauge"; @import "components/z-select"; @import "components/dashboard/widget-slareport"; |