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
935b4818
Commit
935b4818
authored
Aug 02, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix billing card styles
parent
d40ccdc5
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
ee/app/assets/stylesheets/pages/billings.scss
ee/app/assets/stylesheets/pages/billings.scss
+6
-6
ee/app/views/shared/billings/_billing_plan.html.haml
ee/app/views/shared/billings/_billing_plan.html.haml
+2
-2
ee/app/views/shared/billings/_billing_plans.html.haml
ee/app/views/shared/billings/_billing_plans.html.haml
+2
-2
No files found.
ee/app/assets/stylesheets/pages/billings.scss
View file @
935b4818
...
...
@@ -29,6 +29,10 @@
justify-content
:
center
;
margin-top
:
8px
;
.card-header
{
border-bottom
:
0
;
}
.card
{
display
:
flex
;
flex-direction
:
column
;
...
...
@@ -48,13 +52,13 @@
width
:
290px
;
}
.card-head
ing
,
.card-head
er
,
.card-body
{
border-left
:
1px
solid
$list-border
;
border-right
:
1px
solid
$list-border
;
}
.card-head
ing
{
.card-head
er
{
background-color
:
$blue-500
;
color
:
$white-light
;
border
:
0
;
...
...
@@ -138,10 +142,6 @@
}
&
.current
{
.card-heading
{
background-color
:
$blue-600
;
}
.card-body
{
border-color
:
$blue-600
;
border-width
:
2px
;
...
...
ee/app/views/shared/billings/_billing_plan.html.haml
View file @
935b4818
.card
.bg-info
{
class:
(
'current'
if
current_plan?
(
plan
))
}
.card-header
.card
{
class:
(
'current'
if
current_plan?
(
plan
))
}
.card-header
.bg-info.text-white
=
plan
.
name
.card-body
...
...
ee/app/views/shared/billings/_billing_plans.html.haml
View file @
935b4818
...
...
@@ -4,8 +4,8 @@
=
render
'shared/billings/billing_plan_header'
,
namespace:
namespace
,
plan:
current_plan
-
unless
has_plan_purchase_link?
(
plans_data
)
.billing-plans-alert.card.
bg-warning.
prepend-top-10
.card-header
.billing-plans-alert.card.prepend-top-10
.card-header
.bg-warning.text-white
=
s_
(
"BillingPlans|Automatic downgrade and upgrade to some plans is currently not available."
)
-
customer_support_url
=
'https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=334447'
;
-
customer_support_link
=
link_to
s_
(
"BillingPlans|Customer Support"
),
customer_support_url
...
...
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