diff options
| author | Phil Hughes <me@iamphill.com> | 2017-12-06 13:02:56 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-12-06 13:02:56 +0000 |
| commit | cabc87a45c0848e1d7bea3b5a76b1e661aaa6b0a (patch) | |
| tree | 54262349c176429cd8a7034412f8a2b58175d6e0 | |
| parent | 6836078304f8eb889c1d3324c4bcf04a1168afcd (diff) | |
| download | gitlab-ce-outdated-browser-position-fix.tar.gz | |
Fixed outdated browser banner positioningoutdated-browser-position-fix
Closes #40824
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 13 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 1 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_outdated_browser.html.haml | 13 | ||||
| -rw-r--r-- | changelogs/unreleased/outdated-browser-position-fix.yml | 5 |
5 files changed, 13 insertions, 21 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index a42fab50db5..73524d5cf60 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -237,19 +237,6 @@ li.note { } } -.browser-alert { - padding: 10px; - text-align: center; - background: $error-bg; - color: $white-light; - font-weight: $gl-font-weight-bold; - - a { - color: $white-light; - text-decoration: underline; - } -} - .warning_message { border-left: 4px solid $warning-message-border; color: $warning-message-color; diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 1fd301d6850..25ed610466a 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -2,6 +2,7 @@ - if defined?(nav) && nav = render "layouts/nav/sidebar/#{nav}" .content-wrapper.page-with-new-nav + = render 'shared/outdated_browser' .mobile-overlay .alert-wrapper = render "layouts/broadcast" diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index e2407f6a428..99e7f3b568d 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -75,5 +75,3 @@ %span.sr-only Toggle navigation = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right') = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left') - -= render 'shared/outdated_browser' diff --git a/app/views/shared/_outdated_browser.html.haml b/app/views/shared/_outdated_browser.html.haml index c06d1ffa59b..a638b0a805e 100644 --- a/app/views/shared/_outdated_browser.html.haml +++ b/app/views/shared/_outdated_browser.html.haml @@ -1,7 +1,8 @@ - if outdated_browser? - .browser-alert - GitLab may not work properly because you are using an outdated web browser. - %br - Please install a - = link_to 'supported web browser', help_page_url('install/requirements', anchor: 'supported-web-browsers') - for a better experience. + .flash-container + .flash-alert.text-center + GitLab may not work properly because you are using an outdated web browser. + %br + Please install a + = link_to 'supported web browser', help_page_url('install/requirements', anchor: 'supported-web-browsers') + for a better experience. diff --git a/changelogs/unreleased/outdated-browser-position-fix.yml b/changelogs/unreleased/outdated-browser-position-fix.yml new file mode 100644 index 00000000000..801e45a28b3 --- /dev/null +++ b/changelogs/unreleased/outdated-browser-position-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fixed outdated browser flash positioning +merge_request: +author: +type: fixed |