Skip to content

Commit

Permalink
Merge branch 'refs/heads/dev' into gfa_refactoring.ag
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/Cleantalk/ApbctWP/GetFieldsAny.php
  • Loading branch information
alexandergull committed Dec 30, 2024
2 parents 543602b + 3ea05dd commit 9ae8fc9
Show file tree
Hide file tree
Showing 41 changed files with 278 additions and 132 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"vendor/bin/psalm --no-cache --config=psalm.xml --taint-analysis"
],
"psalm_l3": [
"vendor/bin/psalm --no-cache --config=psalm_l3.xml"
"vendor/bin/psalm --no-cache --config=psalm_l3.xml --threads=[2]"
],
"just_phpunit": [
"vendor/bin/phpunit --configuration tests/phpunit.xml --debug"
Expand Down
2 changes: 1 addition & 1 deletion css/cleantalk-admin-settings-page.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/cleantalk-email-decoder.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions css/src/cleantalk-admin-settings-page.css
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,15 @@ button[value="save_changes"]:disabled {
background-position-y: center;
text-align: center;
}

.apbct_long_desc {
left: -2% !important;
max-width: 95%;
margin-top: 10%;
}
.apbct_long_desc__angle {
display: none;
}
}

.apbct_settings_top_info__sub_btn {
Expand Down
26 changes: 26 additions & 0 deletions css/src/cleantalk-email-decoder.css
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,30 @@
}
}

.apbct-email-encoder--settings_example_encoded {
position: absolute;
}

@media screen and (max-width: 782px) {
.apbct-email-encoder--settings_example_encoded {
position: relative;
display: block;
}

.apbct-email-encoder-popup {
width: 20vw;
min-width: 200px;
font-size: 16px;
top: 20%;
left: 75%;
}

.apbct-email-encoder-elements_center {
flex-direction: column !important;
text-align: center;
}
}




Loading

0 comments on commit 9ae8fc9

Please sign in to comment.