diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 20:04:05 +0300 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-09 20:04:05 +0300 |
commit | aa4942a2132652ccca52a583c78f7aa92ff7d256 (patch) | |
tree | bbc0b70bd2bec3d420c0c883a3ba0a03c7024fb1 /app/assets/stylesheets/pages/environments.scss | |
parent | 3ae87eef064b019ee7944595cb33741de8805d24 (diff) | |
parent | 91a3a4b526214f4174f4f12de23dfb5baf033211 (diff) |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/helpers/issuables_helper.rb
# app/views/projects/_home_panel.html.haml
# app/views/projects/commits/_commit.html.haml
Diffstat (limited to 'app/assets/stylesheets/pages/environments.scss')
-rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index de2883f9449..8f175720562 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -273,21 +273,6 @@ line-height: 1.2; } - table { - border-collapse: collapse; - padding: 0; - margin: 0; - } - - td { - vertical-align: middle; - - + td { - padding-left: 5px; - vertical-align: top; - } - } - .deploy-meta-content { border-bottom: 1px solid $white-dark; @@ -323,6 +308,26 @@ } } +.prometheus-table { + border-collapse: collapse; + padding: 0; + margin: 0; + + td { + vertical-align: middle; + + + td { + padding-left: 5px; + vertical-align: top; + } + } + + .legend-metric-title { + font-size: 12px; + vertical-align: middle; + } +} + .prometheus-svg-container { position: relative; height: 0; @@ -330,8 +335,7 @@ padding: 0; padding-bottom: 100%; - .text-metric-usage, - .legend-metric-title { + .text-metric-usage { fill: $black; font-weight: $gl-font-weight-normal; font-size: 12px; @@ -374,10 +378,6 @@ } } - .text-metric-title { - font-size: 12px; - } - .y-label-text, .x-label-text { fill: $gray-darkest; @@ -414,3 +414,7 @@ } } } + +.prometheus-table-row-highlight { + background-color: $prometheus-table-row-highlight-color; +} |