Skip to content

G
gitlab-ce
Commit 6ffb9ffd authored by Tim Zallmann's avatar Tim Zallmann
Browse files
Options

Merge branch '3615-improve-welcome-screen' into 'master' 

Reorganize landing page for new users

See merge request gitlab-org/gitlab-ce!15191
parents 2932f532 95ab3bf5
Hide whitespace changes
Inline Side-by-side
Showing with 169 additions and 102 deletions
app/assets/stylesheets/framework/blank.scss
View file @ 6ffb9ffd
...@@ -7,29 +7,67 @@ ...@@ -7,29 +7,67 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-bottom: 25px; padding-bottom: 25px;
border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
} }
} }
.blank-state { .blank-state-row {
padding-top: 20px; display: flex;
padding-bottom: 20px; flex-wrap: wrap;
justify-content: space-around;
height: 100%;
}
.blank-state-welcome {
text-align: center; text-align: center;
padding: 20px 0 40px;
.blank-state-welcome-title {
font-size: 24px;
}
.blank-state-text {
margin-bottom: 0;
}
}
&.blank-state-welcome { .blank-state-link {
.blank-state-welcome-title { display: block;
font-size: 24px; color: $gl-text-color;
flex: 0 0 100%;
margin-bottom: 15px;
@media (min-width: $screen-sm-min) {
flex: 0 0 49%;
&:nth-child(odd) {
margin-right: 5px;
} }
.blank-state-text { &:nth-child(even) {
margin-bottom: 0; margin-left: 5px;
} }
} }
.blank-state-icon { &:hover {
padding-bottom: 20px; background-color: $gray-light;
text-decoration: none;
color: $gl-text-color;
}
}
.blank-state {
padding: 20px;
border: 1px solid $border-color;
border-radius: $border-radius-default;
@media (min-width: $screen-sm-min) {
display: flex;
align-items: center;
padding: 50px 30px;
}
.blank-state-icon {
svg { svg {
display: block; display: block;
margin: auto; margin: auto;
...@@ -38,13 +76,17 @@ ...@@ -38,13 +76,17 @@
.blank-state-title { .blank-state-title {
margin-top: 0; margin-top: 0;
margin-bottom: 10px;
font-size: 18px; font-size: 18px;
} }
.blank-state-text { .blank-state-body {
max-width: $container-text-max-width; @media (max-width: $screen-xs-max) {
margin: 0 auto $gl-padding; text-align: center;
font-size: 14px; margin-top: 20px;
}
@media (min-width: $screen-sm-min) {
padding-left: 20px;
}
} }
} }
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
View file @ 6ffb9ffd
.blank-state .blank-state-row
.blank-state-icon = link_to new_project_path, class: "blank-state-link" do
= custom_icon("add_new_user", size: 50) .blank-state
.blank-state-body .blank-state-icon
%h3.blank-state-title = custom_icon("add_new_project", size: 50)
Add user .blank-state-body
%p.blank-state-text %h3.blank-state-title
Add your team members and others to GitLab. Create a project
= link_to new_admin_user_path, class: "btn btn-new" do %p.blank-state-text
New user Projects are where you store your code, access issues, wiki and other features of GitLab.
.blank-state - if current_user.can_create_group?
.blank-state-icon = link_to admin_root_path, class: "blank-state-link" do
= custom_icon("configure_server", size: 50) .blank-state
.blank-state-body .blank-state-icon
%h3.blank-state-title = custom_icon("add_new_group", size: 50)
Configure GitLab .blank-state-body
%p.blank-state-text %h3.blank-state-title
Make adjustments to how your GitLab instance is set up. Create a group
= link_to admin_root_path, class: "btn btn-new" do %p.blank-state-text
Configure Groups are a great way to organize projects and people.
- if current_user.can_create_group? = link_to new_admin_user_path, class: "blank-state-link" do
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_group", size: 50) = custom_icon("add_new_user", size: 50)
.blank-state-body .blank-state-body
%h3.blank-state-title %h3.blank-state-title
Create a group Add people
%p.blank-state-text %p.blank-state-text
Groups are a great way to organize projects and people. Add your team members and others to GitLab.
= link_to new_group_path, class: "btn btn-new" do
New group = link_to admin_root_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
= custom_icon("configure_server", size: 50)
.blank-state-body
%h3.blank-state-title
Configure GitLab
%p.blank-state-text
Make adjustments to how your GitLab instance is set up.
app/views/dashboard/projects/_blank_state_welcome.html.haml
View file @ 6ffb9ffd
- public_project_count = ProjectsFinder.new(current_user: current_user).execute.count - public_project_count = ProjectsFinder.new(current_user: current_user).execute.count
- if current_user.can_create_group? .blank-state-row
.blank-state - if current_user.can_create_project?
.blank-state-icon = link_to new_project_path, class: "blank-state-link" do
= custom_icon("add_new_group", size: 50) .blank-state
.blank-state-body .blank-state-icon
%h3.blank-state-title = custom_icon("add_new_project", size: 50)
Create a group for several dependent projects. .blank-state-body
%p.blank-state-text %h3.blank-state-title
Groups are the best way to manage projects and members. Create a project
= link_to new_group_path, class: "btn btn-new" do %p.blank-state-text
New group Projects are where you store your code, access issues, wiki and other features of GitLab.
- else
.blank-state
.blank-state-icon
= custom_icon("add_new_project", size: 50)
.blank-state-body
%h3.blank-state-title
Create a project
%p.blank-state-text
If you are added to a project, it will be displayed here.
.blank-state - if current_user.can_create_group?
.blank-state-icon = link_to new_group_path, class: "blank-state-link" do
= custom_icon("add_new_project", size: 50) .blank-state
.blank-state-body .blank-state-icon
%h3.blank-state-title = custom_icon("add_new_group", size: 50)
Create a project .blank-state-body
%p.blank-state-text %h3.blank-state-title
- if current_user.can_create_project? Create a group
You don't have access to any projects right now. %p.blank-state-text
You can create up to Groups are the best way to manage projects and members.
%strong= number_with_delimiter(current_user.projects_limit)
= succeed "." do
= "project".pluralize(current_user.projects_limit)
- else
If you are added to a project, it will be displayed here.
- if current_user.can_create_project?
= link_to new_project_path, class: "btn btn-new" do
New project
- if public_project_count > 0 - if public_project_count > 0
.blank-state = link_to trending_explore_projects_path, class: "blank-state-link" do
.blank-state-icon .blank-state
= custom_icon("globe", size: 50) .blank-state-icon
.blank-state-body = custom_icon("globe", size: 50)
%h3.blank-state-title .blank-state-body
Explore public projects %h3.blank-state-title
%p.blank-state-text Explore public projects
There are %p.blank-state-text
= number_with_delimiter(public_project_count) There are
public projects on this server. = number_with_delimiter(public_project_count)
Public projects are an easy way to allow public projects on this server.
everyone to have read-only access. Public projects are an easy way to allow
= link_to trending_explore_projects_path, class: "btn btn-new" do everyone to have read-only access.
Browse projects
= link_to "https://docs.gitlab.com/", class: "blank-state-link" do
.blank-state
.blank-state-icon
= custom_icon("lightbulb", size: 50)
.blank-state-body
%h3.blank-state-title
Learn more about GitLab
%p.blank-state-text
Take a look at the documentation to discover all of GitLab's capabilities.
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @ 6ffb9ffd
.row.blank-state-parent-container .blank-state-parent-container
.section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" } .section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" }
.container.section-body .container.section-body
.blank-state.blank-state-welcome .row
%h2.blank-state-welcome-title .blank-state-welcome
Welcome to GitLab %h2.blank-state-welcome-title
%p.blank-state-text Welcome to GitLab
Code, test, and deploy together %p.blank-state-text
- if current_user.admin? Code, test, and deploy together
= render "blank_state_admin_welcome" - if current_user.admin?
- else = render "blank_state_admin_welcome"
= render "blank_state_welcome" - else
= render "blank_state_welcome"
app/views/shared/icons/_add_new_project.svg
View file @ 6ffb9ffd
<svg xmlns="http://www.w3.org/2000/svg" width="78" height="82" viewBox="0 0 78 82"><g fill="none" fill-rule="evenodd"><path fill="#F9F9F9" d="M2.12 42c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3C74.353 61.032 58.425 76 39 76 19.575 76 3.647 61.032 2.12 42z"/><path fill="#EEE" fill-rule="nonzero" d="M39 78C17.46 78 0 60.54 0 39S17.46 0 39 0s39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 4 39 4 4 19.67 4 39s15.67 35 35 35z"/><path fill="#FEE1D3" fill-rule="nonzero" d="M30 24a4 4 0 0 0-4 4v22a4 4 0 0 0 4 4h18a4 4 0 0 0 4-4V28a4 4 0 0 0-4-4H30zm0-4h18a8 8 0 0 1 8 8v22a8 8 0 0 1-8 8H30a8 8 0 0 1-8-8V28a8 8 0 0 1 8-8z"/><path fill="#FC6D26" d="M33 30h8a2 2 0 1 1 0 4h-8a2 2 0 1 1 0-4zm0 7h12a2 2 0 1 1 0 4H33a2 2 0 1 1 0-4zm0 7h12a2 2 0 1 1 0 4H33a2 2 0 1 1 0-4z"/></g></svg> <svg xmlns="http://www.w3.org/2000/svg" width="78" height="82" viewBox="0 0 78 82"><g fill="none" fill-rule="evenodd"><path fill="#F9F9F9" d="M2.12 42c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3C74.353 61.032 58.425 76 39 76S3.647 61.032 2.12 42z"/><path fill="#EEE" fill-rule="nonzero" d="M39 78C17.46 78 0 60.54 0 39S17.46 0 39 0s39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 4 39 4 4 19.67 4 39s15.67 35 35 35z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M30 24c-2.21 0-4 1.79-4 4v22c0 2.21 1.79 4 4 4h18c2.21 0 4-1.79 4-4V28c0-2.21-1.79-4-4-4H30zm0-4h18c4.418 0 8 3.582 8 8v22c0 4.418-3.582 8-8 8H30c-4.418 0-8-3.582-8-8V28c0-4.418 3.582-8 8-8z"/><path fill="#6B4FBB" d="M33 30h8c1.105 0 2 .895 2 2s-.895 2-2 2h-8c-1.105 0-2-.895-2-2s.895-2 2-2zm0 7h12c1.105 0 2 .895 2 2s-.895 2-2 2H33c-1.105 0-2-.895-2-2s.895-2 2-2zm0 7h12c1.105 0 2 .895 2 2s-.895 2-2 2H33c-1.105 0-2-.895-2-2s.895-2 2-2z"/></g></svg>
\ No newline at end of file
app/views/shared/icons/_lightbulb.svg 0 → 100644
View file @ 6ffb9ffd
<svg xmlns="http://www.w3.org/2000/svg" width="78" height="82" viewBox="0 0 78 82"><g fill="none" fill-rule="evenodd"><path fill="#F9F9F9" d="M2.12 42c-.08.99-.12 1.99-.12 3 0 20.435 16.565 37 37 37s37-16.565 37-37c0-1.01-.04-2.01-.12-3C74.353 61.032 58.425 76 39 76S3.647 61.032 2.12 42z"/><path fill="#EEE" fill-rule="nonzero" d="M39 78C17.46 78 0 60.54 0 39S17.46 0 39 0s39 17.46 39 39-17.46 39-39 39zm0-4c19.33 0 35-15.67 35-35S58.33 4 39 4 4 19.67 4 39s15.67 35 35 35z"/><path fill="#6B4FBB" d="M33 52h12c1.105 0 2 .895 2 2s-.895 2-2 2H33c-1.105 0-2-.895-2-2s.895-2 2-2zm1 5h10c1.105 0 2 .895 2 2s-.895 2-2 2H34c-1.105 0-2-.895-2-2s.895-2 2-2z"/><path fill="#E1DBF2" fill-rule="nonzero" d="M45.542 46.932l.346-2.36c.198-1.348.737-2.623 1.566-3.705 3.025-3.946 4.485-7.29 4.547-9.96C52.153 24.41 46.843 20 39 20c-7.777 0-13 4.374-13 11 0 2.4 1.462 5.73 4.573 9.846.815 1.08 1.343 2.345 1.536 3.683l.353 2.456 13.08-.054zm-17.038.624L28.15 45.1c-.097-.67-.36-1.303-.768-1.842C23.794 38.51 22 34.424 22 31c0-9.39 7.61-15 17-15s17.218 5.614 17 15c-.085 3.64-1.875 7.74-5.37 12.3-.416.54-.685 1.18-.784 1.853l-.346 2.36c-.288 1.958-1.963 3.41-3.942 3.42l-13.08.053c-1.994.008-3.69-1.455-3.974-3.43z"/><path fill="#6B4FBB" d="M41 38.732c-.598-.345-1-.992-1-1.732 0-1.105.895-2 2-2s2 .895 2 2c0 .74-.402 1.387-1 1.732V42c0 .552-.448 1-1 1s-1-.448-1-1v-3.268zm-6 0c-.598-.345-1-.992-1-1.732 0-1.105.895-2 2-2s2 .895 2 2c0 .74-.402 1.387-1 1.732V42c0 .552-.448 1-1 1s-1-.448-1-1v-3.268z"/></g></svg>
changelogs/unreleased/3615-improve-welcome-screen.yml 0 → 100644
View file @ 6ffb9ffd
---
title: Reorganize welcome page for new users
merge_request:
author:
type: other
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7