Commit 1386605a authored by Tom Quirk's avatar Tom Quirk

Fix review-bar-component height

Makes review bar component height the same as the
sidebar collapse button.

Also refactors review bar css to use gitlab-ui utilities
where possible.

Changelog: fixed
parent 63a9b054
...@@ -26,7 +26,10 @@ export default { ...@@ -26,7 +26,10 @@ export default {
</script> </script>
<template> <template>
<div v-show="draftsCount > 0"> <div v-show="draftsCount > 0">
<nav class="review-bar-component"> <nav
class="review-bar-component gl-bg-white gl-w-full gl-fixed gl-left-0 gl-bottom-0 gl-display-flex gl-align-items-center"
data-testid="review_bar_component"
>
<div <div
class="review-bar-content d-flex gl-justify-content-end" class="review-bar-content d-flex gl-justify-content-end"
data-qa-selector="review_bar_content" data-qa-selector="review_bar_content"
......
.review-bar-component { .review-bar-component {
position: fixed;
bottom: 0;
left: 0;
width: 100%;
background: $white;
z-index: $zindex-dropdown-menu; z-index: $zindex-dropdown-menu;
padding: 7px 0 6px; // to keep aligned with "collapse sidebar" button on the left sidebar
border-top: 1px solid $border-color; border-top: 1px solid $border-color;
height: $toggle-sidebar-height;
padding-left: $contextual-sidebar-width; padding-left: $contextual-sidebar-width;
padding-right: $gutter_collapsed_width; padding-right: $gutter_collapsed_width;
transition: padding $sidebar-transition-duration; transition: padding $sidebar-transition-duration;
......
...@@ -24,7 +24,7 @@ RSpec.describe 'Merge request > Batch comments', :js do ...@@ -24,7 +24,7 @@ RSpec.describe 'Merge request > Batch comments', :js do
end end
it 'has review bar' do it 'has review bar' do
expect(page).to have_css('.review-bar-component', visible: false) expect(page).to have_selector('[data-testid="review_bar_component"]', visible: false)
end end
it 'adds draft note' do it 'adds draft note' do
...@@ -32,7 +32,7 @@ RSpec.describe 'Merge request > Batch comments', :js do ...@@ -32,7 +32,7 @@ RSpec.describe 'Merge request > Batch comments', :js do
expect(find('.draft-note-component')).to have_content('Line is wrong') expect(find('.draft-note-component')).to have_content('Line is wrong')
expect(page).to have_css('.review-bar-component') expect(page).to have_selector('[data-testid="review_bar_component"]')
expect(find('.review-bar-content .btn-confirm')).to have_content('1') expect(find('.review-bar-content .btn-confirm')).to have_content('1')
end end
......
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