Skip to content

Commit

Permalink
Merge pull request #197 from awesomemotive/release/4.7.3
Browse files Browse the repository at this point in the history
`release/4.7.3`
  • Loading branch information
spencerfinnell authored Mar 30, 2023
2 parents 7c4aad8 + b085437 commit 8266361
Show file tree
Hide file tree
Showing 198 changed files with 14,271 additions and 956 deletions.
2 changes: 1 addition & 1 deletion data/templates/walking-tour-payment-form.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
"extra": {
"_inventory": "yes",
"_inventory_behavior": "combined",
"_inventory_combined": {
"_inventory_behavior_combined": {
"initial": 20,
"available": 20
},
Expand Down
34 changes: 15 additions & 19 deletions includes/core/assets/css/admin/admin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1288,35 +1288,32 @@ select.simpay-currency-symbol {
border-bottom-left-radius: 4px;
}

/**
* Screen Options
*/
.post-new-php,
.post-php,
.edit-php {

&.post-type-simple-pay {

#screen-meta-links {
display: none;
}
}
.simpay-template-explorer-open .show-settings {
display: none !important;
}

/**
* Page branding bar
*/
.simpay-branding-bar {
margin-left: -20px;
padding: 14px 20px 14px 22px;
margin: 0 -20px;
padding: 14px 22px;
background: #fff;
border-bottom: 1px solid #c3c4c7;
box-shadow: 0 1px 1px rgb(0 0 0 / 4%);
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
width: calc(100% + 20px);;
display: flex;
justify-content: space-between;
box-sizing: border-box;

// Hide branding bar on the "System Report" page.
.site-health & {
display: none;
}

&__title {
display: flex;
align-items: center;
float: left;
margin: 8px 0;
}

Expand All @@ -1332,8 +1329,6 @@ select.simpay-currency-symbol {
}

&__actions {
float: right;
margin-top: 4px;
display: flex;
align-items: center;

Expand Down Expand Up @@ -2100,6 +2095,7 @@ select.simpay-currency-symbol {
}
}

body.site-health #wpbody-content,
body.post-type-simple-pay #wpbody-content {
padding-bottom: 200px;
}
Expand Down
117 changes: 78 additions & 39 deletions includes/core/assets/css/admin/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}
}

