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

[+] BO: add disable visual effect on translations #12997

Merged
merged 4 commits into from Jul 9, 2019

Conversation

@francoispeyret
Copy link
Contributor

commented Mar 21, 2019

see more on issue #12888

Questions Answers
Branch? develop
Description? Fix a visual effect not visible in BackOffice (transflations)
Type? bug fix / improvement
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? #12888
How to test? Search a word in translations and see if menu has disabled effect on some elements

This change is Reviewable

@prestonBot

This comment has been minimized.

Copy link
Collaborator

commented Mar 21, 2019

Hello @francoispeyret!

This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!

@francoispeyret

This comment has been minimized.

Copy link
Contributor Author

commented Mar 21, 2019

Questions Answers
Branch? develop / 1.7.4 / 1.7.5
Description? Fix a visual effect not visible in BackOffice (transflations)
Type? bug fix / improvement
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? #12888
How to test? Search a word in translations and see if menu has disabled effect on some elements
@matks

This comment has been minimized.

Copy link
Contributor

commented Apr 5, 2019

Hi and thanks for the contribution ! I dont think admin-dev/themes/new-theme/scss/theme.scss is the right file to put this fix 😉it would probably go rather in some page-specific scss (https://github.com/PrestaShop/PrestaShop/tree/40186ce0129375aaba15e1f143882fc9396ccf8f/admin-dev/themes/new-theme/scss/pages).

Wdyt @PierreRambaud ?

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Apr 5, 2019

If it's specifc to translations, it must be in https://github.com/PrestaShop/PrestaShop/blob/develop/admin-dev/themes/new-theme/scss/pages/_translation_page.scss and with a better selector to be sure we won't change a behavior on others pages.

@samuel-pires

This comment has been minimized.

Copy link

commented May 17, 2019

Ping @francoispeyret
What do you think of these 2 feedback?

@francoispeyret

This comment has been minimized.

Copy link
Contributor Author

commented May 22, 2019

@samuel-pires I think it's right.

need a new PL ?

@samuel-pires

This comment has been minimized.

Copy link

commented May 28, 2019

Hi @francoispeyret,

Can you have a look at the required modification so we can merge the PR? 🙂

Thanks,

@francoispeyret francoispeyret requested a review from PrestaShop/prestashop-core-developers as a code owner Jun 5, 2019

@samuel-pires samuel-pires added this to the 1.7.7.0 milestone Jun 5, 2019

@francoispeyret

This comment has been minimized.

Copy link
Contributor Author

commented Jun 5, 2019

hi @samuel-pires

all checks have passed 👍

@samuel-pires samuel-pires added Improvement and removed Bug labels Jun 5, 2019

@francoispeyret

This comment has been minimized.

Copy link
Contributor Author

commented Jun 27, 2019

hi @samuel-pires

Why does the PL always go back to merge conflict?

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

commented Jun 27, 2019

@francoispeyret It's because we merge another pull request containing css modifications. Each time a modification occured you need to rebase and regenerate assets.

@sarahdib sarahdib added QA ✔️ and removed waiting for QA labels Jun 27, 2019

@Quetzacoalt91 Quetzacoalt91 force-pushed the francoispeyret:develop branch from 81d3837 to 9fe1f0b Jul 9, 2019

@Quetzacoalt91
Copy link
Member

left a comment

Rebased, fixed conflicts and move assets generation in a separate commit.

Ready for merge

@Quetzacoalt91 Quetzacoalt91 merged commit 61908bf into PrestaShop:develop Jul 9, 2019

2 checks passed

PrettyCI Code formatting
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.