diff options
| author | Aleksejs Cikuns <aleksejs.cikuns@zabbix.com> | 2022-02-25 15:21:19 +0300 |
|---|---|---|
| committer | Aleksejs Cikuns <aleksejs.cikuns@zabbix.com> | 2022-02-25 15:21:19 +0300 |
| commit | 150c7a73b4321da39fe953d47b823749c0d1e234 (patch) | |
| tree | 22ca35a4079a4f09aa7d2b77f41f13152f603ab4 /sass | |
| parent | 2824fa756c6353691cf09fbc489e17f6f7e79588 (diff) | |
| parent | 128565f28f16efa7ea48b639060bdeb753132d78 (diff) | |
.......... [ZBX-20049] updated to latest 5.0; resolved conflicts in:
# ui/tests/selenium/common/testFormApiTokens.php
Diffstat (limited to 'sass')
| -rw-r--r--[-rwxr-xr-x] | sass/stylesheets/sass/components/_color-picker.scss | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sass/stylesheets/sass/components/_subfilter.scss | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sass/stylesheets/sass/components/_z-bar-gauge.scss | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sass/stylesheets/sass/components/dashboard/_widget-slareport.scss | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss | 0 | ||||
| -rw-r--r-- | sass/stylesheets/sass/screen.scss | 7 |
6 files changed, 0 insertions, 7 deletions
diff --git a/sass/stylesheets/sass/components/_color-picker.scss b/sass/stylesheets/sass/components/_color-picker.scss index 668c08977a8..668c08977a8 100755..100644 --- a/sass/stylesheets/sass/components/_color-picker.scss +++ b/sass/stylesheets/sass/components/_color-picker.scss diff --git a/sass/stylesheets/sass/components/_subfilter.scss b/sass/stylesheets/sass/components/_subfilter.scss index 52ffa81361f..52ffa81361f 100755..100644 --- a/sass/stylesheets/sass/components/_subfilter.scss +++ b/sass/stylesheets/sass/components/_subfilter.scss diff --git a/sass/stylesheets/sass/components/_z-bar-gauge.scss b/sass/stylesheets/sass/components/_z-bar-gauge.scss index 2baf0c85ab3..2baf0c85ab3 100755..100644 --- a/sass/stylesheets/sass/components/_z-bar-gauge.scss +++ b/sass/stylesheets/sass/components/_z-bar-gauge.scss diff --git a/sass/stylesheets/sass/components/dashboard/_widget-slareport.scss b/sass/stylesheets/sass/components/dashboard/_widget-slareport.scss index f71d6e9aae3..f71d6e9aae3 100755..100644 --- a/sass/stylesheets/sass/components/dashboard/_widget-slareport.scss +++ b/sass/stylesheets/sass/components/dashboard/_widget-slareport.scss diff --git a/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss index 8f570c1a4f8..8f570c1a4f8 100755..100644 --- a/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss +++ b/sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index 3b164da3589..2c4ca616981 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -3082,14 +3082,7 @@ $form-icon-btn: ( z-select { text-align: left; padding: inherit; - } - li { - display: inline; - padding-left: 10px; - } - - z-select { li { display: block; padding-left: 5px; |