From 31feef4c7aa40446e118f987bc2f09a1d7deac61 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:22:52 +0530 Subject: Welcome page graphic --- app/views/shared/icons/_add_new_group.svg | 8 ++++++++ app/views/shared/icons/_add_new_project.svg | 1 + app/views/shared/icons/_add_new_user.svg | 9 +++++++++ app/views/shared/icons/_configure_server.svg | 8 ++++++++ app/views/shared/icons/_globe.svg | 1 + 5 files changed, 27 insertions(+) create mode 100644 app/views/shared/icons/_add_new_group.svg create mode 100644 app/views/shared/icons/_add_new_project.svg create mode 100644 app/views/shared/icons/_add_new_user.svg create mode 100644 app/views/shared/icons/_configure_server.svg create mode 100644 app/views/shared/icons/_globe.svg (limited to 'app') diff --git a/app/views/shared/icons/_add_new_group.svg b/app/views/shared/icons/_add_new_group.svg new file mode 100644 index 00000000000..ecd52c5e99f --- /dev/null +++ b/app/views/shared/icons/_add_new_group.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/views/shared/icons/_add_new_project.svg b/app/views/shared/icons/_add_new_project.svg new file mode 100644 index 00000000000..3c1e15453df --- /dev/null +++ b/app/views/shared/icons/_add_new_project.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/views/shared/icons/_add_new_user.svg b/app/views/shared/icons/_add_new_user.svg new file mode 100644 index 00000000000..0ad40498d7b --- /dev/null +++ b/app/views/shared/icons/_add_new_user.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/app/views/shared/icons/_configure_server.svg b/app/views/shared/icons/_configure_server.svg new file mode 100644 index 00000000000..b1137b7ec94 --- /dev/null +++ b/app/views/shared/icons/_configure_server.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/app/views/shared/icons/_globe.svg b/app/views/shared/icons/_globe.svg new file mode 100644 index 00000000000..c2daae5f317 --- /dev/null +++ b/app/views/shared/icons/_globe.svg @@ -0,0 +1 @@ + \ No newline at end of file -- cgit v1.2.1 From e7f668013548180e9061a5e6d6e34b1f75de462e Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:23:18 +0530 Subject: CE admin welcome page --- .../projects/_blank_state_admin_welcome.html.haml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 app/views/dashboard/projects/_blank_state_admin_welcome.html.haml (limited to 'app') diff --git a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml new file mode 100644 index 00000000000..83d103aff0d --- /dev/null +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -0,0 +1,33 @@ +.blank-state.clearfix + .blank-state-icon.col-md-1.col-md-offset-4 + = custom_icon("add_new_user", size: 50) + .blank-state-body.col-md-3 + %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 + +.blank-state.clearfix + .blank-state-icon.col-md-1.col-md-offset-4 + = custom_icon("configure_server", size: 50) + .blank-state-body.col-md-3 + %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? + .blank-state.clearfix + .blank-state-icon.col-md-1.col-md-offset-4 + = custom_icon("add_new_group", size: 50) + .blank-state-body.col-md-3 + %h3.blank-state-title + Create a group + %p.blank-state-text + Groups are a great way to organise projects and people. + = link_to new_group_path, class: "btn btn-new" do + New group \ No newline at end of file -- cgit v1.2.1 From d5a1fd500af85d0552f0848e3ee2b5f5f07d79d7 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:23:27 +0530 Subject: CE regular user welcome page --- .../projects/_blank_state_welcome.html.haml | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 app/views/dashboard/projects/_blank_state_welcome.html.haml (limited to 'app') diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml new file mode 100644 index 00000000000..d3b0a9d6264 --- /dev/null +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -0,0 +1,48 @@ +- publicish_project_count = ProjectsFinder.new(current_user: current_user).execute.count + +- if current_user.can_create_group? + .blank-state.clearfix + .col-md-1.col-md-offset-3.blank-state-icon + = custom_icon("add_new_group", size: 50) + .col-md-5.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.clearfix + .col-md-1.col-md-offset-3.blank-state-icon + = custom_icon("add_new_project", size: 50) + .col-md-5.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. + - if current_user.can_create_project? + = link_to new_project_path, class: "btn btn-new" do + New project + +- if publicish_project_count > 0 + .blank-state.clearfix + .col-md-1.col-md-offset-3.blank-state-icon + = custom_icon("globe", size: 50) + .col-md-5.blank-state-body + %h3.blank-state-title + Explore public projects + %p.blank-state-text + There are + = number_with_delimiter(publicish_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 \ No newline at end of file -- cgit v1.2.1 From 3b00b0380b0cc5ec4b8e59ea99f9130ddd5b5266 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:23:46 +0530 Subject: Move welcome pages to individual partials --- .../projects/_zero_authorized_projects.html.haml | 59 +++++----------------- 1 file changed, 12 insertions(+), 47 deletions(-) (limited to 'app') diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index 8843d4e7c84..bf34ccca914 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -1,47 +1,12 @@ -- publicish_project_count = ProjectsFinder.new(current_user: current_user).execute.count -.blank-state.blank-state-welcome - %h2.blank-state-welcome-title - Welcome to GitLab - %p.blank-state-text - Code, test, and deploy together - -- if current_user.can_create_group? - .blank-state - .blank-state-icon - = custom_icon("group", size: 50) - %h3.blank-state-title - You can 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("project", size: 50) - %h3.blank-state-title - You don't have access to any projects right now - %p.blank-state-text - - if current_user.can_create_project? - 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. - - if current_user.can_create_project? - = link_to new_project_path, class: "btn btn-new" do - New project - -- if publicish_project_count > 0 - .blank-state - .blank-state-icon - = icon("globe") - %h3.blank-state-title - There are - = number_with_delimiter(publicish_project_count) - public projects on this server. - %p.blank-state-text - 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 +.row.blank-state-parent-container + .col-md-6.section-container + .section-body.section-welcome + .blank-state.blank-state-welcome + %h2.blank-state-welcome-title + Welcome to GitLab + %p.blank-state-text + Code, test, and deploy together + - if current_user.admin? + = render "blank_state_admin_welcome" + - else + = render "blank_state_welcome" \ No newline at end of file -- cgit v1.2.1 From d550377d90848dd480537fa6cb85b5227641539d Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:24:01 +0530 Subject: Fix callout size to fit parent container --- app/assets/stylesheets/pages/profile.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index c207159f606..97b33a1169f 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -286,8 +286,8 @@ table.u2f-registrations { } .user-callout { - margin: 0 auto; - max-width: $screen-lg-min; + margin: 20px -5px auto -5px; + margin-top: 20px; .bordered-box { border: 1px solid $blue-300; -- cgit v1.2.1 From c9432c394cdf5c7dbf46fe67a40fe4c500383fb4 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 00:24:16 +0530 Subject: Update welcome page styles --- app/assets/stylesheets/framework/blank.scss | 59 +++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index a2fa2e7769b..e7806992bec 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -1,6 +1,28 @@ +.blank-state-parent-container { + display: flex; + + .section-container { + display: flex; + flex: 1; + padding: 10px; + } + + .section-body { + width: 100%; + height: 100%; + border: 1px solid $border-color; + border-radius: $border-radius-default; + + &.section-ee-trial { + display: flex; + align-items: center; + justify-content: center; + } + } +} + .blank-state-welcome { text-align: center; - border-bottom: 1px solid $border-color; .blank-state-text { margin-bottom: 0; @@ -10,6 +32,10 @@ .blank-state { padding-top: 20px; padding-bottom: 20px; +} + +.blank-state.ee-trial { + padding: 20px; text-align: center; } @@ -20,20 +46,18 @@ .blank-state-icon { padding-bottom: 20px; - color: $gray-darkest; font-size: 56px; - path, - polygon { - fill: currentColor; + svg { + display: block; + margin: auto; } } .blank-state-title { margin-top: 0; - margin-bottom: 5px; + margin-bottom: 10px; font-size: 18px; - font-weight: normal; } .blank-state-text { @@ -49,3 +73,24 @@ .blank-state-welcome-title { font-size: 24px; } + +@media (max-width: $screen-md-min) { + .blank-state-parent-container { + &, + .section-container { + display: block; + } + } + + .blank-state { + text-align: center; + } + + .blank-state-icon { + padding-bottom: 0; + } + + .blank-state-body { + margin-top: 15px; + } +} -- cgit v1.2.1 From 4456881f97c3e4253a51a51fa7c7a8b20469d171 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 13:34:54 +0530 Subject: Fix column offset, add missing new line char --- .../projects/_blank_state_admin_welcome.html.haml | 14 +++++++------- .../dashboard/projects/_blank_state_welcome.html.haml | 2 +- .../dashboard/projects/_zero_authorized_projects.html.haml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'app') 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 83d103aff0d..9fead1bafb8 100644 --- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -1,7 +1,7 @@ .blank-state.clearfix - .blank-state-icon.col-md-1.col-md-offset-4 + .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_user", size: 50) - .blank-state-body.col-md-3 + .col-md-5.blank-state-body %h3.blank-state-title Add user %p.blank-state-text @@ -10,9 +10,9 @@ New user .blank-state.clearfix - .blank-state-icon.col-md-1.col-md-offset-4 + .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("configure_server", size: 50) - .blank-state-body.col-md-3 + .col-md-5.blank-state-body %h3.blank-state-title Configure GitLab %p.blank-state-text @@ -22,12 +22,12 @@ - if current_user.can_create_group? .blank-state.clearfix - .blank-state-icon.col-md-1.col-md-offset-4 + .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_group", size: 50) - .blank-state-body.col-md-3 + .col-md-5.blank-state-body %h3.blank-state-title Create a group %p.blank-state-text Groups are a great way to organise projects and people. = link_to new_group_path, class: "btn btn-new" do - New group \ No newline at end of file + New group diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index d3b0a9d6264..5c2d3732a77 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -45,4 +45,4 @@ 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 \ No newline at end of file + Browse projects diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index bf34ccca914..6a6b5b79353 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -9,4 +9,4 @@ - if current_user.admin? = render "blank_state_admin_welcome" - else - = render "blank_state_welcome" \ No newline at end of file + = render "blank_state_welcome" -- cgit v1.2.1 From 7732c274c28137973271fabe7ace2d17358be153 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 13:35:06 +0530 Subject: Override BS column offset margin --- app/assets/stylesheets/framework/blank.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index e7806992bec..479e8370d78 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -47,6 +47,7 @@ .blank-state-icon { padding-bottom: 20px; font-size: 56px; + margin-left: 30%; /* this is slight increase over 25% of col-md-offset-3 */ svg { display: block; -- cgit v1.2.1 From b7dcd1a0910e316dabd3d9675cf9d861b77a911e Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 14:14:03 +0530 Subject: Make offset override specific to admin welcome page --- app/assets/stylesheets/framework/blank.scss | 11 ++++++++++- .../dashboard/projects/_zero_authorized_projects.html.haml | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 479e8370d78..0abc5aa460b 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -47,7 +47,6 @@ .blank-state-icon { padding-bottom: 20px; font-size: 56px; - margin-left: 30%; /* this is slight increase over 25% of col-md-offset-3 */ svg { display: block; @@ -55,6 +54,16 @@ } } +.section-admin-welcome { + /** + * This is slight increase over 25% of col-md-offset-3 for + * admin welcome page + */ + .blank-state-icon.col-md-offset-3 { + margin-left: 30%; + } +} + .blank-state-title { margin-top: 0; margin-bottom: 10px; diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index 6a6b5b79353..920fb90e857 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -1,6 +1,6 @@ .row.blank-state-parent-container .col-md-6.section-container - .section-body.section-welcome + .section-body.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" } .blank-state.blank-state-welcome %h2.blank-state-welcome-title Welcome to GitLab -- cgit v1.2.1 From 8e53dcbfd19be4d027a7da0872327577438e2989 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 14:42:04 +0530 Subject: Rename variable to `public_project_count` --- app/views/dashboard/projects/_blank_state_welcome.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index 5c2d3732a77..ab5763d0ee1 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -1,4 +1,4 @@ -- publicish_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.clearfix @@ -31,7 +31,7 @@ = link_to new_project_path, class: "btn btn-new" do New project -- if publicish_project_count > 0 +- if public_project_count > 0 .blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("globe", size: 50) @@ -40,7 +40,7 @@ Explore public projects %p.blank-state-text There are - = number_with_delimiter(publicish_project_count) + = 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. -- cgit v1.2.1 From 4304aff1d8b8a07a3e81f17bd468de043c00f291 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 14:42:24 +0530 Subject: Remove unnecessary column class --- app/views/dashboard/projects/_zero_authorized_projects.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index 920fb90e857..79a3bc00d29 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -1,5 +1,5 @@ .row.blank-state-parent-container - .col-md-6.section-container + .section-container .section-body.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" } .blank-state.blank-state-welcome %h2.blank-state-welcome-title -- cgit v1.2.1 From 229a70a88c9c8bb0f0f2d172ff3c3b9b4ca43d0f Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 14:42:34 +0530 Subject: Fix margin override for mobile --- app/assets/stylesheets/framework/blank.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 0abc5aa460b..818b94103b7 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -61,6 +61,10 @@ */ .blank-state-icon.col-md-offset-3 { margin-left: 30%; + + @media (max-width: $screen-md-min) { + margin-left: auto; + } } } -- cgit v1.2.1 From fb74dbda07064b2af35b6841056255be3e2072ba Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 14:42:51 +0530 Subject: Reduce callout margin prop declaration --- app/assets/stylesheets/pages/profile.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 97b33a1169f..235c475ff26 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -286,8 +286,7 @@ table.u2f-registrations { } .user-callout { - margin: 20px -5px auto -5px; - margin-top: 20px; + margin: 20px -5px 0; .bordered-box { border: 1px solid $blue-300; -- cgit v1.2.1 From 39857887ed61f16b5ba92ee661d118930b7e2796 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Thu, 6 Jul 2017 21:34:24 +0530 Subject: Add container class `.row` --- app/views/dashboard/projects/_blank_state_admin_welcome.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app') 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 9fead1bafb8..0319838bdb4 100644 --- a/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_admin_welcome.html.haml @@ -1,4 +1,4 @@ -.blank-state.clearfix +.row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_user", size: 50) .col-md-5.blank-state-body @@ -9,7 +9,7 @@ = link_to new_admin_user_path, class: "btn btn-new" do New user -.blank-state.clearfix +.row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("configure_server", size: 50) .col-md-5.blank-state-body @@ -21,7 +21,7 @@ Configure - if current_user.can_create_group? - .blank-state.clearfix + .row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_group", size: 50) .col-md-5.blank-state-body -- cgit v1.2.1 From 7d2a4efe634500801ea681a46834a832ad20a542 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 7 Jul 2017 13:24:51 +0530 Subject: Fix icon container width with smaller desktop screens --- app/assets/stylesheets/framework/blank.scss | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 818b94103b7..6409bc63d73 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -54,18 +54,28 @@ } } -.section-admin-welcome { +.section-welcome { /** * This is slight increase over 25% of col-md-offset-3 for * admin welcome page */ - .blank-state-icon.col-md-offset-3 { + &.section-admin-welcome .blank-state-icon.col-md-offset-3 { margin-left: 30%; @media (max-width: $screen-md-min) { margin-left: auto; } } + + /** + * This is slight increase over 8.33% of col-md-1 for + * admin/standard user welcome page on smaller desktops + */ + .blank-state-icon.col-md-1 { + @media (min-width: $screen-sm-max) { + width: 10%; + } + } } .blank-state-title { -- cgit v1.2.1 From 6a19b789ff8a592b25bcb0bc11f9dc5320f97ae5 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 7 Jul 2017 13:35:50 +0530 Subject: Add container bottom padding --- app/assets/stylesheets/framework/blank.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 6409bc63d73..2149ce9a810 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -10,6 +10,7 @@ .section-body { width: 100%; height: 100%; + padding-bottom: 25px; border: 1px solid $border-color; border-radius: $border-radius-default; -- cgit v1.2.1 From 872508159794d1d64915324acf70cde27adfe36c Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 7 Jul 2017 17:58:53 +0530 Subject: Replace bootstrap overrides with scaling SVG on smaller screens --- app/assets/stylesheets/framework/blank.scss | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 2149ce9a810..7f1abe87d9e 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -52,29 +52,9 @@ svg { display: block; margin: auto; - } -} - -.section-welcome { - /** - * This is slight increase over 25% of col-md-offset-3 for - * admin welcome page - */ - &.section-admin-welcome .blank-state-icon.col-md-offset-3 { - margin-left: 30%; - - @media (max-width: $screen-md-min) { - margin-left: auto; - } - } - /** - * This is slight increase over 8.33% of col-md-1 for - * admin/standard user welcome page on smaller desktops - */ - .blank-state-icon.col-md-1 { @media (min-width: $screen-sm-max) { - width: 10%; + width: 130%; } } } -- cgit v1.2.1 From 6384985f222f2289e3f7b782c644d3df3768a53b Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 7 Jul 2017 23:00:14 +0530 Subject: Fix missing `row` & `container` classes --- app/views/dashboard/projects/_blank_state_welcome.html.haml | 6 +++--- app/views/dashboard/projects/_zero_authorized_projects.html.haml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/views/dashboard/projects/_blank_state_welcome.html.haml b/app/views/dashboard/projects/_blank_state_welcome.html.haml index ab5763d0ee1..a079f0ac1a4 100644 --- a/app/views/dashboard/projects/_blank_state_welcome.html.haml +++ b/app/views/dashboard/projects/_blank_state_welcome.html.haml @@ -1,7 +1,7 @@ - public_project_count = ProjectsFinder.new(current_user: current_user).execute.count - if current_user.can_create_group? - .blank-state.clearfix + .row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_group", size: 50) .col-md-5.blank-state-body @@ -12,7 +12,7 @@ = link_to new_group_path, class: "btn btn-new" do New group -.blank-state.clearfix +.row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("add_new_project", size: 50) .col-md-5.blank-state-body @@ -32,7 +32,7 @@ New project - if public_project_count > 0 - .blank-state.clearfix + .row.blank-state.clearfix .col-md-1.col-md-offset-3.blank-state-icon = custom_icon("globe", size: 50) .col-md-5.blank-state-body diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml index 79a3bc00d29..94af033c1e3 100644 --- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml +++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml @@ -1,6 +1,6 @@ .row.blank-state-parent-container .section-container - .section-body.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" } + .container.section-body.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" } .blank-state.blank-state-welcome %h2.blank-state-welcome-title Welcome to GitLab -- cgit v1.2.1 From f71511611a8a1a7ffdb675e5bcf985d611405455 Mon Sep 17 00:00:00 2001 From: kushalpandya Date: Fri, 7 Jul 2017 23:00:33 +0530 Subject: Fix SVG scaling issue --- app/assets/stylesheets/framework/blank.scss | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss index 7f1abe87d9e..c0224d3bfa9 100644 --- a/app/assets/stylesheets/framework/blank.scss +++ b/app/assets/stylesheets/framework/blank.scss @@ -52,10 +52,12 @@ svg { display: block; margin: auto; + } +} - @media (min-width: $screen-sm-max) { - width: 130%; - } +@media (min-width: $screen-sm-max) { + .section-welcome .blank-state-icon svg { + width: 130%; } } -- cgit v1.2.1