diff options
| author | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-03-18 13:44:11 +0300 |
|---|---|---|
| committer | Alexander Shubin <aleksandrs.subins@zabbix.com> | 2021-03-18 13:44:11 +0300 |
| commit | abf81774a331e95f7b2cf3a5a41a30abe3945262 (patch) | |
| tree | 41e9dcf5f16c2d6d2f90a09c849acbcba620c03d /sass | |
| parent | e65a68d2975eee8ed80a11c03ffd4c5db234e410 (diff) | |
| parent | c064cb1f3c9c0dd2935b210c3788f7b1952626af (diff) | |
.......... [ZBXNEXT-6309] merged dev branches
# Resolved conflicts:
# ChangeLog.d/feature/ZBXNEXT-6288
# ui/include/views/monitoring.screen.edit.php
# ui/include/views/monitoring.slideconf.edit.php
# ui/js/menupopup.js
Diffstat (limited to 'sass')
| -rw-r--r-- | sass/stylesheets/sass/hc-dark.scss | 1 | ||||
| -rw-r--r-- | sass/stylesheets/sass/screen.scss | 60 |
2 files changed, 0 insertions, 61 deletions
diff --git a/sass/stylesheets/sass/hc-dark.scss b/sass/stylesheets/sass/hc-dark.scss index 56e7e7bc2a2..dcd1c6a1871 100644 --- a/sass/stylesheets/sass/hc-dark.scss +++ b/sass/stylesheets/sass/hc-dark.scss @@ -467,7 +467,6 @@ $icon-btn: ( ); // Dynamically generated classes: -// .btn-conf // .btn-kiosk // .btn-max // .btn-min diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index b34aa857fe6..418235cd4e8 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -2058,7 +2058,6 @@ button { } $icon-btn: ( - conf: $btn-bg-color url($sprite-path) no-repeat -7px -187px, kiosk: $btn-bg-color url($sprite-path) no-repeat -79px -259px, min: $btn-bg-color url($sprite-path) no-repeat -7px -259px, add-fav: $btn-bg-color url($sprite-path) no-repeat -7px -295px, @@ -2068,7 +2067,6 @@ $icon-btn: ( ); // Dynamically generated classes: -// .btn-conf // .btn-kiosk // .btn-min // .btn-add-fav @@ -3604,64 +3602,6 @@ $form-icon-btn: ( } } -// Maps, Screens, Graphs. -.screen-table { - background-color: $ui-bg-color; - width: 100%; - - td { - padding: 2px 3px; - } - - .table-forms { - text-align: left; - } - - .list-table { - border: 0; - - td { - text-align: left; - padding: 6px 5px; - border: 0; - border-bottom: 1px solid $table-border-color; - - &.list-table-footer { - color: $font-alt-color; - text-align: right; - } - } - } - - .dashbrd-widget { - margin: 0; - border: 0; - - th { - padding: 6px 5px; - } - } - - .dashbrd-widget-head { - text-align: left; - padding: 4px 5px; - - li { - line-height: 2.9em; - } - } - - .dashbrd-widget-foot { - margin: 0; - } - - .nothing-to-show { - td { - text-align: center !important; - } - } -} - .dashed-border { td { border: 1px dashed $table-border-color; |