Commit 1c62ec3d authored by Paul Slaughter's avatar Paul Slaughter 2️⃣
Browse files

Merge branch 'ph/34768/fixIconsNotLoading' into 'master' 

Fixes welcome icons not showing

Closes #34768

See merge request !19148
parents e8d57378 de7b622e

app/views/dashboard/projects/_blank_state_admin_welcome.html.haml

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


  = link_to new_project_path, class: "blank-state blank-state-link" do

    .blank-state-icon

      = image_tag("illustrations/welcome/add_new_project")

      = custom_icon("add_new_project", size: 50)

    .blank-state-body

      %h3.blank-state-title

        Create a project
@@ -14,7 +14,7 @@ 
  - if current_user.can_create_group?

    = link_to new_group_path, class: "blank-state blank-state-link" do

      .blank-state-icon

        = image_tag("illustrations/welcome/add_new_group")

        = custom_icon("add_new_group", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Create a group
@@ -23,7 +23,7 @@ 


    = link_to new_admin_user_path, class: "blank-state blank-state-link" do

      .blank-state-icon

        = image_tag("illustrations/welcome/add_new_user")

        = custom_icon("add_new_user", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Add people
@@ -32,7 +32,7 @@ 


  = link_to admin_root_path, class: "blank-state blank-state-link" do

    .blank-state-icon

      = image_tag("illustrations/welcome/configure_server")

      = custom_icon("configure_server", size: 50)

    .blank-state-body

      %h3.blank-state-title

        Configure GitLab

app/views/dashboard/projects/_blank_state_welcome.html.haml

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  - if current_user.can_create_project?

    = link_to new_project_path, class: "blank-state blank-state-link" do

      .blank-state-icon

        = image_tag("illustrations/welcome/add_new_project")

        = custom_icon("add_new_project", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Create a project
@@ -13,7 +13,7 @@ 
  - else

    .blank-state

      .blank-state-icon

        = image_tag("illustrations/welcome/add_new_project")

        = custom_icon("add_new_project", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Create a project
@@ -23,7 +23,7 @@ 
  - if current_user.can_create_group?

    = link_to new_group_path, class: "blank-state blank-state-link" do

      .blank-state-icon

        = image_tag("illustrations/welcome/add_new_group")

        = custom_icon("add_new_group", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Create a group
@@ -33,7 +33,7 @@ 
  - if public_project_count > 0

    = link_to trending_explore_projects_path, class: "blank-state blank-state-link" do

      .blank-state-icon

        = image_tag("illustrations/welcome/globe")

        = custom_icon("globe", size: 50)

      .blank-state-body

        %h3.blank-state-title

          Explore public projects
@@ -46,7 +46,7 @@ 


  = link_to "https://docs.gitlab.com/", class: "blank-state blank-state-link" do

    .blank-state-icon

      = image_tag("illustrations/welcome/lightbulb")

      = custom_icon("lightbulb", size: 50)

    .blank-state-body

      %h3.blank-state-title

        Learn more about GitLab

changelogs/unreleased/ph-34768-fixIconsNotLoading.yml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
---

title: Fixed welcome screen icons not showing

merge_request: 19148

author:

type: fixed