diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2022-07-04 10:25:27 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2022-07-07 13:06:33 +0300 |
| commit | dd86b10aca15c2ad35af309646cdce97ccf4a8f9 (patch) | |
| tree | 3b95a3febf37b5db0b829e8eb4cb4cc33771c1ee /sass | |
| parent | b2a26afe2aad635d4a1c2a6ae3df02c0c4f727f9 (diff) | |
..F....... [ZBX-20781] fixed overlapping of subfilter options
Merge in ZBX/zabbix from feature/ZBX-20781-6.0 to release/6.0
* commit '472e353c05cc7bdf099f603011214fb711bae92e':
..F....... [ZBX-20781] fixed wrong number of rows being shown in collapsed subfilter
..F....... [ZBX-20781] reverted c887290a3d9
..F....... [ZBX-20781] fixed wrong number of rows being shown in collapsed subfilter
..F....... [ZBX-20781] fixed selected tag rendering issue
..F....... [ZBX-20781] fixed overlapping of subfilter options
(cherry picked from commit 08a4fea6eae4bba8ee70dc7c888759214c60f24b)
(cherry picked from commit 47de5bf1c4cd91a40c5d8292060a561be1eedb91)
Diffstat (limited to 'sass')
| -rw-r--r-- | sass/stylesheets/sass/components/_expandable-subfilter.scss | 2 | ||||
| -rw-r--r-- | sass/stylesheets/sass/components/_subfilter.scss | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sass/stylesheets/sass/components/_expandable-subfilter.scss b/sass/stylesheets/sass/components/_expandable-subfilter.scss index 30f69c2d748..6a8b2e0fc16 100644 --- a/sass/stylesheets/sass/components/_expandable-subfilter.scss +++ b/sass/stylesheets/sass/components/_expandable-subfilter.scss @@ -8,7 +8,7 @@ overflow: hidden; &.ten-lines { - max-height: calc(#{$line-height} * 10); + max-height: calc(#{$line-height + 2} * 10); } > div { diff --git a/sass/stylesheets/sass/components/_subfilter.scss b/sass/stylesheets/sass/components/_subfilter.scss index 52ffa81361f..5f378799258 100644 --- a/sass/stylesheets/sass/components/_subfilter.scss +++ b/sass/stylesheets/sass/components/_subfilter.scss @@ -18,6 +18,9 @@ .subfilter { margin-right: 10px; white-space: nowrap; + line-height: 14px; + height: 16px; + margin-bottom: 2px; } .subfilter-enabled { |