BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
95ab3bf5
Unverified
Commit
95ab3bf5
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
5c909f2b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
14 deletions
+25
-14
blank.scss
app/assets/stylesheets/framework/blank.scss
+21
-1
_blank_state_admin_welcome.html.haml
...s/dashboard/projects/_blank_state_admin_welcome.html.haml
+1
-5
_blank_state_welcome.html.haml
app/views/dashboard/projects/_blank_state_welcome.html.haml
+1
-7
_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+2
-1
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
95ab3bf5
...
@@ -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
;
...
...
app/views/dashboard/projects/_blank_state_admin_welcome.html.haml
View file @
95ab3bf5
.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
.blank-state-icon
.blank-state-icon
...
@@ -11,7 +10,6 @@
...
@@ -11,7 +10,6 @@
Projects are where you store your code, access issues, wiki and other features of GitLab.
Projects are where you store your code, access issues, wiki and other features of GitLab.
-
if
current_user
.
can_create_group?
-
if
current_user
.
can_create_group?
.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
...
@@ -22,7 +20,6 @@
...
@@ -22,7 +20,6 @@
%p
.blank-state-text
%p
.blank-state-text
Groups are a great way to organize projects and people.
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,7 +30,6 @@
...
@@ -33,7 +30,6 @@
%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
...
...
app/views/dashboard/projects/_blank_state_welcome.html.haml
View file @
95ab3bf5
-
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
...
@@ -23,7 +22,6 @@
...
@@ -23,7 +22,6 @@
If you are added to a project, it will be displayed here.
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
...
@@ -34,10 +32,7 @@
...
@@ -34,10 +32,7 @@
%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
.blank-state-icon
.blank-state-icon
...
@@ -52,7 +47,6 @@
...
@@ -52,7 +47,6 @@
Public projects are an easy way to allow
Public projects are an easy way to allow
everyone to have read-only access.
everyone to have read-only access.
.col-md-6
=
link_to
"https://docs.gitlab.com/"
,
class:
"blank-state-link"
do
=
link_to
"https://docs.gitlab.com/"
,
class:
"blank-state-link"
do
.blank-state
.blank-state
.blank-state-icon
.blank-state-icon
...
...
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @
95ab3bf5
.
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
.row
.blank-state-welcome
.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