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
3ae7c28a
Commit
3ae7c28a
authored
Nov 08, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use flexbox instead of bootstrap columns
parent
861563f6
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
75 deletions
+84
-75
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+19
-0
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
...s/dashboard/projects/_blank_state_admin_welcome.html.haml
+25
-29
app/views/dashboard/projects/_blank_state_welcome.html.haml
app/views/dashboard/projects/_blank_state_welcome.html.haml
+40
-46
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
3ae7c28a
...
...
@@ -11,6 +11,12 @@
}
}
.blank-state-row
{
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
space-around
;
}
.blank-state-welcome
{
text-align
:
center
;
padding
:
20px
0
40px
;
...
...
@@ -27,6 +33,19 @@
.blank-state-link
{
display
:
block
;
color
:
$gl-text-color
;
flex
:
0
0
100%
;
@media
(
min-width
:
$screen-sm-min
)
{
flex
:
0
0
48%
;
&
:nth-child
(
odd
)
{
margin-right
:
10px
;
}
&
:nth-child
(
even
)
{
margin-left
:
10px
;
}
}
&
:hover
{
background-color
:
$gray-light
;
...
...
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
View file @
3ae7c28a
.row
.col-md-6
.blank-state-row
=
link_to
new_project_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
...
...
@@ -11,7 +10,6 @@
Projects are where you store your code, access issues, wiki and other features of GitLab.
-
if
current_user
.
can_create_group?
.col-md-6
=
link_to
admin_root_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
...
...
@@ -22,7 +20,6 @@
%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
.blank-state
.blank-state-icon
...
...
@@ -33,13 +30,12 @@
%p
.blank-state-text
Add your team members and others to GitLab.
.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 your server
Configure GitLab
%p
.blank-state-text
Make adjustments to how your GitLab instance is set up.
app/views/dashboard/projects/_blank_state_welcome.html.haml
View file @
3ae7c28a
-
public_project_count
=
ProjectsFinder
.
new
(
current_user:
current_user
).
execute
.
count
.row
.col-md-6
.blank-state-row
-
if
current_user
.
can_create_project?
=
link_to
new_project_path
,
class:
"blank-state-link"
do
.blank-state
...
...
@@ -23,7 +22,6 @@
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
...
...
@@ -34,10 +32,7 @@
%p
.blank-state-text
Groups are the best way to manage projects and members.
.clearfix
-
if
public_project_count
>
0
.col-md-6
=
link_to
trending_explore_projects_path
,
class:
"blank-state-link"
do
.blank-state
.blank-state-icon
...
...
@@ -52,7 +47,6 @@
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-icon
...
...
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