Commit 95ab3bf5 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Use flexbox instead of bootstrap columns

parent 5c909f2b
...@@ -11,6 +11,13 @@ ...@@ -11,6 +11,13 @@
} }
} }
.blank-state-row {
display: flex;
flex-wrap: wrap;
justify-content: space-around;
height: 100%;
}
.blank-state-welcome { .blank-state-welcome {
text-align: center; text-align: center;
padding: 20px 0 40px; padding: 20px 0 40px;
...@@ -27,6 +34,20 @@ ...@@ -27,6 +34,20 @@
.blank-state-link { .blank-state-link {
display: block; display: block;
color: $gl-text-color; 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;
}
&:nth-child(even) {
margin-left: 5px;
}
}
&:hover { &:hover {
background-color: $gray-light; background-color: $gray-light;
...@@ -37,7 +58,6 @@ ...@@ -37,7 +58,6 @@
.blank-state { .blank-state {
padding: 20px; padding: 20px;
margin-bottom: 30px;
border: 1px solid $border-color; border: 1px solid $border-color;
border-radius: $border-radius-default; border-radius: $border-radius-default;
......
.row .blank-state-row
.col-md-6 = link_to new_project_path, class: "blank-state-link" do
= link_to new_project_path, class: "blank-state-link" do .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
Projects are where you store your code, access issues, wiki and other features of GitLab.
- if current_user.can_create_group?
= link_to admin_root_path, class: "blank-state-link" do
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_project", size: 50) = custom_icon("add_new_group", size: 50)
.blank-state-body .blank-state-body
%h3.blank-state-title %h3.blank-state-title
Create a project Create a group
%p.blank-state-text %p.blank-state-text
Projects are where you store your code, access issues, wiki and other features of GitLab. Groups are a great way to organize projects and people.
- if current_user.can_create_group?
.col-md-6
= link_to admin_root_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
= custom_icon("add_new_group", size: 50)
.blank-state-body
%h3.blank-state-title
Create a group
%p.blank-state-text
Groups are a great way to organize projects and people.
.col-md-6
= link_to new_admin_user_path, class: "blank-state-link" do = link_to new_admin_user_path, class: "blank-state-link" do
.blank-state .blank-state
.blank-state-icon .blank-state-icon
...@@ -33,13 +30,12 @@ ...@@ -33,13 +30,12 @@
%p.blank-state-text %p.blank-state-text
Add your team members and others to GitLab. Add your team members and others to GitLab.
.col-md-6 = link_to admin_root_path, class: "blank-state-link" do
= link_to admin_root_path, class: "blank-state-link" do .blank-state
.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 %h3.blank-state-title
%h3.blank-state-title Configure GitLab
Configure GitLab %p.blank-state-text
%p.blank-state-text Make adjustments to how your GitLab instance is set up.
Make adjustments to how your GitLab instance is set up.
- public_project_count = ProjectsFinder.new(current_user: current_user).execute.count - public_project_count = ProjectsFinder.new(current_user: current_user).execute.count
.row .blank-state-row
.col-md-6 - 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-link" do
.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
Projects are where you store your code, access issues, wiki and other features of GitLab.
- else
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= custom_icon("add_new_project", size: 50) = custom_icon("add_new_project", size: 50)
...@@ -20,45 +10,49 @@ ...@@ -20,45 +10,49 @@
%h3.blank-state-title %h3.blank-state-title
Create a project Create a project
%p.blank-state-text %p.blank-state-text
If you are added to a project, it will be displayed here. 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.
- if current_user.can_create_group? - if current_user.can_create_group?
.col-md-6 = link_to new_group_path, class: "blank-state-link" do
= link_to new_group_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_group", size: 50) .blank-state-body
.blank-state-body %h3.blank-state-title
%h3.blank-state-title Create a group
Create a group %p.blank-state-text
%p.blank-state-text Groups are the best way to manage projects and members.
Groups are the best way to manage projects and members.
.clearfix
- if public_project_count > 0 - if public_project_count > 0
.col-md-6 = link_to trending_explore_projects_path, class: "blank-state-link" do
= link_to trending_explore_projects_path, class: "blank-state-link" do
.blank-state
.blank-state-icon
= custom_icon("globe", size: 50)
.blank-state-body
%h3.blank-state-title
Explore public projects
%p.blank-state-text
There are
= number_with_delimiter(public_project_count)
public projects on this server.
Public projects are an easy way to allow
everyone to have read-only access.
.col-md-6
= link_to "https://docs.gitlab.com/", class: "blank-state-link" do
.blank-state .blank-state
.blank-state-icon .blank-state-icon
= custom_icon("lightbulb", size: 50) = custom_icon("globe", size: 50)
.blank-state-body .blank-state-body
%h3.blank-state-title %h3.blank-state-title
Learn more about GitLab Explore public projects
%p.blank-state-text %p.blank-state-text
Take a look at the documentation to discover all of GitLab's capabilities. There are
= number_with_delimiter(public_project_count)
public projects on this server.
Public projects are an easy way to allow
everyone to have read-only access.
= 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.
.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-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"
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