Commit 68662cc7 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Show ee trial column

parent 3ae7c28a
......@@ -15,6 +15,7 @@
display: flex;
flex-wrap: wrap;
justify-content: space-around;
height: 100%;
}
.blank-state-welcome {
......@@ -34,16 +35,17 @@
display: block;
color: $gl-text-color;
flex: 0 0 100%;
margin-bottom: 15px;
@media (min-width: $screen-sm-min) {
flex: 0 0 48%;
flex: 0 0 49%;
&:nth-child(odd) {
margin-right: 10px;
margin-right: 5px;
}
&:nth-child(even) {
margin-left: 10px;
margin-left: 5px;
}
}
......@@ -56,12 +58,12 @@
.blank-state {
padding: 20px;
margin-bottom: 30px;
border: 1px solid $border-color;
border-radius: $border-radius-default;
@media (min-width: $screen-sm-min) {
display: flex;
height: 100%;
align-items: center;
padding: 50px 30px;
}
......@@ -91,21 +93,30 @@
}
/* EE-specific Styles */
@media (min-width: $screen-md-min) {
.blank-state-parent-container.has-start-trial-container {
display: flex;
@media (min-width: $screen-lg-min) {
.column-large {
flex: 2;
}
}
.section-ee-trial {
.section-body {
display: flex;
align-items: center;
justify-content: center;
.column-small {
flex: 1;
margin-bottom: 15px;
.blank-state {
padding: 20px;
text-align: center;
max-width: 400px;
flex-wrap: wrap;
margin-left: 15px;
}
.blank-state-icon {
margin-bottom: 30px;
}
}
}
@media (max-width: $screen-xs-max) {
.blank-state-icon svg {
width: 315px;
}
}
- 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) }
.container.section-body
.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"
- if admin_without_ee_license
.col-md-6.section-container.section-ee-trial
.container.section-body
= render "blank_state_ee_trial"
.row
.blank-state-welcome
%h2.blank-state-welcome-title
Welcome to GitLab
%p.blank-state-text
Code, test, and deploy together
.blank-state-row
%div{ class: ('column-large' if admin_without_ee_license) }
- if current_user.admin?
= render "blank_state_admin_welcome"
- else
= render "blank_state_welcome"
- if admin_without_ee_license
.column-small
= render "blank_state_ee_trial"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment