Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
13be4f49
Commit
13be4f49
authored
6 years ago
by
Takuya Noguchi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Substitute deprecated ui_charcoal with new default ui_indigo
parent
54bacb18
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+1
-1
app/views/layouts/devise_empty.html.haml
app/views/layouts/devise_empty.html.haml
+1
-1
changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml
...nreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml
+5
-0
doc/development/fe_guide/style_guide_scss.md
doc/development/fe_guide/style_guide_scss.md
+1
-1
No files found.
app/views/layouts/devise.html.haml
View file @
13be4f49
!!! 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
...
...
This diff is collapsed.
Click to expand it.
app/views/layouts/devise_empty.html.haml
View file @
13be4f49
!!! 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
...
...
This diff is collapsed.
Click to expand it.
changelogs/unreleased/41744-substitute-ui-charcoal-with-ui-indigo.yml
0 → 100644
View file @
13be4f49
---
title
:
Substitute deprecated ui_charcoal with new default ui_indigo
merge_request
:
16271
author
:
Takuya Noguchi
type
:
fixed
This diff is collapsed.
Click to expand it.
doc/development/fe_guide/style_guide_scss.md
View file @
13be4f49
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment