From d1c3d854e99b4e3c01ecf58fb3ce5f6138940187 Mon Sep 17 00:00:00 2001 From: bigjohn322 Date: Fri, 28 Nov 2014 12:38:00 -0600 Subject: [PATCH 1/2] Resolve 1440px Dashboard Layout conflict When browser is exactly 1440px, unnecessary top margin added to first right column, resulting in uneven column alignment. Positioning of right column is also dependent on min-width 1440px in another location. Changing to 1439px here resolves the conflict. --- dashboard-ui/css/site.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 1e0af4be0..20164d374 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -786,7 +786,7 @@ progress { color: green; } -@media all and (max-width: 1440px) { +@media all and (max-width: 1439px) { .dashboardHomeRightColumn { margin-top: 1em; From e5599b4af5a12d570117bb1826975ee494231451 Mon Sep 17 00:00:00 2001 From: bigjohn322 Date: Fri, 28 Nov 2014 12:55:13 -0600 Subject: [PATCH 2/2] Keep Recent Activity nav buttons inside parent div When the recent activity box is full with longer activities, the nav buttons can get pushed ouut the bottom of the div because of the height being set explicitly. Changing to max-height fixes the problem. --- dashboard-ui/css/site.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 20164d374..a560e4203 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -822,7 +822,7 @@ progress { } .firstDashboardHomeRightColumn .ui-collapsible-content { - height: 585px; + min-height: 585px; } }