Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve tooltips

Damian Legawiecf63e43bffd6a
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index f8c112883a..46a5c50c16 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -105,11 +105,11 @@ $box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06
$box-shadow-xs: rgba(43, 34, 51, 0.04) 0px 1px 2px !default;
$box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;
-$tooltip-border-radius: $border-radius-sm !default;
+$tooltip-border-radius: $border-radius !default;
$tooltip-opacity: 1 !default;
$tooltip-margin: 0.25rem 0 !default;
-$tooltip-padding-y: .5rem !default;
-$tooltip-padding-x: .75rem !default;
+$tooltip-padding-y: .25rem !default;
+$tooltip-padding-x: .5rem !default;
$tooltip-bg: $white !default;
$tooltip-color: $body-color !default;
$tooltip-arrow-color: transparent !default;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index bfd3c52606..a9e1ec6fa5 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -1,10 +1,7 @@
// https://twitter.com/NatalieMarleny/status/1662402066365526016
html {
min-height: 100%;
- font-feature-settings: "kern";
- font-optical-sizing: auto;
- font-style: normal;
- font-variation-settings: "slnt" 0;
+ letter-spacing: normal;
}
body {
@extend .h-100;
@@ -691,7 +688,8 @@ div.uppy-Root {
}
.tooltip-inner {
- box-shadow: $dropdown-box-shadow;
+ border: 1px solid $gray-100;
+ box-shadow: $box-shadow-xs;
}
.avatar {
diff --git a/admin/app/javascript/spree/admin/helpers/bootstrap.js b/admin/app/javascript/spree/admin/helpers/bootstrap.js
index 20af202800..3218fbbb51 100644
--- a/admin/app/javascript/spree/admin/helpers/bootstrap.js
+++ b/admin/app/javascript/spree/admin/helpers/bootstrap.js
@@ -4,11 +4,11 @@ import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
const initTooltips = () => {
- $('.with-tip').each(function() {
+ $('.with-tip, .trix-button').each(function() {
$(this).tooltip()
})
- $('.with-tip').on('show.bs.tooltip', function(event) {
+ $('.with-tip, .trix-button').on('show.bs.tooltip', function(event) {
if (('ontouchstart' in window)) {
event.preventDefault()
}
@@ -16,7 +16,7 @@ const initTooltips = () => {
}
const removeTooltips = () => {
- $('.with-tip').each(function() {
+ $('.with-tip, .trix-button').each(function() {
$(this).tooltip('dispose')
})
}