diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 23:09:29 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-02-24 23:09:29 +0000 |
| commit | 856153d71299de7ad2c406130151deabfabc3f3f (patch) | |
| tree | 0926c36b32cac7dc857f15082f18fa788ecc80a9 /features | |
| parent | 34ba39b948eadb3215324bb551c417ea05038df2 (diff) | |
| parent | be0f97a6d4a170aaf181f00078367b356015292e (diff) | |
| download | gitlab-ce-856153d71299de7ad2c406130151deabfabc3f3f.tar.gz | |
Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'
Sidebar overlaps content when screen is below 1200px.
When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717
Also sorry I couldn't get the collapse button in the screen cap. It's there.
See merge request !2620
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb index 38069ff8835..f33379f76c9 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -6,7 +6,7 @@ timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 15 Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout) + Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768]) end Capybara.default_wait_time = timeout |