Merge pull request #8521 from shashkovdanil/neotooltip-tailwindcss

NeoTooltip to tailwindcss
kodadot · Dec 11, 2023 · 79b4398 · 79b4398
2 parents 089cca6 + 742ad66
commit 79b4398
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 44 deletions.
diff --git a/libs/ui/src/components/NeoTooltip/NeoTooltip.scss b/libs/ui/src/components/NeoTooltip/NeoTooltip.scss
@@ -2,7 +2,6 @@
 @import '@oruga-ui/oruga-next/src/scss/utilities/variables.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/animations.scss';
 @import '@oruga-ui/oruga-next/src/scss/utilities/helpers.scss';
-@import '../../scss/variable.scss';
 
 $tooltip-content-zindex: 101;
 $tooltip-content-font-size: var(--font-size, 1rem);
@@ -16,47 +15,9 @@ $tooltip-arrow-margin: 1rem;
 @import '@oruga-ui/oruga-next/src/scss/components/tooltip.scss';
 
 .o-tip__content {
-  @include ktheme() {
-    color: theme('text-color');
-    border-color: theme('text-color');
-    background: theme('background-color');
-
-    .o-tip__arrow {
-      color: theme('text-color');
-    }
-  }
-}
-
-.o-tip__trigger > * {
-  font-size: inherit !important;
-  font-family: inherit !important;
-  height: 100%;
-}
-
-.o-tip {
-  &__content {
-    font-size: 0.75rem;
-    padding: 0.5rem 1rem;
-
-    @include ktheme() {
-      color: theme('text-color');
-      border: 1px solid theme('border-color');
-      background: theme('background-color');
-    }
-  }
-
-  &__arrow {
-    @include ktheme() {
-      color: theme('text-color');
-    }
-  }
+  @apply text-xs py-2 px-4 text-text-color border-default border-text-color bg-background-color;
 }
 
-.wrapper {
-  height: 100%;
-  > * {
-    font-size: inherit !important;
-    font-family: inherit !important;
-    height: inherit !important;
-  }
+.o-tip__arrow {
+  @apply text-text-color;
 }
diff --git a/libs/ui/src/components/NeoTooltip/NeoTooltip.vue b/libs/ui/src/components/NeoTooltip/NeoTooltip.vue
@@ -26,7 +26,7 @@
       <div />
     </slot>
   </o-tooltip>
-  <div v-else class="wrapper">
+  <div v-else class="h-full">
     <slot>
       <div />
     </slot>
@@ -110,6 +110,5 @@ const handleClick = (event: MouseEvent) => {
 </script>
 
 <style lang="scss">
-// @import '@oruga-ui/oruga-next/dist/oruga.min.css';
 @import './NeoTooltip.scss';
 </style>