diff options
| author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2022-10-18 16:34:46 +0300 |
|---|---|---|
| committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2022-10-18 16:34:46 +0300 |
| commit | f7ad4efb7de8f4456e44e16d5c156b898f36ebcb (patch) | |
| tree | 84c5d9bf63655a183f4f010715f0ed172fbfa099 /sass | |
| parent | e39a8fc01dcd20edfc3d10574e02763f7f912702 (diff) | |
| parent | bb93ce7e96a56901da9cb6e505d9fab152cd2d32 (diff) | |
.......... [ZBXNEXT-7469] updated to latest master; conflicts resolved in:
# create/src/schema.tmpl
# src/libs/zbxdbupgrade/dbupgrade_6030.c
# ui/app/views/monitoring.problem.view.php
# ui/app/views/popup.massupdate.service.php
# ui/include/classes/widgets/CWidgetHelper.php
# ui/include/classes/widgets/fields/CWidgetFieldMsHost.php
# ui/include/classes/widgets/fields/CWidgetFieldMsService.php
# ui/include/classes/widgets/fields/CWidgetFieldMsSla.php
# ui/include/classes/widgets/forms/CWidgetFormDataOver.php
# ui/include/classes/widgets/forms/CWidgetFormGeoMap.php
# ui/include/classes/widgets/forms/CWidgetFormProblemHosts.php
# ui/include/classes/widgets/forms/CWidgetFormProblems.php
# ui/include/classes/widgets/forms/CWidgetFormProblemsBySv.php
# ui/include/classes/widgets/forms/CWidgetFormTopHosts.php
# ui/include/classes/widgets/forms/CWidgetFormTrigOver.php
# ui/include/classes/widgets/forms/CWidgetFormWeb.php
# ui/include/defines.inc.php
Diffstat (limited to 'sass')
| -rw-r--r-- | sass/stylesheets/sass/components/_z-select.scss | 8 | ||||
| -rw-r--r-- | sass/stylesheets/sass/screen.scss | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sass/stylesheets/sass/components/_z-select.scss b/sass/stylesheets/sass/components/_z-select.scss index 8c3b5bd2b46..b271e18f58e 100644 --- a/sass/stylesheets/sass/components/_z-select.scss +++ b/sass/stylesheets/sass/components/_z-select.scss @@ -48,6 +48,14 @@ z-select, border-color: $form-border-color; box-shadow: none; } + + &.red { + color: $red; + + &:after { + color: $font-color; + } + } } .list { diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index ece5b68da36..85f91c6f590 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -6064,7 +6064,7 @@ button { } } - &:not(.interface-container-header):not(:empty) ~ .interface-container:not(:empty) { + &:not(.interface-container-header):not(:empty) ~ .interface-container:not(:empty) :first-child { .interface-cell:not(.interface-cell-details) { padding-top: 10px; margin-top: 5px; |