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
68662cc7
Commit
68662cc7
authored
Nov 08, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show ee trial column
parent
3ae7c28a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
29 deletions
+42
-29
app/assets/stylesheets/framework/blank.scss
app/assets/stylesheets/framework/blank.scss
+26
-15
app/views/dashboard/projects/_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+16
-14
No files found.
app/assets/stylesheets/framework/blank.scss
View file @
68662cc7
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
display
:
flex
;
display
:
flex
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
justify-content
:
space-around
;
justify-content
:
space-around
;
height
:
100%
;
}
}
.blank-state-welcome
{
.blank-state-welcome
{
...
@@ -34,16 +35,17 @@
...
@@ -34,16 +35,17 @@
display
:
block
;
display
:
block
;
color
:
$gl-text-color
;
color
:
$gl-text-color
;
flex
:
0
0
100%
;
flex
:
0
0
100%
;
margin-bottom
:
15px
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
flex
:
0
0
4
8
%
;
flex
:
0
0
4
9
%
;
&
:nth-child
(
odd
)
{
&
:nth-child
(
odd
)
{
margin-right
:
10
px
;
margin-right
:
5
px
;
}
}
&
:nth-child
(
even
)
{
&
:nth-child
(
even
)
{
margin-left
:
10
px
;
margin-left
:
5
px
;
}
}
}
}
...
@@ -56,12 +58,12 @@
...
@@ -56,12 +58,12 @@
.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
;
@media
(
min-width
:
$screen-sm-min
)
{
@media
(
min-width
:
$screen-sm-min
)
{
display
:
flex
;
display
:
flex
;
height
:
100%
;
align-items
:
center
;
align-items
:
center
;
padding
:
50px
30px
;
padding
:
50px
30px
;
}
}
...
@@ -91,21 +93,30 @@
...
@@ -91,21 +93,30 @@
}
}
/* EE-specific Styles */
/* EE-specific Styles */
@media
(
min-width
:
$screen-md-min
)
{
.blank-state-parent-container.has-start-trial-container
{
@media
(
min-width
:
$screen-lg-min
)
{
display
:
flex
;
.column-large
{
flex
:
2
;
}
}
}
.section-ee-trial
{
.column-small
{
.section-body
{
flex
:
1
;
display
:
flex
;
margin-bottom
:
15px
;
align-items
:
center
;
justify-content
:
center
;
.blank-state
{
.blank-state
{
padding
:
20px
;
max-width
:
400px
;
text-align
:
center
;
flex-wrap
:
wrap
;
margin-left
:
15px
;
}
.blank-state-icon
{
margin-bottom
:
30px
;
}
}
}
}
}
}
@media
(
max-width
:
$screen-xs-max
)
{
.blank-state-icon
svg
{
width
:
315px
;
}
}
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @
68662cc7
-
admin_without_ee_license
=
!
current_license
&&
current_user
.
admin?
-
admin_without_ee_license
=
!
current_license
&&
current_user
.
admin?
.
row.
blank-state-parent-container
{
class:
(
'has-start-trial-container'
if
admin_without_ee_license
)
}
.blank-state-parent-container
{
class:
(
'has-start-trial-container'
if
admin_without_ee_license
)
}
.section-container.section-welcome
{
class:
(
'col-md-6'
if
admin_without_ee_license
)
}
.section-container.section-welcome
{
class:
(
'col-md-6'
if
admin_without_ee_license
)
}
.container.section-body
.container.section-body
.blank-state-welcome
.row
%h2
.blank-state-welcome-title
.blank-state-welcome
Welcome to GitLab
%h2
.blank-state-welcome-title
%p
.blank-state-text
Welcome to GitLab
Code, test, and deploy together
%p
.blank-state-text
-
if
current_user
.
admin?
Code, test, and deploy together
=
render
"blank_state_admin_welcome"
.blank-state-row
-
else
%div
{
class:
(
'column-large'
if
admin_without_ee_license
)
}
=
render
"blank_state_welcome"
-
if
current_user
.
admin?
-
if
admin_without_ee_license
=
render
"blank_state_admin_welcome"
.col-md-6.section-container.section-ee-trial
-
else
.container.section-body
=
render
"blank_state_welcome"
=
render
"blank_state_ee_trial"
-
if
admin_without_ee_license
.column-small
=
render
"blank_state_ee_trial"
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