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

Adjust colors, sizes of buttons group and buttons group dropdown #70

Merged
merged 10 commits into from Jan 7, 2020

Conversation

@NeOMakinG
Copy link

NeOMakinG commented Dec 2, 2019

Evo PrestaShop/PrestaShop#16593

How to test : Read the readme of https://github.com/PrestaShop/prestashop-ui-kit and compare with informations in the #16593 issue

@NeOMakinG NeOMakinG changed the base branch from master to develop Dec 2, 2019
index.html Show resolved Hide resolved
scss/_buttons.scss Outdated Show resolved Hide resolved
scss/_buttons.scss Outdated Show resolved Hide resolved
scss/_buttons.scss Outdated Show resolved Hide resolved
scss/_variables.scss Outdated Show resolved Hide resolved
index.html Outdated Show resolved Hide resolved
@NeOMakinG NeOMakinG requested a review from PierreRambaud Dec 11, 2019
@PierreRambaud

This comment has been minimized.

Copy link

PierreRambaud commented Dec 12, 2019

A rebase is needed

@NeOMakinG NeOMakinG force-pushed the NeOMakinG:evo16593 branch from c933643 to ce80714 Dec 12, 2019
@sarahdib sarahdib self-assigned this Dec 13, 2019
@sarahdib sarahdib added QA approved and removed Waiting for QA labels Dec 13, 2019
@eternoendless eternoendless changed the title Adjusting colors, sizes of buttons group and buttons group dropdown Adjust colors, sizes of buttons group and buttons group dropdown Jan 7, 2020
@eternoendless

This comment has been minimized.

Copy link
Member

eternoendless commented Jan 7, 2020

@NeOMakinG there's a conflict with dist/css/bootstrap-prestashop-ui-kit.css, can you rebase?

@NeOMakinG NeOMakinG force-pushed the NeOMakinG:evo16593 branch from 35863e6 to 031e1bb Jan 7, 2020
@eternoendless

This comment has been minimized.

Copy link
Member

eternoendless commented Jan 7, 2020

Thank you @NeOMakinG

@eternoendless eternoendless merged commit 3d8fe29 into PrestaShop:develop Jan 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.