Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cc38405e
Commit
cc38405e
authored
Jul 11, 2017
by
Kushal Pandya
Committed by
Phil Hughes
Jul 11, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix welcome page action items alignment
parent
c17b1d5f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
40 additions
and
92 deletions
+40
-92
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+19
-72
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
...s/dashboard/projects/_blank_state_admin_welcome.html.haml
+9
-9
app/views/dashboard/projects/_blank_state_welcome.html.haml
app/views/dashboard/projects/_blank_state_welcome.html.haml
+9
-9
app/views/dashboard/projects/_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+2
-2
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
cc38405e
.blank-state-parent-container
{
.blank-state-parent-container
{
display
:
flex
;
.section-container
{
.section-container
{
display
:
flex
;
flex
:
1
;
padding
:
10px
;
padding
:
10px
;
}
}
...
@@ -13,91 +9,42 @@
...
@@ -13,91 +9,42 @@
padding-bottom
:
25px
;
padding-bottom
:
25px
;
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
border-radius
:
$border-radius-default
;
border-radius
:
$border-radius-default
;
&
.section-ee-trial
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
}
}
.blank-state-welcome
{
text-align
:
center
;
.blank-state-text
{
margin-bottom
:
0
;
}
}
}
}
.blank-state
{
.blank-state
{
padding-top
:
20px
;
padding-top
:
20px
;
padding-bottom
:
20px
;
padding-bottom
:
20px
;
}
.blank-state.ee-trial
{
padding
:
20px
;
text-align
:
center
;
text-align
:
center
;
}
.blank-state-no-icon
{
padding-top
:
40px
;
padding-bottom
:
40px
;
}
.blank-state-icon
{
padding-bottom
:
20px
;
font-size
:
56px
;
svg
{
&
.blank-state-welcome
{
display
:
block
;
.blank-state-welcome-title
{
margin
:
auto
;
font-size
:
24px
;
}
}
}
@media
(
min-width
:
$screen-sm-max
)
{
.section-welcome
.blank-state-icon
svg
{
width
:
130%
;
}
}
.blank-state-title
{
margin-top
:
0
;
margin-bottom
:
10px
;
font-size
:
18px
;
}
.blank-state-text
{
margin-top
:
0
;
margin-bottom
:
$gl-padding
;
font-size
:
14px
;
>
strong
{
.blank-state-text
{
font-weight
:
600
;
margin-bottom
:
0
;
}
}
}
}
.blank-state-welcome-title
{
.blank-state-icon
{
font-size
:
24px
;
padding-bottom
:
20px
;
}
@media
(
max-width
:
$screen-md-min
)
{
svg
{
.blank-state-parent-container
{
&
,
.section-container
{
display
:
block
;
display
:
block
;
margin
:
auto
;
}
}
}
}
.blank-state
{
.blank-state-title
{
text-align
:
center
;
margin-top
:
0
;
margin-bottom
:
10px
;
font-size
:
18px
;
}
}
.blank-state-icon
{
.blank-state-text
{
padding-bottom
:
0
;
max-width
:
$container-text-max-width
;
}
margin
:
0
auto
$gl-padding
;
font-size
:
14px
;
.blank-state-body
{
margin-top
:
15px
;
}
}
}
}
app/assets/stylesheets/framework/variables.scss
View file @
cc38405e
...
@@ -176,6 +176,7 @@ $header-height: 50px;
...
@@ -176,6 +176,7 @@ $header-height: 50px;
$fixed-layout-width
:
1280px
;
$fixed-layout-width
:
1280px
;
$limited-layout-width
:
990px
;
$limited-layout-width
:
990px
;
$limited-layout-width-sm
:
790px
;
$limited-layout-width-sm
:
790px
;
$container-text-max-width
:
540px
;
$gl-avatar-size
:
40px
;
$gl-avatar-size
:
40px
;
$error-exclamation-point
:
$red-500
;
$error-exclamation-point
:
$red-500
;
$border-radius-default
:
3px
;
$border-radius-default
:
3px
;
...
...
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
View file @
cc38405e
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"add_new_user"
,
size:
50
)
=
custom_icon
(
"add_new_user"
,
size:
50
)
.
col-md-5.
blank-state-body
.blank-state-body
%h3
.blank-state-title
%h3
.blank-state-title
Add user
Add user
%p
.blank-state-text
%p
.blank-state-text
...
@@ -9,10 +9,10 @@
...
@@ -9,10 +9,10 @@
=
link_to
new_admin_user_path
,
class:
"btn btn-new"
do
=
link_to
new_admin_user_path
,
class:
"btn btn-new"
do
New user
New user
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"configure_server"
,
size:
50
)
=
custom_icon
(
"configure_server"
,
size:
50
)
.
col-md-5.
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
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
Configure
Configure
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
=
custom_icon
(
"add_new_group"
,
size:
50
)
.
col-md-5.
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
...
...
app/views/dashboard/projects/_blank_state_welcome.html.haml
View file @
cc38405e
-
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?
-
if
current_user
.
can_create_group?
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"add_new_group"
,
size:
50
)
=
custom_icon
(
"add_new_group"
,
size:
50
)
.
col-md-5.
blank-state-body
.blank-state-body
%h3
.blank-state-title
%h3
.blank-state-title
Create a group for several dependent projects.
Create a group for several dependent projects.
%p
.blank-state-text
%p
.blank-state-text
...
@@ -12,10 +12,10 @@
...
@@ -12,10 +12,10 @@
=
link_to
new_group_path
,
class:
"btn btn-new"
do
=
link_to
new_group_path
,
class:
"btn btn-new"
do
New group
New group
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"add_new_project"
,
size:
50
)
=
custom_icon
(
"add_new_project"
,
size:
50
)
.
col-md-5.
blank-state-body
.blank-state-body
%h3
.blank-state-title
%h3
.blank-state-title
Create a project
Create a project
%p
.blank-state-text
%p
.blank-state-text
...
@@ -32,10 +32,10 @@
...
@@ -32,10 +32,10 @@
New project
New project
-
if
public_project_count
>
0
-
if
public_project_count
>
0
.
row.blank-state.clearfix
.
blank-state
.
col-md-1.col-md-offset-3.
blank-state-icon
.blank-state-icon
=
custom_icon
(
"globe"
,
size:
50
)
=
custom_icon
(
"globe"
,
size:
50
)
.
col-md-5.
blank-state-body
.blank-state-body
%h3
.blank-state-title
%h3
.blank-state-title
Explore public projects
Explore public projects
%p
.blank-state-text
%p
.blank-state-text
...
...
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @
cc38405e
.row.blank-state-parent-container
.row.blank-state-parent-container
.section-container
.section-container
.section-welcome
{
class:
"#{ 'section-admin-welcome' if current_user.admin? }"
}
.container.section-body
.section-welcome
{
class:
"#{ 'section-admin-welcome' if current_user.admin? }"
}
.container.section-body
.blank-state.blank-state-welcome
.blank-state.blank-state-welcome
%h2
.blank-state-welcome-title
%h2
.blank-state-welcome-title
Welcome to GitLab
Welcome to GitLab
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment