From 3e6bffa193f96e43861060ce3469d13d7c7ea1e1 Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Thu, 15 Mar 2018 16:55:39 +0300 Subject: [PATCH] triggers panel: fix broken styles, #522 --- dist/css/grafana-zabbix.dark.css | 32 ++++-- dist/css/grafana-zabbix.dark.css.map | 2 +- dist/css/grafana-zabbix.light.css | 32 ++++-- dist/css/grafana-zabbix.light.css.map | 2 +- dist/panel-triggers/partials/module.html | 132 ++++++++++++----------- src/panel-triggers/partials/module.html | 132 ++++++++++++----------- src/sass/_panel-triggers.scss | 36 +++++-- 7 files changed, 211 insertions(+), 157 deletions(-) diff --git a/dist/css/grafana-zabbix.dark.css b/dist/css/grafana-zabbix.dark.css index 818d44888..cb8d8f58e 100644 --- a/dist/css/grafana-zabbix.dark.css +++ b/dist/css/grafana-zabbix.dark.css @@ -3,30 +3,40 @@ .triggers-panel-container { position: relative; } + .triggers-panel-container .zabbix-trigger-name { + font-weight: bold; } .triggers-panel-container .zabbix-hostname { color: #8e8e8e; margin-left: 1rem; - font-weight: bold; } - .triggers-panel-container .alert-list-info.zbx-description { - color: #b3b3b3; } + font-weight: 500; } + .triggers-panel-container .zbx-description { + color: #b3b3b3; + font-weight: normal; + margin-left: 0.6rem; } + .triggers-panel-container .zbx-description--newline { + margin-left: 0rem; } .triggers-panel-container .zbx-trigger-tags { margin-left: 0.6rem; } .triggers-panel-container .zbx-trigger-tags .zbx-tag { color: #ECECEC; - padding: 0px 6px; + font-weight: 500; + font-size: 12px; + margin-right: 4px; + padding: 1px 6px; cursor: pointer; } .triggers-panel-container .alert-list-footer { justify-content: flex-start; } .triggers-panel-container .trigger-info-block { - display: inline-flex; } + display: flex; } .triggers-panel-container .trigger-info-block i, .triggers-panel-container .trigger-info-block a { - margin-left: 0.6rem; + margin-right: 0.3rem; color: #8e8e8e; } - .triggers-panel-container .trigger-info-block .zabbix-trigger-source { - margin-right: 1.5rem; - font-weight: bold; } - .triggers-panel-container .trigger-info-block .zabbix-trigger-source .gicon-datasources { - opacity: 0.4; } + .triggers-panel-container .zabbix-trigger-source { + margin-right: 1.5rem; + margin-left: 1rem; + font-weight: 500; } + .triggers-panel-container .zabbix-trigger-source .gicon-datasources { + opacity: 0.4; } .triggers-panel-container .card-item-wrapper { padding-left: 4px; } diff --git a/dist/css/grafana-zabbix.dark.css.map b/dist/css/grafana-zabbix.dark.css.map index 490b2af30..1b669bce7 100644 --- a/dist/css/grafana-zabbix.dark.css.map +++ b/dist/css/grafana-zabbix.dark.css.map @@ -9,6 +9,6 @@ "../../src/sass/_panel-triggers.scss", "../../src/sass/_query_editor.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/css/grafana-zabbix.light.css b/dist/css/grafana-zabbix.light.css index d8d6830a8..10d456683 100644 --- a/dist/css/grafana-zabbix.light.css +++ b/dist/css/grafana-zabbix.light.css @@ -3,30 +3,40 @@ .triggers-panel-container { position: relative; } + .triggers-panel-container .zabbix-trigger-name { + font-weight: bold; } .triggers-panel-container .zabbix-hostname { color: #767980; margin-left: 1rem; - font-weight: bold; } - .triggers-panel-container .alert-list-info.zbx-description { - color: #acb6bf; } + font-weight: 500; } + .triggers-panel-container .zbx-description { + color: #acb6bf; + font-weight: normal; + margin-left: 0.6rem; } + .triggers-panel-container .zbx-description--newline { + margin-left: 0rem; } .triggers-panel-container .zbx-trigger-tags { margin-left: 0.6rem; } .triggers-panel-container .zbx-trigger-tags .zbx-tag { color: #e9edf2; - padding: 0px 6px; + font-weight: 500; + font-size: 12px; + margin-right: 4px; + padding: 1px 6px; cursor: pointer; } .triggers-panel-container .alert-list-footer { justify-content: flex-start; } .triggers-panel-container .trigger-info-block { - display: inline-flex; } + display: flex; } .triggers-panel-container .trigger-info-block i, .triggers-panel-container .trigger-info-block a { - margin-left: 0.6rem; + margin-right: 0.3rem; color: #767980; } - .triggers-panel-container .trigger-info-block .zabbix-trigger-source { - margin-right: 1.5rem; - font-weight: bold; } - .triggers-panel-container .trigger-info-block .zabbix-trigger-source .gicon-datasources { - opacity: 0.4; } + .triggers-panel-container .zabbix-trigger-source { + margin-right: 1.5rem; + margin-left: 1rem; + font-weight: 500; } + .triggers-panel-container .zabbix-trigger-source .gicon-datasources { + opacity: 0.4; } .triggers-panel-container .card-item-wrapper { padding-left: 4px; } diff --git a/dist/css/grafana-zabbix.light.css.map b/dist/css/grafana-zabbix.light.css.map index 661fa8d3e..654d90caf 100644 --- a/dist/css/grafana-zabbix.light.css.map +++ b/dist/css/grafana-zabbix.light.css.map @@ -9,6 +9,6 @@ "../../src/sass/_panel-triggers.scss", "../../src/sass/_query_editor.scss" ], - "mappings": "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", + "mappings": "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", "names": [] } \ No newline at end of file diff --git a/dist/panel-triggers/partials/module.html b/dist/panel-triggers/partials/module.html index b025176af..5a23affb2 100644 --- a/dist/panel-triggers/partials/module.html +++ b/dist/panel-triggers/partials/module.html @@ -1,77 +1,87 @@
-
    -
  1. -
    -
    -
    - -
    -
    -

    - {{trigger.description}} - - - {{ ctrl.formatHostName(trigger) }} - - - {{ ctrl.formatHostGroups(trigger) }} - +

      + +
    1. - - - {{tag.tag}}: {{tag.value}} - - -

      + +
      + +
      -

      - - {{ctrl.triggerStatusMap[trigger.value]}} - - - {{trigger.severity}} - - {{trigger.age && "for " + trigger.age}} +

      +
      - - -

      -

      - +

      + {{trigger.description}} + + + {{ ctrl.formatHostName(trigger) }} + + + {{ ctrl.formatHostGroups(trigger) }} + + + + + {{tag.tag}}: {{tag.value}} -

      + +

      + +
      + + {{ctrl.triggerStatusMap[trigger.value]}} + + + {{trigger.severity}} + + + {{trigger.age && "for " + trigger.age}} + + +
      -
      -
      -
      - - - {{trigger.datasource}} + + +
      + - {{trigger.lastchange || "last change unknown"}}
      -
      - - - +
      +
      + + +
      + + + {{trigger.datasource}} + +
      - - - +
      + {{trigger.lastchange || "last change unknown"}} - - -
      +
      + + + + + + + + + +
      2. diff --git a/src/panel-triggers/partials/module.html b/src/panel-triggers/partials/module.html index b025176af..5a23affb2 100644 --- a/src/panel-triggers/partials/module.html +++ b/src/panel-triggers/partials/module.html @@ -1,77 +1,87 @@
      -
        -
      1. -
        -
        -
        - -
        -
        -

        - {{trigger.description}} - - - {{ ctrl.formatHostName(trigger) }} - - - {{ ctrl.formatHostGroups(trigger) }} - +

          + +
        1. - - - {{tag.tag}}: {{tag.value}} - - -

          + +
          + +
          -

          - - {{ctrl.triggerStatusMap[trigger.value]}} - - - {{trigger.severity}} - - {{trigger.age && "for " + trigger.age}} +

          +
          - - -

          -

          - +

          + {{trigger.description}} + + + {{ ctrl.formatHostName(trigger) }} + + + {{ ctrl.formatHostGroups(trigger) }} + + + + + {{tag.tag}}: {{tag.value}} -

          + +

          + +
          + + {{ctrl.triggerStatusMap[trigger.value]}} + + + {{trigger.severity}} + + + {{trigger.age && "for " + trigger.age}} + + +
          -
          -
          -
          - - - {{trigger.datasource}} + + +
          + - {{trigger.lastchange || "last change unknown"}}
          -
          - - - +
          +
          + + +
          + + + {{trigger.datasource}} + +
          - - - +
          + {{trigger.lastchange || "last change unknown"}} - - -
          +
          + + + + + + + + + +
          2. diff --git a/src/sass/_panel-triggers.scss b/src/sass/_panel-triggers.scss index 41c1306a9..463a9f01a 100644 --- a/src/sass/_panel-triggers.scss +++ b/src/sass/_panel-triggers.scss @@ -5,14 +5,24 @@ .triggers-panel-container { position: relative; + .zabbix-trigger-name { + font-weight: bold; + } + .zabbix-hostname { color: $gray-2; margin-left: 1rem; - font-weight: bold; + font-weight: 500; } - .alert-list-info.zbx-description { + .zbx-description { color: $gray-3; + font-weight: normal; + margin-left: 0.6rem; + + &--newline { + margin-left: 0rem; + } } .zbx-trigger-tags { @@ -20,7 +30,10 @@ .zbx-tag { color: $zbx-tag-color; - padding: 0px 6px; + font-weight: 500; + font-size: 12px; + margin-right: 4px; + padding: 1px 6px; cursor: pointer; } } @@ -30,19 +43,20 @@ } .trigger-info-block { - display: inline-flex; + display: flex; i, a { - margin-left: 0.6rem; + margin-right: 0.3rem; color: $gray-2; } + } - .zabbix-trigger-source { - margin-right: 1.5rem; - font-weight: bold; - .gicon-datasources { - opacity: 0.4; - } + .zabbix-trigger-source { + margin-right: 1.5rem; + margin-left: 1rem; + font-weight: 500; + .gicon-datasources { + opacity: 0.4; } }