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

Merging trunk changes to development #436

Merged
merged 12 commits into from
Aug 23, 2024
67 changes: 14 additions & 53 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,71 +1,32 @@
{
"extends": [
"stylelint-config-standard-scss",
"@wordpress/stylelint-config"
"stylelint-config-standard-scss"
],
"rules": {
"alpha-value-notation": "number",
"at-rule-empty-line-before": null,
"indentation": "tab",
"color-hex-case": "lower",
"block-no-empty": true,
"color-function-notation": ["legacy", { "ignore": ["with-var-inside"] }],
"color-hex-alpha": "never",
"color-no-invalid-hex": true,

"declaration-block-no-duplicate-properties": [true, { "severity": "warning" } ],
"declaration-block-single-line-max-declarations": 1,
"font-family-name-quotes": null,
"font-family-no-missing-generic-family-keyword": null,
"font-weight-notation": null,

"function-calc-no-unspaced-operator": true,
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-name-case": "lower",
"function-url-quotes": "always",
"function-whitespace-after": "always",

"media-feature-range-notation": "prefix",
"no-descending-specificity": null,
"no-duplicate-selectors": null,
"number-leading-zero": "always",
"number-no-trailing-zeros": true,
"length-zero-no-unit": true,

"rule-empty-line-before": null,

"string-no-newline": true,
"string-quotes": "single",

"unit-case": "lower",
"unit-no-unknown": true,
"unit-allowed-list": ["px", "%", "deg", "ms", "em", "vh", "vw", "rem", "s", "ex", "pt", "cm"],

"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",

"shorthand-property-no-redundant-values": true,

"property-case": "lower",

"declaration-block-no-duplicate-properties": [true, { "severity": "warning" } ],
"declaration-block-trailing-semicolon": "always",
"declaration-block-single-line-max-declarations": 0,
"declaration-block-semicolon-space-before": "never",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-newline-before": "never-multi-line",
"declaration-block-semicolon-newline-after": "always-multi-line",

"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-before": "always",

"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-parentheses-space-inside": "always",
"selector-pseudo-element-case": "lower",
"selector-class-pattern": null,
"selector-id-pattern": null,
"selector-pseudo-element-colon-notation": "double",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower"
"selector-type-case": "lower",
"shorthand-property-no-redundant-values": true,
"string-no-newline": true,
"unit-no-unknown": true
}
}
27 changes: 14 additions & 13 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,22 @@ module.exports = function(grunt) {
]
},

// Watch for changes made in SASS.
// Watch changes in assets.
watch: {
css: {
files: [
'<%= dirs.scss %>/*.scss',
'<%= dirs.scss %>/admin/*.scss',
],
tasks: ['sass', 'stylelint', 'rtlcss', 'postcss', 'cssmin']
tasks: ['sass', 'stylelint']
},
js: {
files: [
'<%= dirs.js %>/admin/*.js',
'!<%= dirs.js %>/admin/*.min.js',
],
tasks: ['jshint', 'uglify']
}
},

