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
This commit is contained in:
Annabel Dunstone Gray 2018-01-08 18:19:34 +00:00
commit 5e9c8906c0
4 changed files with 8 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,5 @@
---
title: Substitute deprecated ui_charcoal with new default ui_indigo
merge_request: 16271
author: Takuya Noguchi
type: fixed

View File

@ -216,7 +216,7 @@ If you want a line or set of lines to be ignored by the linter, you can use
```scss
// This lint rule is disabled because the class name comes from a gem.
// scss-lint:disable SelectorFormat
.ui_charcoal {
.ui_indigo {
background-color: #333;
}
// scss-lint:enable SelectorFormat