Skip to content

Commit a77e357

Browse files
committed
Merge release/9.2.0 into trunk
2 parents 0d9d787 + 72a3f71 commit a77e357

File tree

203 files changed

+6286
-4347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+6286
-4347
lines changed

.husky/post-merge

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ else
2222
echo "\033[32mDetermining if there is an update for the WCPay Dev Tools plugin...\033[0m"
2323

2424
DEV_TOOLS_BRANCH=$(cd $DEV_TOOLS_PLUGIN_PATH && git branch --show-current)
25-
if [[ $DEV_TOOLS_BRANCH = "trunk" ]]; then
25+
if [ $DEV_TOOLS_BRANCH = "trunk" ]; then
2626
echo " \033[32mThe current branch is trunk. Check if we are safe to pull from origin/trunk...\033[0m"
27-
if [[ `cd $DEV_TOOLS_PLUGIN_PATH && git status --porcelain` ]]; then
27+
if [ `cd $DEV_TOOLS_PLUGIN_PATH && git status --porcelain` ]; then
2828
echo "\033[33m There are uncommitted local changes on the WCPay Dev Tools repo. Skipping any attempt to update it.\033[0m"
2929
else
3030
echo " \033[32mPulling the latest changes from origin/trunk, if any...\033[0m"

assets/css/admin.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,14 @@
131131
background-image: url( '../images/payment-methods/afterpay-icon.svg' );
132132
}
133133

134+
.payment-method__brand--afterpay_clearpay.account-country--gb {
135+
background-image: url( '../images/payment-methods/clearpay.svg' );
136+
}
137+
138+
.payment-method__brand--afterpay_clearpay.account-country--us {
139+
background-image: url( '../images/payment-methods/afterpay-cashapp-icon.svg' );
140+
}
141+
134142
.payment-method__brand--affirm {
135143
background-image: url( '../images/payment-methods/affirm-icon.svg' );
136144
}

assets/css/success.rtl.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
color: #4d3716;
149149
justify-self: start;
150150
width: max-content;
151-
margin-left: 5px;
151+
margin-right: 5px;
152152
}
153153

154154
#wc-payment-gateway-multibanco-instructions-container .payment-box-value {
Lines changed: 27 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)