.simpay-settings .simpay-settings-captcha .simpay-settings-captcha-toggles {
.simpay-settings .simpay-settings-visual-toggles {
margin: 30px 0 0;
display: flex;

Expand All @@ -67,15 +67,10 @@

&__toggle {
user-select: none;
width: 160px;
min-height: 160px;
min-width: 180px;
margin: 0 30px 0 0 !important;
padding: 30px 15px 15px;
display: flex !important;
flex-direction: column;
justify-content: center;
align-items: center;
position: relative;
display: block;
background-color: #fff;
border-radius: 4px;
border: 1px solid #c3c4c7;
Expand All @@ -87,63 +82,87 @@
}
}

input[type="radio"]:checked + .simpay-settings-captcha-toggles__toggle {
border-color: #0e856a;
box-shadow: 0 0 0 1px #0e856a;
input[type="radio"]:checked + .simpay-settings-visual-toggles__toggle {
border-color: #007cba;
border-color: var(--wp-admin-theme-color);
box-shadow: 0 0 0 1px #007cba;
box-shadow: 0 0 0 1px var(--wp-admin-theme-color);
}

&__toggle-recommended,
&__toggle-not-recommended {
text-align: center;
font-size: 12px;
text-transform: uppercase;
font-weight: bold;
margin: 0;
padding: 5px 0;
display: block;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
}

&__toggle-recommended {
color: #0f8569;
background: #f4f9f7;
}

#simpay-settings-captcha-type-none:checked + .simpay-settings-captcha-toggles__toggle {
border-color: #b91c1b;
box-shadow: 0 0 0 1px #b91c1b;
&__toggle-not-recommended {
color: #b91c1b;
background: #fef2f2;
}

&__toggle-icon {
width: 80px;
height: 80px;
margin: 15px 0;
margin: 20px auto 15px;
padding: 0 15px;
display: block;
}

&__toggle-label {
line-height: 1.5;
text-align: center;
font-size: 16px;
font-weight: 500;
margin: 15px;
display: block;

small {
color: #666666;
font-weight: normal;
font-size: 13px;
line-height: 1;
display: block;
margin: 4px 0;
}
}
}

&__toggle-recommended,
&__toggle-not-recommended {
text-align: center;
font-size: 12px;
text-transform: uppercase;
font-weight: bold;
position: absolute;
top: 0;
left: 0;
right: 0;
width: 100%;
border-top-right-radius: 4px;
border-top-left-radius: 4px;
padding: 5px 0;
}
// CAPTCHA.
.simpay-settings .simpay-settings-visual-toggles.simpay-settings-captcha-type {

&__toggle-recommended {
color: #0f8569;
background: #f4f9f7;
.simpay-settings-visual-toggles__toggle {
min-height: 160px;

&-icon {
width: 80px;
height: 80px;
}
}

&__toggle-not-recommended {
color: #b91c1b;
background: #fef2f2;
input[type="radio"] {

&.simpay-settings-captcha-type--is-recommended:checked + .simpay-settings-visual-toggles__toggle {
border-color: #0f8569;
box-shadow: 0 0 0 1px #0f8569;
}

&.simpay-settings-captcha-type--is-not-recommended:checked + .simpay-settings-visual-toggles__toggle {
border-color: #b91c1b;
box-shadow: 0 0 0 1px #b91c1b;
}
}

label[for="simpay-settings-captcha-type-cloudflare-turnstile"] .simpay-settings-captcha-toggles__toggle-icon {
label[for="simpay-settings-captcha-type-cloudflare-turnstile"] .simpay-settings-visual-toggles__toggle-icon {
width: 120px;
}
}
Expand All @@ -158,3 +177,23 @@
padding-bottom: 50px !important;
};
}

// Email settings.
.simpay-settings {

// Hide subsection tabs.
.simpay-settings-subsections__subsection {

&.simpay-settings-subsection-summary-report,
&.simpay-settings-subsection-payment-confirmation,
&.simpay-settings-subsection-payment-notification,
&.simpay-settings-subsection-upcoming-invoice,
&.simpay-settings-subsection-invoice-confirmation {
display: none;
}
}

.simpay-settings-subsection-emails-tools {
margin-left: auto;
}
}
153 changes: 153 additions & 0 deletions includes/core/assets/css/emails/partials/buttons.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,153 @@
table.button {
width: auto;
// margin: 30px 0 30px 0;
// Margin: 30px 0 30px 0;

td {
mso-line-height-rule: exactly;
line-height: 1;
line-height: 100%;
padding: 0;
}

table td {
text-align: center;
color: #ffffff;
padding: 0;
background: $buttonPrimary;
mso-line-height-rule: exactly;
line-height: 1;
line-height: 100%;

a {
font-family: Helvetica, Arial, sans-serif;
font-size: 16px;
font-weight: bold;
color: #ffffff;
text-decoration: none;
text-align: center;
display: inline-block;
padding: 15px 25px;
border: 0 solid $buttonPrimaryHover;
mso-line-height-rule: exactly;
line-height: 1;
line-height: 100%;
}
}

&:hover table tr td a,
&:active table tr td a,
table tr td a:visited,
&.tiny:hover table tr td a,
&.tiny:active table tr td a,
&.tiny table tr td a:visited,
&.small:hover table tr td a,
&.small:active table tr td a,
&.small table tr td a:visited,
&.large:hover table tr td a,
&.large:active table tr td a,
&.large table tr td a:visited {
color: #ffffff;
text-decoration: none !important;
}

&.small table td,
&.small table a {
padding: 5px 10px 5px 10px;
font-size: 12px;
}

&.large table a {
padding: 14px 20px 12px 20px;
font-size: 20px;
}

&.centered {
width: 100% !important;

table {
margin: 0 auto;
}
}

&:hover table td,
&:active table td {
background: $buttonPrimaryHover;
color: #fefefe;
}

&:hover table a,
&:active table a {
border: 0 solid $buttonPrimaryHover;
}

&.blue {
table {
td {
color: #ffffff;
background: $buttonBlue;
}

a {
color: #ffffff;
}
}

&:hover,
&:active {
table {
td {
color: #ffffff;
background-color: $buttonBlueHover;
}
}
}
}

&.green {
table {
td {
color: #ffffff;
background: $buttonGreen;
border: 1px solid $buttonGreenHover;
}

a {
color: #ffffff;
}
}

&:hover,
&:active {
table {
td {
color: #ffffff;
background-color: $buttonGreenHover;
}
}
}
}

&.red {
table {
td {
color: #ffffff;
background: $buttonRed;
}

a {
color: #ffffff;
}
}

&:hover,
&:active {
table {
td {
color: #ffffff;
background-color: $buttonRedHover;
}
}
}
}
}
Loading

0 comments on commit 8266361

Please sign in to comment.