diff options
| author | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-01-07 13:35:03 +0900 |
|---|---|---|
| committer | Takuya Noguchi <takninnovationresearch@gmail.com> | 2018-01-07 13:50:40 +0900 |
| commit | 13be4f49f81109e612c73645f991e5e1b07b6d3f (patch) | |
| tree | 26fbd21ba9db753289868dca4e5d50eadfdb88b4 | |
| parent | 54bacb1860036ffcd722f7df033d7def6b1a8756 (diff) | |
| download | gitlab-ce-13be4f49f81109e612c73645f991e5e1b07b6d3f.tar.gz | |
Substitute deprecated ui_charcoal with new default ui_indigo
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/devise_empty.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml | 5 | ||||
| -rw-r--r-- | doc/development/fe_guide/style_guide_scss.md | 2 |
4 files changed, 8 insertions, 3 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 diff --git a/changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml b/changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml new file mode 100644 index 00000000000..593d3741a09 --- /dev/null +++ b/changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml @@ -0,0 +1,5 @@ +--- +title: Substitute deprecated ui_charcoal with new default ui_indigo +merge_request: 16271 +author: Takuya Noguchi +type: fixed diff --git a/doc/development/fe_guide/style_guide_scss.md b/doc/development/fe_guide/style_guide_scss.md index 77b308c4a43..86a8b4135af 100644 --- a/doc/development/fe_guide/style_guide_scss.md +++ b/doc/development/fe_guide/style_guide_scss.md @@ -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 |