Commit 46a1a66c authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'fix-security-ds-th' into 'master'

Update security dashboard table's header layout

See merge request gitlab-org/gitlab!31642
parents 5c07afe4 9fef391a
...@@ -9,6 +9,10 @@ table { ...@@ -9,6 +9,10 @@ table {
* This is a temporary workaround until we fix the neutral * This is a temporary workaround until we fix the neutral
* color palette in https://gitlab.com/gitlab-org/gitlab/-/issues/213570 * color palette in https://gitlab.com/gitlab-org/gitlab/-/issues/213570
* *
* The overwrites here affected the security dashboard tables, when removing
* this code, table-th-transparent and original-text-color classes should
* be removed there.
*
* Remove this code as soon as this happens * Remove this code as soon as this happens
*/ */
&.gl-table { &.gl-table {
...@@ -54,6 +58,11 @@ table { ...@@ -54,6 +58,11 @@ table {
background: none; background: none;
color: $gl-text-color-secondary; color: $gl-text-color-secondary;
} }
&.original-gl-th {
@include gl-text-gray-700;
border-bottom: 1px solid $cycle-analytics-light-gray;
}
} }
td { td {
......
...@@ -71,24 +71,27 @@ export default { ...@@ -71,24 +71,27 @@ export default {
return this.shouldShowSelection ? '' : 'd-none'; return this.shouldShowSelection ? '' : 'd-none';
}, },
fields() { fields() {
const commonThClass = ['table-th-transparent', 'original-gl-th'].join(' ');
return [ return [
{ {
key: 'checkbox', key: 'checkbox',
class: this.checkboxClass, class: this.checkboxClass,
thClass: commonThClass,
}, },
{ {
key: 'state', key: 'state',
label: s__('Vulnerability|Status'), label: s__('Vulnerability|Status'),
thClass: 'gl-w-64', thClass: `gl-w-64 ${commonThClass}`,
}, },
{ {
key: 'severity', key: 'severity',
label: s__('Vulnerability|Severity'), label: s__('Vulnerability|Severity'),
thClass: 'gl-w-64', thClass: `gl-w-64 ${commonThClass}`,
}, },
{ {
key: 'title', key: 'title',
label: __('Description'), label: __('Description'),
thClass: commonThClass,
}, },
]; ];
}, },
......
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