Commit f2f2dfc6 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'fix-ui-margin-on-billing' into 'master'

Add margin to billings page

See merge request gitlab-org/gitlab!74221
parents 401a345f e0de376b
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= render_if_exists 'shared/qrtly_reconciliation_alert', group: @group = render_if_exists 'shared/qrtly_reconciliation_alert', group: @group
- if @top_most_group - if @top_most_group # subgroup
- top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name) - top_most_group_plan = subscription_plan_info(@plans_data, @top_most_group.actual_plan_name)
= render 'shared/billings/billing_plan_header', namespace: @group, plan: top_most_group_plan, parent_group: @top_most_group = render 'shared/billings/billing_plan_header', namespace: @group, plan: top_most_group_plan, parent_group: @top_most_group
- else - else
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- if namespace_for_user - if namespace_for_user
= render_if_exists 'trials/banner', namespace: namespace = render_if_exists 'trials/banner', namespace: namespace
.billing-plan-header.content-block.center.gl-mb-3 .billing-plan-header.content-block.center
.billing-plan-logo .billing-plan-logo
- if namespace_for_user - if namespace_for_user
.avatar-container.s96.home-panel-avatar.gl-mr-3.float-none.mx-auto.mb-4.mt-1 .avatar-container.s96.home-panel-avatar.gl-mr-3.float-none.mx-auto.mb-4.mt-1
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
- if show_plans?(namespace) - if show_plans?(namespace)
- plans = billing_available_plans(plans_data, current_plan) - plans = billing_available_plans(plans_data, current_plan)
.billing-plans .billing-plans.gl-mt-7
- plans.each do |plan| - plans.each do |plan|
- next if plan.hide_card - next if plan.hide_card
- is_default_plan = current_plan.nil? && plan.default? - is_default_plan = current_plan.nil? && plan.default?
......
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