diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-08 18:19:34 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-08 18:19:34 +0000 |
| commit | 5e9c8906c0ab0ddc68fcc91948ffded7831f270e (patch) | |
| tree | 48f2fd37431c4cf6e57456874ee199e70361e2a3 /app | |
| parent | df74461014bbdbc691f4f4039b02962dad292362 (diff) | |
| parent | 13be4f49f81109e612c73645f991e5e1b07b6d3f (diff) | |
| download | gitlab-ce-5e9c8906c0ab0ddc68fcc91948ffded7831f270e.tar.gz | |
Merge branch '41744-substitute-ui-charcoal-with-ui-indigo' into 'master'
Substitute ui_charcoal theme deprecated by GitLab Theme (10.0) with ui_indigo
Closes #41744
See merge request gitlab-org/gitlab-ce!16271
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/devise_empty.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 691d2528022..4e9ea33e675 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -1,7 +1,7 @@ !!! 5 %html.devise-layout-html = render "layouts/head" - %body.ui_charcoal.login-page.application.navless{ data: { page: body_data_page } } + %body.ui_indigo.login-page.application.navless{ data: { page: body_data_page } } .page-wrap = render "layouts/header/empty" .login-page-broadcast diff --git a/app/views/layouts/devise_empty.html.haml b/app/views/layouts/devise_empty.html.haml index ed6731bde95..8718bb3db1a 100644 --- a/app/views/layouts/devise_empty.html.haml +++ b/app/views/layouts/devise_empty.html.haml @@ -1,7 +1,7 @@ !!! 5 %html{ lang: "en" } = render "layouts/head" - %body.ui_charcoal.login-page.application.navless + %body.ui_indigo.login-page.application.navless = render "layouts/header/empty" = render "layouts/broadcast" .container.navless-container |