Reorganize landing page for new users

3 files changed, 86 insertions, 76 deletions

diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
index 57544559824..486ca8d3924 100644
--- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
@@ -1,33 +1,34 @@
-.blank-state
-  .blank-state-icon
-    = custom_icon("add_new_user", size: 50)
-  .blank-state-body
-    %h3.blank-state-title
-      Add user
-    %p.blank-state-text
-      Add your team members and others to GitLab.
-    = link_to new_admin_user_path, class: "btn btn-new" do
-      New user
+.row
+  .col-md-6
+    = link_to new_admin_user_path, class: "blank-state-link" do
+      .blank-state
+        .blank-state-icon
+          = custom_icon("add_new_user", size: 50)
+        .blank-state-body
+          %h3.blank-state-title
+            Add user
+          %p.blank-state-text
+            Add your team members and others to GitLab.
 
-.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.
-    = link_to admin_root_path, class: "btn btn-new" do
-      Configure
+  - 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.
 
-- if current_user.can_create_group?
-  .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.
-      = link_to new_group_path, class: "btn btn-new" do
-        New group
+  .col-md-6
+    = 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.
diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml
index a93a3415ee1..91874784531 100644
--- a/app/views/dashboard/projects/_blank_state_welcome.html.haml
+++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml
@@ -1,48 +1,57 @@
 - public_project_count = ProjectsFinder.new(current_user: current_user).execute.count
 
-- if current_user.can_create_group?
-  .blank-state
-    .blank-state-icon
-      = custom_icon("add_new_group", size: 50)
-    .blank-state-body
-      %h3.blank-state-title
-        Create a group for several dependent projects.
-      %p.blank-state-text
-        Groups are the best way to manage projects and members.
-      = link_to new_group_path, class: "btn btn-new" do
-        New group
-
-.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 current_user.can_create_project?
-        You don't have access to any projects right now.
-        You can create up to
-        %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.
+.row
+  .col-md-6
     - if current_user.can_create_project?
-      = link_to new_project_path, class: "btn btn-new" do
-        New project
+      = 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
+              You don't have access to any projects right now.
+              You can create up to
+              %strong= number_with_delimiter(current_user.projects_limit)
+              = succeed "." do
+                = "project".pluralize(current_user.projects_limit)
+    - 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?
+    .col-md-6
+      = link_to new_group_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 for several dependent projects.
+            %p.blank-state-text
+              Groups are the best way to manage projects and members.
+
+  .clearfix
 
-- if public_project_count > 0
-  .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.
-      = link_to trending_explore_projects_path, class: "btn btn-new" do
-        Browse projects
+  - if public_project_count > 0
+    .col-md-6
+      = 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.
diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
index ad3fac6d164..1b564629e16 100644
--- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
@@ -1,7 +1,7 @@
 .row.blank-state-parent-container
   .section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" }
     .container.section-body
-      .blank-state.blank-state-welcome
+      .blank-state-welcome
         %h2.blank-state-welcome-title
           Welcome to GitLab
         %p.blank-state-text