Commit 5e9c8906 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents df744610 13be4f49
!!! 5 !!! 5
%html.devise-layout-html %html.devise-layout-html
= render "layouts/head" = 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 .page-wrap
= render "layouts/header/empty" = render "layouts/header/empty"
.login-page-broadcast .login-page-broadcast
......
!!! 5 !!! 5
%html{ lang: "en" } %html{ lang: "en" }
= render "layouts/head" = render "layouts/head"
%body.ui_charcoal.login-page.application.navless %body.ui_indigo.login-page.application.navless
= render "layouts/header/empty" = render "layouts/header/empty"
= render "layouts/broadcast" = render "layouts/broadcast"
.container.navless-container .container.navless-container
......
---
title: Substitute deprecated ui_charcoal with new default ui_indigo
merge_request: 16271
author: Takuya Noguchi
type: fixed
...@@ -216,7 +216,7 @@ If you want a line or set of lines to be ignored by the linter, you can use ...@@ -216,7 +216,7 @@ If you want a line or set of lines to be ignored by the linter, you can use
```scss ```scss
// This lint rule is disabled because the class name comes from a gem. // This lint rule is disabled because the class name comes from a gem.
// scss-lint:disable SelectorFormat // scss-lint:disable SelectorFormat
.ui_charcoal { .ui_indigo {
background-color: #333; background-color: #333;
} }
// scss-lint:enable SelectorFormat // scss-lint:enable SelectorFormat
......
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