Skip to content
Snippets Groups Projects
Commit ccf87698 authored by Enrique Alcántara's avatar Enrique Alcántara
Browse files

Merge branch 'use-gitlab-ui-utility-classes-for-billing' into 'master'

Use gitlab-ui settings instead for billing page

See merge request gitlab-org/gitlab!87116
parents 29c732ee cf8aad55
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -367,29 +367,3 @@ to @gitlab/ui by https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1709
-webkit-backdrop-filter: blur(2px); // still required by Safari
}
 
/*
* The below style will be moved to @gitlab/ui by
* https://gitlab.com/gitlab-org/gitlab-ui/-/issues/1792
*/
.gl-text-purple-800 {
color: $purple-800;
}
.gl-bg-theme-indigo-800 {
background-color: $theme-indigo-800;
}
.gl-border-indigo-700 {
border-color: $theme-indigo-700;
}
.gl-border-gray-75 {
border-color: $gl-text-color-quaternary;
}
.gl-min-h-8 {
min-height: $gl-spacing-scale-8;
}
/* End gitlab-ui#1751 */
Loading
Loading
@@ -130,9 +130,9 @@ def plans_data
}
},
'premium' => {
"card_border_classes": "gl-border-indigo-700",
"card_border_classes": "gl-border-purple-700",
"header_text": s_("BillingPlans|Recommended"),
"header_classes": "gl-line-height-normal gl-font-weight-bold gl-py-4 gl-h-8 gl-bg-theme-indigo-800 " \
"header_classes": "gl-line-height-normal gl-font-weight-bold gl-py-4 gl-h-8 gl-bg-purple-800 " \
"gl-text-white",
"elevator_pitch": s_("BillingPlans|Enhance team productivity and collaboration"),
"features": [
Loading
Loading
Loading
Loading
@@ -16,7 +16,7 @@
new_trial_path,
class: ["gl-mb-6 btn gl-button btn-confirm-secondary"],
data: { track_action: 'click_button', track_label: 'start_trial', track_experiment: :promote_premium_billing_page }
.billing-plan-divider.gl-m-auto.gl-border-b-solid.gl-border-1.gl-border-gray-75.gl-mb-7
.billing-plan-divider.gl-m-auto.gl-border-b.gl-mb-7
- image_alt = s_('InProductMarketing|Team members collaborating')
= image_tag 'marketing/free-trial-team-members.png', alt: image_alt, title: image_alt, width: 280, height: 125, class: 'gl-mb-6'
.gl-font-size-h1.gl-font-weight-bold.gl-line-height-24.gl-mb-4
Loading
Loading
Loading
Loading
@@ -51,7 +51,7 @@
 
it 'has header for the current plan' do
expect(rendered_component).to have_content('Recommended')
expect(rendered_component).to have_selector('.gl-bg-theme-indigo-800')
expect(rendered_component).to have_selector('.gl-bg-purple-800')
end
 
it 'has pricing info' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment