🔀 merge:Merge branch 'common' of github.com:KieIO/grocery-vercel-commerce into m2-datnguyen

:%s
2025-07-13 07:51:26 +00:00 · 2021-08-26 19:54:08 +07:00 · 2021-08-26 19:54:08 +07:00 · 9ff88adb08
commit 9ff88adb08
parent 9073231b2e
1 changed files with 0 additions and 6 deletions
--- a/src/components/common/ButtonCommon/ButtonCommon.module.scss
+++ b/src/components/common/ButtonCommon/ButtonCommon.module.scss
@ -5,13 +5,7 @@
  display: flex;
  justify-content: center;
  align-items: center;
-<<<<<<< HEAD
-  // padding: 1.6rem 3.2rem;
-  padding: 0.8rem 1.6rem;
-  width: 100%;
-=======
  padding: 1.2rem 3.2rem;
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
  &:disabled {
    filter: brightness(0.9);
    cursor: not-allowed;