Commit 47ca5c36 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'fix-navbar-icon' into 'master'

navbar_icon was renamed to custom_icon

In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4909 it's still using `navbar_icon` but now it's renamed to `custom_icon` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5156

/cc @iamphill @smcgivern @annabeldunstone 

See merge request !5265
parents de204b95 f435eb6f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
Code, test, and deploy together Code, test, and deploy together
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= navbar_icon("project", size: 50) = custom_icon("project", size: 50)
%h3.blank-state-title %h3.blank-state-title
You don't have access to any projects right now You don't have access to any projects right now
%p.blank-state-text %p.blank-state-text
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
- if current_user.can_create_group? - if current_user.can_create_group?
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= navbar_icon("group", size: 50) = custom_icon("group", size: 50)
%h3.blank-state-title %h3.blank-state-title
You can create a group for several dependent projects. You can create a group for several dependent projects.
%p.blank-state-text %p.blank-state-text
......
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