From 81c5e05760bf7f5d6fc05290e662ab61f9a4b73b Mon Sep 17 00:00:00 2001 From: Vignesh Joglekar Date: Tue, 25 May 2021 15:21:03 -0500 Subject: [PATCH] Makes colorings on top bar elements consistent --- assets/js/dashboard/datepicker.js | 8 ++++---- assets/js/dashboard/filters.js | 2 +- assets/tailwind.config.js | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/js/dashboard/datepicker.js b/assets/js/dashboard/datepicker.js index 6fa47e770..d3aee1791 100644 --- a/assets/js/dashboard/datepicker.js +++ b/assets/js/dashboard/datepicker.js @@ -161,10 +161,10 @@ class DatePicker extends React.Component { const leftClasses = `flex items-center px-2 border-r border-gray-300 rounded-l dark:border-gray-500 dark:text-gray-100 ${ - disabledLeft ? "bg-gray-200 dark:bg-gray-900" : "" + disabledLeft ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900" }`; const rightClasses = `flex items-center px-2 rounded-r dark:text-gray-100 ${ - disabledRight ? "bg-gray-200 dark:bg-gray-900" : "" + disabledRight ? "bg-gray-300 dark:bg-gray-950" : "hover:bg-gray-200 dark:hover:bg-gray-900" }`; return (
@@ -242,7 +242,7 @@ class DatePicker extends React.Component { onKeyPress={this.open} className="flex items-center justify-between rounded bg-white dark:bg-gray-800 shadow px-4 pr-3 py-2 leading-tight cursor-pointer text-sm font-medium text-gray-800 - dark:text-gray-200 h-full" + dark:text-gray-200 h-full hover:bg-gray-200 dark:hover:bg-gray-900" tabIndex="0" role="button" aria-haspopup="true" @@ -312,7 +312,7 @@ class DatePicker extends React.Component { to={{from: false, to: false, period, ...opts}} onClick={this.close.bind(this)} query={this.props.query} - className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-100 + className={`${boldClass } px-4 py-2 md:text-sm leading-tight hover:bg-gray-200 dark:hover:bg-gray-900 hover:text-gray-900 dark:hover:text-gray-100 flex items-center justify-between`} > {text} diff --git a/assets/js/dashboard/filters.js b/assets/js/dashboard/filters.js index 5679f605a..1fd179918 100644 --- a/assets/js/dashboard/filters.js +++ b/assets/js/dashboard/filters.js @@ -284,7 +284,7 @@ class Filters extends React.Component { return (
{(this.appliedFilters.map((filter) => this.renderListFilter(history, filter, query)))} - + {viewport <= 768 ? "Filter" : "Add Filter"} diff --git a/assets/tailwind.config.js b/assets/tailwind.config.js index b504ec6fd..4dfba9ebf 100644 --- a/assets/tailwind.config.js +++ b/assets/tailwind.config.js @@ -14,6 +14,7 @@ module.exports = { extend: { colors: { orange: colors.orange, + 'gray-950': 'rgb(13, 18, 30)', 'gray-850': 'rgb(26, 32, 44)', 'gray-825': 'rgb(37, 47, 63)' },