Commit 866ef479 authored by Phil Hughes's avatar Phil Hughes

Merge branch '6954-dashboard-rearrangement' into 'master'

Re-orders the Group Security Dashboard

See merge request gitlab-org/gitlab-ee!8624
parents 6edde490 d7b9a4f9
...@@ -94,7 +94,6 @@ export default { ...@@ -94,7 +94,6 @@ export default {
<template> <template>
<div> <div>
<vulnerability-count-list />
<tabs stop-propagation> <tabs stop-propagation>
<tab active> <tab active>
<template slot="title"> <template slot="title">
...@@ -108,7 +107,8 @@ export default { ...@@ -108,7 +107,8 @@ export default {
<icon name="question" class="vertical-align-middle" /> <icon name="question" class="vertical-align-middle" />
</span> </span>
</template> </template>
<vulnerability-count-list />
<h5 class="mt-4 mb-4">{{ __('Vulnerability List') }}</h5>
<security-dashboard-table <security-dashboard-table
:dashboard-documentation="dashboardDocumentation" :dashboard-documentation="dashboardDocumentation"
:empty-state-svg-path="emptyStateSvgPath" :empty-state-svg-path="emptyStateSvgPath"
......
...@@ -89,7 +89,8 @@ export default { ...@@ -89,7 +89,8 @@ export default {
<style> <style>
.vulnerabilities-row-header { .vulnerabilities-row-header {
color: #707070; background-color: #fafafa;
font-size: 1rem;
padding-left: 0.4em; padding-left: 0.4em;
padding-right: 0.4em; padding-right: 0.4em;
} }
......
---
title: Re-orders the Group Security Dashboard
merge_request: 8624
author:
type: other
...@@ -9235,6 +9235,9 @@ msgstr "" ...@@ -9235,6 +9235,9 @@ msgstr ""
msgid "VisibilityLevel|Unknown" msgid "VisibilityLevel|Unknown"
msgstr "" msgstr ""
msgid "Vulnerability List"
msgstr ""
msgid "Vulnerability|Class" msgid "Vulnerability|Class"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment