提交 e9e24d9c 编写于 作者: J Jarek Ostrowski

Fix formatting of welcome screen for external users

Add changelog file
Remove example db file
Revert schema back to master
Restructure HTML to reflect changes in blank-state
上级 5939b09f
...@@ -14,13 +14,12 @@ ...@@ -14,13 +14,12 @@
.blank-state-row { .blank-state-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-around; justify-content: space-between;
height: 100%;
} }
.blank-state-welcome { .blank-state-welcome {
text-align: center; text-align: center;
padding: 20px 0 40px; padding: $gl-padding 0 ($gl-padding * 2);
.blank-state-welcome-title { .blank-state-welcome-title {
font-size: 24px; font-size: 24px;
...@@ -32,22 +31,13 @@ ...@@ -32,22 +31,13 @@
} }
.blank-state-link { .blank-state-link {
display: block;
color: $gl-text-color; color: $gl-text-color;
flex: 0 0 100%; flex: 0 0 100%;
margin-bottom: 15px; margin-bottom: 15px;
@include media-breakpoint-up(sm) { // @include media-breakpoint-up(sm) {
flex: 0 0 49%; // flex: 0 0 49%;
// }
&:nth-child(odd) {
margin-right: 5px;
}
&:nth-child(even) {
margin-left: 5px;
}
}
&:hover { &:hover {
background-color: $gray-light; background-color: $gray-light;
...@@ -63,15 +53,20 @@ ...@@ -63,15 +53,20 @@
} }
.blank-state { .blank-state {
padding: 20px; display: flex;
align-items: center;
padding: 20px 50px;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
min-height: 240px;
margin-bottom: $gl-padding * 2;
flex: 0 0 calc(50% - #{$gl-padding});
@include media-breakpoint-up(sm) { @include media-breakpoint-down(sm) {
display: flex; flex: 0 0 100%;
height: 100%; flex-direction: column;
align-items: center; justify-content: center;
padding: 50px 30px; padding: 50px 20px;
} }
} }
...@@ -90,7 +85,7 @@ ...@@ -90,7 +85,7 @@
} }
.blank-state-body { .blank-state-body {
@include media-breakpoint-down(xs) { @include media-breakpoint-down(sm) {
text-align: center; text-align: center;
margin-top: 20px; margin-top: 20px;
} }
...@@ -121,9 +116,3 @@ ...@@ -121,9 +116,3 @@
} }
} }
} }
@include media-breakpoint-down(xs) {
.blank-state-icon svg {
width: 315px;
}
}
.blank-state-row .blank-state-row
= link_to new_project_path, class: "blank-state-link" do = link_to new_project_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_project", size: 50) = custom_icon("add_new_project", size: 50)
.blank-state-body .blank-state-body
...@@ -10,8 +9,7 @@ ...@@ -10,8 +9,7 @@
Projects are where you store your code, access issues, wiki and other features of GitLab. Projects are where you store your code, access issues, wiki and other features of GitLab.
- if current_user.can_create_group? - if current_user.can_create_group?
= link_to new_group_path, class: "blank-state-link" do = link_to new_group_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_group", size: 50) = custom_icon("add_new_group", size: 50)
.blank-state-body .blank-state-body
...@@ -20,8 +18,7 @@ ...@@ -20,8 +18,7 @@
%p.blank-state-text %p.blank-state-text
Groups are a great way to organize projects and people. Groups are a great way to organize projects and people.
= link_to new_admin_user_path, class: "blank-state-link" do = link_to new_admin_user_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_user", size: 50) = custom_icon("add_new_user", size: 50)
.blank-state-body .blank-state-body
...@@ -30,8 +27,7 @@ ...@@ -30,8 +27,7 @@
%p.blank-state-text %p.blank-state-text
Add your team members and others to GitLab. Add your team members and others to GitLab.
= link_to admin_root_path, class: "blank-state-link" do = link_to admin_root_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("configure_server", size: 50) = custom_icon("configure_server", size: 50)
.blank-state-body .blank-state-body
......
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
.blank-state-row .blank-state-row
- if current_user.can_create_project? - if current_user.can_create_project?
= link_to new_project_path, class: "blank-state-link" do = link_to new_project_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_project", size: 50) = custom_icon("add_new_project", size: 50)
.blank-state-body .blank-state-body
...@@ -22,8 +21,7 @@ ...@@ -22,8 +21,7 @@
If you are added to a project, it will be displayed here. If you are added to a project, it will be displayed here.
- if current_user.can_create_group? - if current_user.can_create_group?
= link_to new_group_path, class: "blank-state-link" do = link_to new_group_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_group", size: 50) = custom_icon("add_new_group", size: 50)
.blank-state-body .blank-state-body
...@@ -33,8 +31,7 @@ ...@@ -33,8 +31,7 @@
Groups are the best way to manage projects and members. Groups are the best way to manage projects and members.
- if public_project_count > 0 - if public_project_count > 0
= link_to trending_explore_projects_path, class: "blank-state-link" do = link_to trending_explore_projects_path, class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("globe", size: 50) = custom_icon("globe", size: 50)
.blank-state-body .blank-state-body
...@@ -47,8 +44,7 @@ ...@@ -47,8 +44,7 @@
Public projects are an easy way to allow Public projects are an easy way to allow
everyone to have read-only access. everyone to have read-only access.
= link_to "https://docs.gitlab.com/", class: "blank-state-link" do = link_to "https://docs.gitlab.com/", class: "blank-state blank-state-link" do
.blank-state
.blank-state-icon .blank-state-icon
= custom_icon("lightbulb", size: 50) = custom_icon("lightbulb", size: 50)
.blank-state-body .blank-state-body
......
---
title: Fix formatting welcome screen external users
merge_request: 32227
author:
type: fixed
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册