Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
josenumericco committed Apr 11, 2024
2 parents e1751ee + 2ad4ec1 commit 2c9d9f7
Show file tree
Hide file tree
Showing 3,180 changed files with 728,324 additions and 462,250 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ trim_trailing_whitespace = true
[*.ini]
insert_final_newline = false

[*.php]
indent_style = space

[*.scss]
indent_style = space
indent_size = 2
Expand All @@ -29,5 +32,5 @@ indent_size = 2
insert_final_newline = false
trim_trailing_whitespace = false

[{*.txt,wp-config-sample.php}]
[*.txt]
end_of_line = crlf
2 changes: 1 addition & 1 deletion .lando.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
run_as_root:
- "chown www-data: -R /app"
node:
type: node
type: node:18
globals:
npm: "latest"
yarn: "latest"
Expand Down
14 changes: 14 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Ignore all PHP files:
**/*.php

# Ignore all Smarty files:
**/*.tpl

# Ignore all SCSS files:
**/*.scss

# Ignore all JS files:
**/*.js

# Ignore all MD files:
**/*.md
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "stylelint-config-standard",
"extends": "stylelint-config-standard-scss",
"rules": {
"at-rule-no-unknown": null,
"scss/at-rule-no-unknown": true,
"no-descending-specificity": null
}
}
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,9 @@ The present project uses several technologies and tools for the automation and d

1. It is very important that if you deploy the project to publish. The **DocumentRoot** on the VirtualHost has to point to the **public/** directory.
2. It is very important that if you deploy the project to publish with **Deployer**. The **DocumentRoot** on the VirtualHost has to point to the **current/public/** directory.
3. At the moment you can not update the `gulp-imagemin` package because it generates an error. I will investigate in the following commitments.
4. You can not update the `stylelint`, `stylelint-config-standard` and `stylelint-scss` because `gulp-stylelint` package cannot work with them.
3. At the moment you can not update the `del` package because it generates an error. I will investigate in the following commitments.
4. At the moment you can not update the `gulp-imagemin` package because it generates an error. I will investigate in the following commitments.
5. You can not update the `stylelint` and `stylelint-config-standard-scss` because `@ronilaukkarinen/gulp-stylelint` package cannot work with them.

### Others clarifications

Expand Down
25 changes: 0 additions & 25 deletions assets/scss/_variables/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,3 @@
overflow: hidden;
position: absolute !important;
}

// variables::mixins::border-radius
@mixin border-radius($radius) {
-webkit-border-radius: $radius;
-moz-border-radius: $radius;
border-radius: $radius;
}

// variables::mixins::transform
@mixin transform($transforms) {
-moz-transform: $transforms;
-o-transform: $transforms;
-webkit-transform: $transforms;
-ms-transform: $transforms;
transform: $transforms;
}

// variables::mixins::transition
@mixin transition($name) {
transition: $name;
-moz-transition: $name;
-ms-transition: $name;
-o-transition: $name;
-webkit-transition: $name;
}
60 changes: 15 additions & 45 deletions assets/scss/_variables/_responsive/_down.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,93 +6,63 @@
@media only screen and (max-width: $desktop-extra-large) {
@content;
}
}

@else if $breakpoint == desktop-large {
} @else if $breakpoint == desktop-large {
@media only screen and (max-width: $desktop-large) {
@content;
}
}

@else if $breakpoint == desktop {
} @else if $breakpoint == desktop {
@media only screen and (max-width: $desktop) {
@content;
}
}

@else if $breakpoint == desktop-small {
} @else if $breakpoint == desktop-small {
@media only screen and (max-width: $desktop-small) {
@content;
}
}

@else if $breakpoint == desktop-extra-small {
} @else if $breakpoint == desktop-extra-small {
@media only screen and (max-width: $desktop-extra-small) {
@content;
}
}

@else if $breakpoint == tablet-extra-large {
} @else if $breakpoint == tablet-extra-large {
@media only screen and (max-width: $tablet-extra-large) {
@content;
}
}

@else if $breakpoint == tablet-large {
} @else if $breakpoint == tablet-large {
@media only screen and (max-width: $tablet-large) {
@content;
}
}

@else if $breakpoint == tablet {
} @else if $breakpoint == tablet {
@media only screen and (max-width: $tablet) {
@content;
}
}

@else if $breakpoint == tablet-small {
} @else if $breakpoint == tablet-small {
@media only screen and (max-width: $tablet-small) {
@content;
}
}

@else if $breakpoint == tablet-extra-small {
} @else if $breakpoint == tablet-extra-small {
@media only screen and (max-width: $tablet-extra-small) {
@content;
}
}

@else if $breakpoint == mobile-extra-large {
} @else if $breakpoint == mobile-extra-large {
@media only screen and (max-width: $mobile-extra-large) {
@content;
}
}

@else if $breakpoint == mobile-large {
} @else if $breakpoint == mobile-large {
@media only screen and (max-width: $mobile-large) {
@content;
}
}

@else if $breakpoint == mobile {
} @else if $breakpoint == mobile {
@media only screen and (max-width: $mobile) {
@content;
}
}

@else if $breakpoint == mobile-small {
} @else if $breakpoint == mobile-small {
@media only screen and (max-width: $mobile-small) {
@content;
}
}

@else if $breakpoint == mobile-extra-small {
} @else if $breakpoint == mobile-extra-small {
@media only screen and (max-width: $mobile-extra-small) {
@content;
}
}

@else {
} @else {
// nothing
}
}
12 changes: 3 additions & 9 deletions assets/scss/_variables/_responsive/_only.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,15 @@
@media only screen and (min-width: $tablet-extra-large) {
@content;
}
}

@else if $breakpoint == tablet {
} @else if $breakpoint == tablet {
@media (min-width: $tablet-extra-small) and (max-width: $tablet-extra-large) {
@content;
}
}

@else if $breakpoint == mobile {
} @else if $breakpoint == mobile {
@media only screen and (max-width: $tablet-extra-small) {
@content;
}
}

@else {
} @else {
// nothing
}
}
60 changes: 15 additions & 45 deletions assets/scss/_variables/_responsive/_up.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,93 +6,63 @@
@media only screen and (min-width: $desktop-extra-large) {
@content;
}
}

@else if $breakpoint == desktop-large {
} @else if $breakpoint == desktop-large {
@media only screen and (min-width: $desktop-large) {
@content;
}
}

@else if $breakpoint == desktop {
} @else if $breakpoint == desktop {
@media only screen and (min-width: $desktop) {
@content;
}
}

@else if $breakpoint == desktop-small {
} @else if $breakpoint == desktop-small {
@media only screen and (min-width: $desktop-small) {
@content;
}
}

@else if $breakpoint == desktop-extra-small {
} @else if $breakpoint == desktop-extra-small {
@media only screen and (min-width: $desktop-extra-small) {
@content;
}
}

@else if $breakpoint == tablet-extra-large {
} @else if $breakpoint == tablet-extra-large {
@media only screen and (min-width: $tablet-extra-large) {
@content;
}
}

@else if $breakpoint == tablet-large {
} @else if $breakpoint == tablet-large {
@media only screen and (min-width: $tablet-large) {
@content;
}
}

@else if $breakpoint == tablet {
} @else if $breakpoint == tablet {
@media only screen and (min-width: $tablet) {
@content;
}
}

@else if $breakpoint == tablet-small {
} @else if $breakpoint == tablet-small {
@media only screen and (min-width: $tablet-small) {
@content;
}
}

@else if $breakpoint == tablet-extra-small {
} @else if $breakpoint == tablet-extra-small {
@media only screen and (min-width: $tablet-extra-small) {
@content;
}
}

@else if $breakpoint == mobile-extra-large {
} @else if $breakpoint == mobile-extra-large {
@media only screen and (min-width: $mobile-extra-large) {
@content;
}
}

@else if $breakpoint == mobile-large {
} @else if $breakpoint == mobile-large {
@media only screen and (min-width: $mobile-large) {
@content;
}
}

@else if $breakpoint == mobile {
} @else if $breakpoint == mobile {
@media only screen and (min-width: $mobile) {
@content;
}
}

@else if $breakpoint == mobile-small {
} @else if $breakpoint == mobile-small {
@media only screen and (min-width: $mobile-small) {
@content;
}
}

@else if $breakpoint == mobile-extra-small {
} @else if $breakpoint == mobile-extra-small {
@media only screen and (min-width: $mobile-extra-small) {
@content;
}
}

@else {
} @else {
// nothing
}
}
2 changes: 1 addition & 1 deletion assets/scss/_variables/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $dark-grey: #4a4a4a;
$light-black: #222;
$mid-black: #111;
$black: #000;
$blockquote:#9d9d9d;
$blockquote: #9d9d9d;

// common::variables::colors::text
$title-color: $mid-black;
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"ext-json": "*"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"deployer/deployer": "v7.0.0-rc.8",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.6",
"vlucas/phpdotenv": "^5.4",
"wp-coding-standards/wpcs": "^2.3"
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
"deployer/deployer": "^7.3",
"phpcompatibility/phpcompatibility-wp": "^2.1",
"roave/security-advisories": "dev-latest",
"squizlabs/php_codesniffer": "^3.9",
"vlucas/phpdotenv": "^5.6",
"wp-coding-standards/wpcs": "^3.1"
},
"config": {
"process-timeout" : 0,
Expand Down
Loading

0 comments on commit 2c9d9f7

Please sign in to comment.