From 70dc8d71c0e2fbaa5467a49ae158c1005b353192 Mon Sep 17 00:00:00 2001 From: Vini Brasil Date: Tue, 25 Apr 2023 10:28:32 +0100 Subject: [PATCH] Improve comparisons UI for mobile devices (#2847) * Hide arrows when comparing on smaller devices * Hide "vs." label when comparing on smaller devices --- assets/js/dashboard/comparison-input.js | 2 +- assets/js/dashboard/datepicker.js | 31 +++++++++++++++++-------- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/assets/js/dashboard/comparison-input.js b/assets/js/dashboard/comparison-input.js index 0a099d39e..3fd36d627 100644 --- a/assets/js/dashboard/comparison-input.js +++ b/assets/js/dashboard/comparison-input.js @@ -151,7 +151,7 @@ const ComparisonInput = function({ site, query, history }) { return ( <> - vs. + vs.
diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index 47273f621..941e47f37 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -24,6 +24,7 @@ import { import { navigateToQuery, QueryLink, QueryButton } from "./query"; import { shouldIgnoreKeypress } from "./keybinding.js" import { COMPARISON_DISABLED_PERIODS, toggleComparisons, isComparisonEnabled } from "../dashboard/comparison-input.js" +import classNames from "classnames" function renderArrow(query, site, period, prevDate, nextDate) { const insertionDate = parseUTCDate(site.statsBegin); @@ -38,19 +39,29 @@ function renderArrow(query, site, period, prevDate, nextDate) { period ); - const leftClasses = `flex items-center px-1 sm:px-2 border-r border-gray-300 rounded-l - dark:border-gray-500 dark:text-gray-100 ${ - disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900" -}`; - const rightClasses = `flex items-center px-1 sm:px-2 rounded-r dark:text-gray-100 ${ - disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-100 dark:hover:bg-gray-900" - }`; + const isComparing = isComparisonEnabled(query.comparison) + + const leftClass = classNames("flex items-center px-1 sm:px-2 border-r border-gray-300 rounded-l dark:border-gray-500 dark:text-gray-100", { + "bg-gray-300 dark:bg-gray-950": disabledLeft, + "hover:bg-gray-100 dark:hover:bg-gray-900": !disabledLeft, + }) + + const rightClass = classNames("flex items-center px-1 sm:px-2 rounded-r dark:text-gray-100", { + "bg-gray-300 dark:bg-gray-950": disabledRight, + "hover:bg-gray-100 dark:hover:bg-gray-900": !disabledRight, + }) + + const containerClass = classNames("rounded shadow bg-white mr-2 sm:mr-4 cursor-pointer dark:bg-gray-800", { + "hidden md:flex": isComparing, + "flex": !isComparing, + }) + return ( -
+