summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-01-26 08:57:42 -0600
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-02-10 15:09:08 -0600
commit0544c4ed7690abfd4d20d375ace09cc28cf4bf18 (patch)
treedf1005b2fc4436237379c04f12d1c87cf01d184f
parent465316ec22ba6083b5a6bf7dab21518564604c56 (diff)
downloadgitlab-ce-0544c4ed7690abfd4d20d375ace09cc28cf4bf18.tar.gz
Fix issue boards sidebar alignment and sidebar toggle spec
-rw-r--r--app/assets/stylesheets/pages/boards.scss6
-rw-r--r--spec/features/boards/sidebar_spec.rb2
2 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index b362cc758cc..9a36d76136b 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -298,12 +298,8 @@
.issue-boards-sidebar {
&.right-sidebar {
- top: 153px;
+ top: 0;
bottom: 0;
-
- @media (min-width: $screen-sm-min) {
- top: 220px;
- }
}
.issuable-sidebar-header {
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index bad6b56a18a..7651364703e 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -54,7 +54,7 @@ describe 'Issue Boards', feature: true, js: true do
expect(page).to have_selector('.issue-boards-sidebar')
- find('.gutter-toggle').click
+ find('.gutter-toggle').trigger('click')
expect(page).not_to have_selector('.issue-boards-sidebar')
end