// Check for Sass errors with "stylelint"
Expand All @@ -155,21 +162,14 @@ module.exports = function(grunt) {
target: {
options: {
cwd: '',
domainPath: 'languages', // Where to save the POT file.
exclude: [
'<%= dirs.php %>/api/experiments',
'<%= dirs.php %>/api/pro-enhancements',
'<%= dirs.php %>/api/wip',
'releases',
'node_modules',
'vendor'
],
domainPath: 'languages', // Where to save the POT file.
exclude: [ 'releases', 'node_modules', 'vendor' ], // List of files or directories to ignore.
mainFile: '<%= pkg.name %>.php', // Main project file.
potComments: 'Copyright (c) {year} CoCart Headless, LLC\nThis file is distributed under the same license as the CoCart package.', // The copyright at the beginning of the POT file.
potFilename: '<%= pkg.name %>.pot', // Name of the POT file.
potHeaders: {
'poedit': true, // Includes common Poedit headers.
'x-poedit-keywordslist': true, // Include a list of all possible gettext functions.
'poedit': true, // Includes common Poedit headers.
'x-poedit-keywordslist': true, // Include a list of all possible gettext functions.
'Report-Msgid-Bugs-To': 'https://github.com/co-cart/co-cart/issues',
'language-team': 'CoCart Headless, LLC <support@cocartapi.com>',
'language': 'en_US'
Expand Down Expand Up @@ -205,6 +205,7 @@ module.exports = function(grunt) {
checktextdomain: {
options:{
text_domain: '<%= pkg.name %>', // Project text domain.
updateDomains: [ 'woocommerce' ], // List of text domains to replace should they be incorrect.
keywords: [
'__:1,2d',
'_e:1,2d',
Expand Down
11 changes: 4 additions & 7 deletions assets/css/admin/cocart-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ body.cocart-pagestyles .wp-header-end {
text-align: right; }

.cocart-pagestyles {
/*#wpcontent,
/* #wpcontent,
#wpbody-content {
padding: 0;
overflow-x: hidden !important;
min-height: calc(100vh - 32px);
}*/ }
} */ }
.cocart-pagestyles #wpfooter {
display: initial; }
.cocart-pagestyles .woocommerce-layout__header-breadcrumbs {
Expand All @@ -38,7 +38,6 @@ body.cocart-pagestyles .wp-header-end {
background-color: #fff;
border: 1px solid #e5e5e5;
box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
-webkit-box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
color: #292929;
margin: 20px auto 40px;
max-width: 700px;
Expand Down Expand Up @@ -273,7 +272,6 @@ p.next-step-extra-info {
ul.cocart-next-steps {
border: 1px solid #eee;
border-radius: 4px;
list-style: none;
margin: 0;
padding: 0;
overflow: hidden;
Expand Down Expand Up @@ -328,8 +326,7 @@ ul.cocart-next-steps {
display: flex;
padding: 0;
align-items: center;
justify-content: center;
align-content: center;
place-content: center center;
flex-wrap: nowrap; }

@media only screen and (max-width: 400px) {
Expand Down Expand Up @@ -452,7 +449,7 @@ ul.cocart-next-steps {
.cocart_untested_extensions_modal--content .actions {
border-top: 1px solid #eee;
margin: 0;
padding: 1em 0 2em 0;
padding: 1em 0 2em;
overflow: hidden; }
.cocart_untested_extensions_modal--content .actions a.button-primary {
float: left; }
2 changes: 1 addition & 1 deletion assets/css/admin/cocart-rtl.min.css

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions assets/css/admin/cocart-setup-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ body.cocart-pagestyles .wp-header-end {
text-align: right; }

.cocart-pagestyles {
/*#wpcontent,
/* #wpcontent,
#wpbody-content {
padding: 0;
overflow-x: hidden !important;
min-height: calc(100vh - 32px);
}*/ }
} */ }
.cocart-pagestyles #wpfooter {
display: initial; }
.cocart-pagestyles .woocommerce-layout__header-breadcrumbs {
Expand All @@ -38,7 +38,6 @@ body.cocart-pagestyles .wp-header-end {
background-color: #fff;
border: 1px solid #e5e5e5;
box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
-webkit-box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
color: #292929;
margin: 20px auto 40px;
max-width: 700px;
Expand Down Expand Up @@ -273,7 +272,6 @@ p.next-step-extra-info {
ul.cocart-next-steps {
border: 1px solid #eee;
border-radius: 4px;
list-style: none;
margin: 0;
padding: 0;
overflow: hidden;
Expand Down Expand Up @@ -328,8 +326,7 @@ ul.cocart-next-steps {
display: flex;
padding: 0;
align-items: center;
justify-content: center;
align-content: center;
place-content: center center;
flex-wrap: nowrap; }

@media only screen and (max-width: 400px) {
Expand Down Expand Up @@ -452,7 +449,7 @@ ul.cocart-next-steps {
.cocart_untested_extensions_modal--content .actions {
border-top: 1px solid #eee;
margin: 0;
padding: 1em 0 2em 0;
padding: 1em 0 2em;
overflow: hidden; }
.cocart_untested_extensions_modal--content .actions a.button-primary {
float: left; }
Expand Down
2 changes: 1 addition & 1 deletion assets/css/admin/cocart-setup-rtl.min.css

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions assets/css/admin/cocart-setup.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ body.cocart-pagestyles .wp-header-end {
text-align: left; }

.cocart-pagestyles {
/*#wpcontent,
/* #wpcontent,
#wpbody-content {
padding: 0;
overflow-x: hidden !important;
min-height: calc(100vh - 32px);
}*/ }
} */ }
.cocart-pagestyles #wpfooter {
display: initial; }
.cocart-pagestyles .woocommerce-layout__header-breadcrumbs {
Expand All @@ -38,7 +38,6 @@ body.cocart-pagestyles .wp-header-end {
background-color: #fff;
border: 1px solid #e5e5e5;
box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
-webkit-box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
color: #292929;
margin: 20px auto 40px;
max-width: 700px;
Expand Down Expand Up @@ -273,7 +272,6 @@ p.next-step-extra-info {
ul.cocart-next-steps {
border: 1px solid #eee;
border-radius: 4px;
list-style: none;
margin: 0;
padding: 0;
overflow: hidden;
Expand Down Expand Up @@ -328,8 +326,7 @@ ul.cocart-next-steps {
display: flex;
padding: 0;
align-items: center;
justify-content: center;
align-content: center;
place-content: center center;
flex-wrap: nowrap; }

@media only screen and (max-width: 400px) {
Expand Down Expand Up @@ -452,7 +449,7 @@ ul.cocart-next-steps {
.cocart_untested_extensions_modal--content .actions {
border-top: 1px solid #eee;
margin: 0;
padding: 1em 0 2em 0;
padding: 1em 0 2em;
overflow: hidden; }
.cocart_untested_extensions_modal--content .actions a.button-primary {
float: right; }
Expand Down
2 changes: 1 addition & 1 deletion assets/css/admin/cocart-setup.min.css

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions assets/css/admin/cocart.css
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ body.cocart-pagestyles .wp-header-end {
text-align: left; }

.cocart-pagestyles {
/*#wpcontent,
/* #wpcontent,
#wpbody-content {
padding: 0;
overflow-x: hidden !important;
min-height: calc(100vh - 32px);
}*/ }
} */ }
.cocart-pagestyles #wpfooter {
display: initial; }
.cocart-pagestyles .woocommerce-layout__header-breadcrumbs {
Expand All @@ -38,7 +38,6 @@ body.cocart-pagestyles .wp-header-end {
background-color: #fff;
border: 1px solid #e5e5e5;
box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
-webkit-box-shadow: 0 2px 30px rgba(0, 0, 0, 0.04);
color: #292929;
margin: 20px auto 40px;
max-width: 700px;
Expand Down Expand Up @@ -273,7 +272,6 @@ p.next-step-extra-info {
ul.cocart-next-steps {
border: 1px solid #eee;
border-radius: 4px;
list-style: none;
margin: 0;
padding: 0;
overflow: hidden;
Expand Down Expand Up @@ -328,8 +326,7 @@ ul.cocart-next-steps {
display: flex;
padding: 0;
align-items: center;
justify-content: center;
align-content: center;
place-content: center center;
flex-wrap: nowrap; }

@media only screen and (max-width: 400px) {
Expand Down Expand Up @@ -452,7 +449,7 @@ ul.cocart-next-steps {
.cocart_untested_extensions_modal--content .actions {
border-top: 1px solid #eee;
margin: 0;
padding: 1em 0 2em 0;
padding: 1em 0 2em;
overflow: hidden; }
.cocart_untested_extensions_modal--content .actions a.button-primary {
float: right; }
Loading