Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
94f8155d
Commit
94f8155d
authored
Feb 25, 2021
by
Savas Vedova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix scrolling issues with sticky header
- Add changelog
parent
5688842f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
24 deletions
+33
-24
ee/app/assets/javascripts/security_dashboard/components/selection_summary.vue
...ripts/security_dashboard/components/selection_summary.vue
+22
-23
ee/app/assets/stylesheets/page_bundles/security_dashboard.scss
...p/assets/stylesheets/page_bundles/security_dashboard.scss
+6
-1
ee/changelogs/unreleased/292636-fix-scroll-issue.yml
ee/changelogs/unreleased/292636-fix-scroll-issue.yml
+5
-0
No files found.
ee/app/assets/javascripts/security_dashboard/components/selection_summary.vue
View file @
94f8155d
...
...
@@ -95,31 +95,30 @@ export default {
</
script
>
<
template
>
<div>
<gl-alert
v-if=
"updateErrorText"
variant=
"danger"
:dismissible=
"false"
class=
"gl-mb-3"
>
<div
class=
"card gl-z-index-2!"
:class=
"
{ 'with-error': Boolean(updateErrorText) }"
>
<gl-alert
v-if=
"updateErrorText"
variant=
"danger"
:dismissible=
"false"
>
{{
updateErrorText
}}
</gl-alert>
<div
class=
"card gl-z-index-3!"
>
<form
class=
"card-body gl-display-flex gl-align-items-center"
@
submit.prevent=
"handleSubmit"
>
<div
class=
"gl-line-height-0 gl-border-r-solid gl-border-gray-100 gl-pr-6 gl-border-1 gl-h-7 gl-display-flex gl-align-items-center"
<form
class=
"card-body gl-display-flex gl-align-items-center"
@
submit.prevent=
"handleSubmit"
>
<div
class=
"gl-line-height-0 gl-border-r-solid gl-border-gray-100 gl-pr-6 gl-border-1 gl-h-7 gl-display-flex gl-align-items-center"
>
<span
><b>
{{
selectedVulnerabilitiesCount
}}
</b>
{{
$options
.
i18n
.
selected
}}
</span
>
<span
><b>
{{
selectedVulnerabilitiesCount
}}
</b>
{{
$options
.
i18n
.
selected
}}
</span
>
</div>
<div
class=
"gl-flex-fill-1 gl-ml-6 gl-mr-4"
>
<status-dropdown
@
change=
"handleStatusDropdownChange"
/>
</div>
<template
v-if=
"shouldShowActionButtons"
>
<gl-button
type=
"button"
class=
"gl-mr-4"
@
click=
"resetSelected"
>
{{
$options
.
i18n
.
cancel
}}
</gl-button>
<gl-button
type=
"submit"
category=
"primary"
variant=
"confirm"
>
{{
$options
.
i18n
.
changeStatus
}}
</gl-button>
</
template
>
</form>
</div>
</div>
<div
class=
"gl-flex-fill-1 gl-ml-6 gl-mr-4"
>
<status-dropdown
@
change=
"handleStatusDropdownChange"
/>
</div>
<template
v-if=
"shouldShowActionButtons"
>
<gl-button
type=
"button"
class=
"gl-mr-4"
@
click=
"resetSelected"
>
{{
$options
.
i18n
.
cancel
}}
</gl-button>
<gl-button
type=
"submit"
category=
"primary"
variant=
"confirm"
>
{{
$options
.
i18n
.
changeStatus
}}
</gl-button>
</
template
>
</form>
</div>
</template>
ee/app/assets/stylesheets/page_bundles/security_dashboard.scss
View file @
94f8155d
@import
'page_bundles/mixins_and_variables_and_functions'
;
$security-filter-height
:
90px
;
$selection-summary-height
:
68px
;
$selection-summary-height
:
66px
;
$selection-summary-with-error-height
:
118px
;
@mixin
sticky-top-positioning
(
$extra
:
0
)
{
top
:
$header-height
+
$extra
;
...
...
@@ -113,4 +114,8 @@ $selection-summary-height: 68px;
tr
:hover
.vulnerability-title
{
text-decoration
:
underline
;
}
.card.with-error
+
table
thead
.below-selection-summary
th
{
@include
sticky-top-positioning
(
$security-filter-height
+
$selection-summary-with-error-height
);
}
}
ee/changelogs/unreleased/292636-fix-scroll-issue.yml
0 → 100644
View file @
94f8155d
---
title
:
Fix scrolling issues with sticky status box
merge_request
:
55188
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment