From e45453b036b4f6ecc0e1733aa00f3be6401fbfd9 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 24 Nov 2015 12:05:39 -0500 Subject: [PATCH 1/3] update dashboard counts to 3 styling --- .../src/dashboard/counts/dashboard-counts.block.less | 12 ++++++++++-- awx/ui/client/src/dashboard/dashboard.block.less | 3 --- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index 5f63a567f4..a5df3f748b 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -18,6 +18,12 @@ padding-left: 15px; padding-right: 15px; border-radius: 3px; + background-color: #fff; + border: 1px solid #e1e1e1; + flex: 1 0 auto; + max-width: ~"calc(16.6% - 15px)"; + flex-basis: ~"calc(16.6% - 15px)"; + transition: background-color 0.2s, border-color 0.2s; } @media only screen and (max-width: 710px) { @@ -26,7 +32,6 @@ } .DashboardCounts-buttonStyle { - border: 1px solid #aaa; margin-bottom: 15px; width: 33%; flex-basis: ~"calc(33% - 7px)"; @@ -58,6 +63,7 @@ font-size: 30px; line-height: 26px; flex: 1; + transition: color 0.2s; } .DashboardCounts-number.is-failure { @@ -67,5 +73,7 @@ .DashboardCounts-label { flex: 1; margin-bottom: 0px; - color: #000; + color: #848992; + text-transform: uppercase; + transition: color 0.2s; } diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index fed248d237..29409a966d 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -10,9 +10,6 @@ .Dashboard-counts { flex: initial; width: 100%; - border: 1px solid #a9a9a9; - border-radius: 4px; - padding: 9px; } .Dashboard-graphs { From 7e783ba4b71bae8143a69b8335019cb249425acf Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 24 Nov 2015 16:21:31 -0500 Subject: [PATCH 2/3] fixed border radius --- awx/ui/client/src/dashboard/counts/dashboard-counts.block.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index a5df3f748b..6cdf40598a 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -17,7 +17,7 @@ padding-bottom: 11px; padding-left: 15px; padding-right: 15px; - border-radius: 3px; + border-radius: 5px; background-color: #fff; border: 1px solid #e1e1e1; flex: 1 0 auto; From 1c655befe5ff79e8a3febe01e95158bdf91804f9 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 24 Nov 2015 16:25:09 -0500 Subject: [PATCH 3/3] fixed height of mobile buttons --- awx/ui/client/src/dashboard/counts/dashboard-counts.block.less | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index 6cdf40598a..1c854a30dc 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -36,6 +36,7 @@ width: 33%; flex-basis: ~"calc(33% - 7px)"; max-width: ~"calc(33% - 7px)"; + height: 96px; } }