diff --git a/package.json b/package.json index 0b72d1ac1..b1ad9e716 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "@heroicons/react": "^1.0.6", "@hot-loader/react-dom": "^16.14.0", "@tailwindcss/forms": "^0.5.2", + "@tailwindcss/line-clamp": "^0.4.0", "axios": "^0.21.1", "chart.js": "^2.8.0", "classnames": "^2.3.1", diff --git a/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx b/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx index 1e061125c..e8e8eb860 100644 --- a/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx +++ b/resources/scripts/components/dashboard/activity/ActivityLogContainer.tsx @@ -51,7 +51,7 @@ export default () => {
setFilters(value => ({ ...value, filters: {} }))} > Clear Filters @@ -67,7 +67,7 @@ export default () => { key={`${activity.event}|${activity.timestamp.toString()}`} className={'grid grid-cols-10 py-4 border-b-2 border-gray-800 last:rounded-b last:border-0'} > -
+
{activity.relationships.actor ? {'User @@ -76,13 +76,13 @@ export default () => { }
-
+
{activity.relationships.actor?.username || 'system'}  —  {activity.event} @@ -92,7 +92,7 @@ export default () => { }
-

+

{activity.event.replace(':', '.')} @@ -100,7 +100,7 @@ export default () => {

{activity.ip} diff --git a/resources/scripts/components/elements/tooltip/Tooltip.tsx b/resources/scripts/components/elements/tooltip/Tooltip.tsx index d8409e0bd..9e8de35af 100644 --- a/resources/scripts/components/elements/tooltip/Tooltip.tsx +++ b/resources/scripts/components/elements/tooltip/Tooltip.tsx @@ -73,7 +73,7 @@ export default ({ content, children, disabled = false, ...props }: Props) => { transition={{ type: 'easeIn', damping: 20, stiffness: 300, duration: 0.1 }} {...getFloatingProps({ ref: floating, - className: 'absolute top-0 left-0 bg-gray-900 text-sm text-gray-200 px-3 py-2 rounded pointer-events-none', + className: 'absolute top-0 left-0 bg-gray-900 text-sm text-gray-200 px-3 py-2 rounded pointer-events-none max-w-[90vw]', style: { position: strategy, top: `${y || 0}px`, diff --git a/tailwind.config.js b/tailwind.config.js index ef49c7f0d..7c814bd61 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -43,6 +43,7 @@ module.exports = { }, }, plugins: [ + require('@tailwindcss/line-clamp'), require('@tailwindcss/forms')({ strategy: 'class', }), diff --git a/yarn.lock b/yarn.lock index 2e4264f5d..9471fc6f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1412,6 +1412,11 @@ dependencies: mini-svg-data-uri "^1.2.3" +"@tailwindcss/line-clamp@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.0.tgz#03353e31e77636b785f2336e8c978502cec1de81" + integrity sha512-HQZo6gfx1D0+DU3nWlNLD5iA6Ef4JAXh0LeD8lOGrJwEDBwwJNKQza6WoXhhY1uQrxOuU8ROxV7CqiQV4CoiLw== + "@types/chart.js@^2.8.5": version "2.8.5" resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.8.5.tgz#7d47cfd36f0a1c2c4ad6a585749bc68e8659492a"