Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.3.1 (Includes 3.3.0 changes) #9749

Merged
merged 1 commit into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
28 changes: 8 additions & 20 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,27 +52,21 @@ module.exports = function ( grunt ) {
copy: {
pro: {
src: [
'assets/sample-products-import.xml',
'assets/css/*.min.css',
'assets/css/admin/style.css',
'assets/js/*.js',
'assets/js/*.min.js',
'assets/js/vendor/**',
'assets/images/**',
'assets/**',
'!assets/lite/**',
'i18n/**',
'includes/**',
'!includes/blocks/node_modules/**',
'!includes/blocks/composer.json',
'!includes/blocks/package.json',
'!includes/blocks/package-lock.json',
'languages/**',
'libraries/**',
'templates/**',
'src/**',
'!src/Lite/**',
'*.php',
'*.txt',
'assets/pro/js/*.js',
'!src/Lite/**',
'!assets/lite/**',
'!vendor/**',
'vendor/autoload.php',
'vendor/composer/**',
Expand All @@ -84,13 +78,8 @@ module.exports = function ( grunt ) {
},
lite: {
src: [
'assets/sample-products-import.xml',
'assets/css/*.min.css',
'assets/css/admin/style.css',
'assets/js/*.js',
'assets/js/*.min.js',
'assets/js/vendor/**',
'assets/images/**',
'assets/**',
'!assets/pro/**',
'i18n/**',
'includes/**',
'!includes/blocks/pro/**',
Expand All @@ -100,15 +89,14 @@ module.exports = function ( grunt ) {
'!includes/blocks/src/pro/**',
'!includes/blocks/composer.json',
'!includes/blocks/package.json',
'!includes/blocks/package-lock.json',
'languages/**',
'libraries/**',
'templates/**',
'src/**',
'*.php',
'*.txt',
'!src/Pro/**',
'!assets/pro/**',
'assets/lite/**',
'!vendor/**',
'vendor/autoload.php',
'vendor/composer/**',
Expand Down Expand Up @@ -136,7 +124,7 @@ module.exports = function ( grunt ) {
'!node_modules/**',
'templates/**',
'src/**',
'!assets/pro/**',
'!src/Pro/**',
'!vendor/**',
'vendor/autoload.php',
'vendor/composer/**',
Expand Down
67 changes: 67 additions & 0 deletions assets/css/admin/emails/_editor.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
.edd-email-editor__description {
margin: 2em 0;
}

.edd-editor__header--actions {
position: relative;

.edd-email-status-badge {
position: absolute;
right: 0;
top: 53px;
margin-right: 20px;
border: 1px solid;
padding: 12px;
}

#submit.edd-updating {
&:before {
background: none;
@include edd-spinner(
12px,
$wp-alternate,
$wp-input-border
);
}
}
}

.edd-form__email {
background: $white;
border: 1px solid #e2e4e7;
padding: 2em;
max-width: $break-huge;

@media screen and (min-width: $break-medium) {
$first-column-width: 200px;
.edd-form-group {
display: grid;
grid-template-columns: $first-column-width 1fr;
margin-bottom: 2em;

> .description {
grid-column-start: 1;
grid-column-end: 3;
}
}

.edd-form-group > .description,
.notice {
margin-left: $first-column-width;
}
}
}

.edd-email-action-reset {
border-color: $edd-alert-red !important;
color: $edd-alert-red !important;

&:hover {
border-color: $edd-alert-red-hover !important;
color: $edd-alert-red-hover !important;
}
}

.edd-editor__actions--test + .notice {
margin-top: 2em;
}
76 changes: 76 additions & 0 deletions assets/css/admin/emails/_promo.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
.edd-emails__add-new__overlay {
position: absolute;
right: 0;
top: 40px;
background: white;
padding: 8px;
border: 1px solid $wp-border;
border-radius: 4px;
display: flex;
flex-direction: column;
gap: 2px;
z-index: 1;
align-items: stretch;

button.button {
background: none !important;
border: none;
color: $wp-text !important;
text-align: left;
}
}

#edd-admin-notice-emails {
max-width: 100%;
width: 800px;
text-align: left;
padding: 2em;

h2 {
line-height: unset;
margin: 0;
}

.edd-extension-manager__body {
grid-template-rows: unset;
margin-bottom: 1.5em;
}

.edd-promo-notice__ajax & {
width: 400px;

.edd-extension-manager__body {
grid-template-columns: 80px 1fr;
}
}

.edd-extension-manager__card-group {
grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));
text-align: left;
margin: 0 auto 1em;
width: 100%;

.edd-extension-manager__single-card {
margin: 0 auto 1em;
}
}

.edd-promo-notice__overlay:not(.edd-promo-notice__ajax) & {
.edd-extension-manager__body {
grid-template-columns: 60px 1fr;
}

.edd-extension-manager__icon {
width: 58px;
height: 58px;

img {
width: 40px;
}
}
}

.edd-plugin__recommended {
display: none;
}
}
89 changes: 89 additions & 0 deletions assets/css/admin/emails/_table.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@

#edd-emails__add {
display: flex;
align-items: center;
gap: 8px;
justify-content: space-between;
}

.edd-list-table__item td {
padding: 10px;
}

th.column-status {
text-align: right;
width: 80px;
}

td.column-status {
min-height: 30px;
text-align: right;
width: 80px;

& .edd-help-tip {
margin-top: 2px;
}

@media screen and (max-width: $break-medium) {
text-align: left;
width: unset;
min-height: 40px;
}
}

tr.no-items {
display: none;
}

@media screen and (min-width: $break-wide) {
.column-primary {
width: 250px;
}

.column-recipient,
.column-sender {
width: 125px;
}

.column-context,
.column-date_modified {
width: 150px;
}
}

table.email_templates {
margin-top: 1em;
}

.tablenav {
&.top {
position: relative;
}

.alignright.actions {
padding-right: 0;
}
}

.edd-list-table__name {
display: flex;
align-items: center;
gap: 6px;
}

.edd-emails__wpsmtp {
display: flex;
align-items: center;
gap: 4px;
justify-content: flex-end;

& a {
text-decoration: none;
color: $wp-text;
}

img {
width: 20px;
height: auto;
}
}
6 changes: 6 additions & 0 deletions assets/css/admin/emails/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import "../../variables/variables";
@import "../../components/toggle-button";
@import "../../components/editor-header.scss";
@import "promo";
@import "table";
@import "editor";
15 changes: 10 additions & 5 deletions assets/css/admin/extensions/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@
}

.edd-extension-manager__control {
display: flex;
align-items: center;
gap: .5em;
min-height: 30px;

.edd-button__toggle {
position: relative;
margin: 0;
Expand Down Expand Up @@ -124,6 +119,16 @@
}
}

.edd-extension-manager__activate {
display: flex;
align-items: center;
gap: .5em;
min-height: 30px;
border: 1px solid $wp-border;
border-radius: 4px;
padding: 3px 10px;
}

a.button.edd-extension-manager__button-settings {
display: none;
position: absolute;
Expand Down
6 changes: 5 additions & 1 deletion assets/css/admin/extensions/_group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
display: grid;
grid-template-columns: auto;
gap: 1em;
margin-top: 24px;
margin-top: 40px;

p + & {
margin-top: 24px;
}
}
}

Expand Down
28 changes: 28 additions & 0 deletions assets/css/admin/extensions/_overlay.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.edd-extension-manager__card--overlay {
text-align: left;
padding: 0;

.edd-extension-manager__card {
padding: 0;
}

.edd-extension-manager__title {
line-height: unset;
margin-bottom: .5em;
}

.edd-extension-manager__actions {
background-color: $wp-alternate;
border-top: 1px solid $gray-200;
display: flex;
justify-content: flex-start;
align-items: center;
gap: .5em;
margin: 0 -2em -2em -2em;
padding: 16px 24px;

.button {
margin: 0;
}
}
}
Loading