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
30a376fa
Commit
30a376fa
authored
Aug 21, 2020
by
Alex Buijs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change background color of Zuora iframe component
In order to make it’s contents readable again in Dark Mode
parent
e6957553
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
5 deletions
+29
-5
ee/app/assets/javascripts/subscriptions/new/components/checkout/step.vue
...avascripts/subscriptions/new/components/checkout/step.vue
+5
-1
ee/app/assets/javascripts/subscriptions/new/store/actions.js
ee/app/assets/javascripts/subscriptions/new/store/actions.js
+8
-3
ee/app/assets/stylesheets/pages/subscriptions.scss
ee/app/assets/stylesheets/pages/subscriptions.scss
+11
-1
ee/changelogs/unreleased/239291-new-purchase-flow-does-not-support-dark-theme.yml
.../239291-new-purchase-flow-does-not-support-dark-theme.yml
+5
-0
No files found.
ee/app/assets/javascripts/subscriptions/new/components/checkout/step.vue
View file @
30a376fa
<
script
>
import
{
mapActions
,
mapGetters
}
from
'
vuex
'
;
import
{
GlFormGroup
,
GlDeprecatedButton
}
from
'
@gitlab/ui
'
;
import
{
convertToSnakeCase
,
dasherize
}
from
'
~/lib/utils/text_utility
'
;
import
StepHeader
from
'
./step_header.vue
'
;
import
StepSummary
from
'
./step_summary.vue
'
;
...
...
@@ -40,6 +41,9 @@ export default {
isEditable
()
{
return
this
.
isFinished
&&
this
.
stepIndex
(
this
.
step
)
<
this
.
currentStepIndex
;
},
snakeCasedStep
()
{
return
dasherize
(
convertToSnakeCase
(
this
.
step
));
},
...
mapGetters
([
'
currentStep
'
,
'
stepIndex
'
,
'
currentStepIndex
'
]),
},
methods
:
{
...
...
@@ -58,7 +62,7 @@ export default {
<
template
>
<div
class=
"mb-3 mb-lg-5"
>
<step-header
:title=
"title"
:is-finished=
"isFinished"
/>
<div
class=
"card
"
>
<div
:class=
"['card', snakeCasedStep]
"
>
<div
v-show=
"isActive"
@
keyup.enter=
"nextStep"
>
<slot
name=
"body"
:active=
"isActive"
></slot>
<gl-form-group
v-if=
"nextStepButtonText"
class=
"gl-mt-3 gl-mb-0"
>
...
...
ee/app/assets/javascripts/subscriptions/new/store/actions.js
View file @
30a376fa
...
...
@@ -120,9 +120,13 @@ export const fetchPaymentFormParams = ({ dispatch }) =>
export
const
fetchPaymentFormParamsSuccess
=
({
commit
},
data
)
=>
{
if
(
data
.
errors
)
{
createFlash
(
sprintf
(
s__
(
'
Checkout|Credit card form failed to load: %{message}
'
),
{
message
:
data
.
errors
,
}),
sprintf
(
s__
(
'
Checkout|Credit card form failed to load: %{message}
'
),
{
message
:
data
.
errors
,
},
false
,
),
);
}
else
{
commit
(
types
.
UPDATE_PAYMENT_FORM_PARAMS
,
data
);
...
...
@@ -159,6 +163,7 @@ export const paymentFormSubmittedError = (_, response) => {
'
Checkout|Submitting the credit card form failed with code %{errorCode}: %{errorMessage}
'
,
),
response
,
false
,
),
);
};
...
...
ee/app/assets/stylesheets/pages/subscriptions.scss
View file @
30a376fa
...
...
@@ -76,6 +76,13 @@ $subscriptions-full-width-lg: 541px;
@media
(
min-width
:
map-get
(
$grid-breakpoints
,
lg
))
{
width
:
$subscriptions-full-width-lg
;
}
&
.payment-method
{
// Use literal to avoid dark theme from changing the color
// scss-lint:disable ColorVariable
background-color
:
#fff
;
// scss-lint:enable ColorVariable
}
}
.gl-form-group
,
...
...
@@ -141,7 +148,10 @@ $subscriptions-full-width-lg: 541px;
}
iframe
{
background-color
:
$white
;
// Use literal to avoid dark theme from changing the color
// scss-lint:disable ColorVariable
background-color
:
#fff
;
// scss-lint:enable ColorVariable
margin
:
-4px
;
width
:
100%
!
important
;
}
...
...
ee/changelogs/unreleased/239291-new-purchase-flow-does-not-support-dark-theme.yml
0 → 100644
View file @
30a376fa
---
title
:
Display contents of Zuora iframe for the new purchase flow in Dark Mode
merge_request
:
40114
author
:
type
:
fixed
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