fix(tooltip): align closable tooltip icon button

telerik · May 31, 2018 · 69f2d09 · 69f2d09
1 parent 9a7d19b
commit 69f2d09
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 36 deletions.
diff --git a/packages/bootstrap/scss/tooltip/_theme.scss b/packages/bootstrap/scss/tooltip/_theme.scss
@@ -1,16 +1,9 @@
-@include exports("tooltip/theme") {
+@import "~@progress/kendo-theme-default/scss/tooltip/theme";
+
+@include exports("tooltip/theme/bootstrap") {
 
     .k-tooltip {
         font-size: $tooltip-font-size;
-        color: contrast-wcag($tooltip-bg);
-        background-color: $tooltip-bg;
-        @include border-radius($border-radius);
     }
 
-
-    .k-callout-n { border-bottom-color: $tooltip-bg; }
-    .k-callout-e { border-left-color: $tooltip-bg; }
-    .k-callout-s { border-top-color: $tooltip-bg; }
-    .k-callout-w { border-right-color: $tooltip-bg; }
-
 }
diff --git a/packages/default/scss/tooltip/_layout.scss b/packages/default/scss/tooltip/_layout.scss
@@ -52,6 +52,7 @@ $tooltip-callout-size: 12px !default;
 
         .k-icon {
             color: inherit;
+            vertical-align: top;
         }
 
         .k-rtl &,
@@ -75,28 +76,32 @@ $tooltip-callout-size: 12px !default;
     .k-callout-n {
         left: 50%;
         margin-left: -$callout-half-size;
+        border-bottom-color: currentColor;
         top: -$tooltip-callout-size;
         pointer-events: none;
     }
 
-    .k-callout-w {
+    .k-callout-e {
         top: 50%;
         margin-top: -$callout-half-size;
-        left: -$tooltip-callout-size;
+        border-left-color: currentColor;
+        right: -$tooltip-callout-size;
         pointer-events: none;
     }
 
     .k-callout-s {
         left: 50%;
         margin-left: -$callout-half-size;
+        border-top-color: currentColor;
         bottom: -$tooltip-callout-size;
         pointer-events: none;
     }
 
-    .k-callout-e {
+    .k-callout-w {
         top: 50%;
         margin-top: -$callout-half-size;
-        right: -$tooltip-callout-size;
+        border-right-color: currentColor;
+        left: -$tooltip-callout-size;
         pointer-events: none;
     }
 }
diff --git a/packages/default/scss/tooltip/_theme.scss b/packages/default/scss/tooltip/_theme.scss
@@ -1,25 +1,9 @@
-$tooltip-color: $accent-contrast !default;
-$tooltip-bg: $accent !default;
-
 @include exports("tooltip/theme") {
     .k-tooltip {
         color: $tooltip-color;
         background-color: $tooltip-bg;
     }
-
-    .k-callout-n {
-        border-bottom-color: $tooltip-bg;
-    }
-
-    .k-callout-e {
-        border-left-color: $tooltip-bg;
-    }
-
-    .k-callout-s {
-        border-top-color: $tooltip-bg;
-    }
-
-    .k-callout-w {
-        border-right-color: $tooltip-bg;
+    .k-callout {
+        color: $tooltip-bg;
     }
 }
diff --git a/packages/material/scss/tooltip/_theme.scss b/packages/material/scss/tooltip/_theme.scss
@@ -1,5 +1 @@
-$tooltip-color: #ffffff !default;
-$tooltip-bg: #616161 !default;
-
 @import "~@progress/kendo-theme-default/scss/tooltip/theme";
-