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

:%s
2025-07-27 04:01:23 +00:00 · 2021-08-26 19:53:25 +07:00
parent 7cede5cc8c
commit 9073231b2e
4 changed files with 2 additions and 20 deletions
--- a/src/components/common/ButtonCommon/ButtonCommon.module.scss
+++ b/src/components/common/ButtonCommon/ButtonCommon.module.scss
@@ -65,14 +65,8 @@
  }

  &.ghost {
-<<<<<<< HEAD
-    @apply bg-white;
-    color: var(--text-active);
-    border: 1px solid var(--text-active);
-=======
    @apply bg-white text-primary;
    border: 1px solid var(--primary);
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
    &.loading {
      &::before {
        border-top-color: var(--text-active);