fix(calendar): fix button color

privy-open-source · Jul 1, 2022 · 589b099 · 589b099
1 parent ab556cf
commit 589b099
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 36 deletions.
diff --git a/components/calendar/Calendar.vue b/components/calendar/Calendar.vue
@@ -7,7 +7,7 @@
     <div class="calendar__nav">
       <Button
         data-testid="calendar-prev"
-        variant="outline"
+        variant="solid"
         icon
         size="sm"
         :disabled="!canPrev"
@@ -19,7 +19,7 @@
       <Button
         data-testid="calendar-title"
         class="calendar__nav-title"
-        variant="outline"
+        variant="solid"
         size="sm"
         :readonly="disabled || readonly"
         @click="changeMode(1)">
@@ -28,7 +28,7 @@
 
       <Button
         data-testid="calendar-next"
-        variant="outline"
+        variant="solid"
         icon
         size="sm"
         :readonly="disabled || readonly"
@@ -50,7 +50,7 @@
           v-for="(item, i) in items"
           :key="i">
           <Button
-            variant="outline"
+            variant="solid"
             icon
             data-testid="calendar-item"
             :readonly="item.readonly || disabled || readonly"
@@ -258,15 +258,25 @@ export default defineComponent({
     }
   }
 
-  .btn--outline {
-    @apply border-0 justify-center;
+  .btn--solid {
+    @apply border-0 justify-center bg-transparent text-body-100;
+
+    &:hover,
+    &:focus,
+    &:active {
+      @apply text-white;
+    }
 
     &[readonly] {
       @apply pointer-events-none;
     }
 
-    &[active="true"]:not(:hover) {
+    &[active="true"] {
       @apply bg-primary-100 text-white;
+
+      &:active {
+        @apply bg-primary-focused;
+      }
     }
   }
 

diff --git a/yarn.lock b/yarn.lock
@@ -5831,35 +5831,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^2.9.12":
-  version: 2.9.13
-  resolution: "vite@npm:2.9.13"
-  dependencies:
-    esbuild: ^0.14.27
-    fsevents: ~2.3.2
-    postcss: ^8.4.13
-    resolve: ^1.22.0
-    rollup: ^2.59.0
-  peerDependencies:
-    less: "*"
-    sass: "*"
-    stylus: "*"
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  peerDependenciesMeta:
-    less:
-      optional: true
-    sass:
-      optional: true
-    stylus:
-      optional: true
-  bin:
-    vite: bin/vite.js
-  checksum: a5e501b920a448c352e9b3836019dea56c523535f8e8540160708c2e164d84da6655ae39abbba1e2888092f5c6cd03dd06279852422359b51be601914645f49f
-  languageName: node
-  linkType: hard
-
 "vite@npm:^2.9.7":
   version: 2.9.8
   resolution: "vite@npm:2.9.8"