diff --git a/awx/ui/static/js/dashboard/counts/dashboard-counts.block.less b/awx/ui/static/js/dashboard/counts/dashboard-counts.block.less index 4905af1dbc..5f63a567f4 100644 --- a/awx/ui/static/js/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/static/js/dashboard/counts/dashboard-counts.block.less @@ -30,6 +30,7 @@ margin-bottom: 15px; width: 33%; flex-basis: ~"calc(33% - 7px)"; + max-width: ~"calc(33% - 7px)"; } } diff --git a/awx/ui/static/js/dashboard/dashboard.block.less b/awx/ui/static/js/dashboard/dashboard.block.less index e7b77e5fb4..e81f2e62e8 100644 --- a/awx/ui/static/js/dashboard/dashboard.block.less +++ b/awx/ui/static/js/dashboard/dashboard.block.less @@ -21,13 +21,13 @@ } .Dashboard-list { - display: flex; border: 1px solid #a9a9a9; border-radius: 4px; margin-top: 15px; width: 50%; padding: 15px; - flex-basis: ~"calc(50% - 7px)"; + max-width: ~"calc(50% - 7px)"; + position: relative; } @media only screen and (max-width: 710px) { @@ -39,5 +39,6 @@ .Dashboard-list { flex: initial; width: 100%; + max-width: 100%; } } diff --git a/awx/ui/static/js/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/static/js/dashboard/graphs/dashboard-graphs.block.less index 1ecbf92f9d..ac0fd66480 100644 --- a/awx/ui/static/js/dashboard/graphs/dashboard-graphs.block.less +++ b/awx/ui/static/js/dashboard/graphs/dashboard-graphs.block.less @@ -3,8 +3,6 @@ @import "shared/branding/colors.less"; .DashboardGraphs { - display: flex; - flex-direction: column; margin-top: 15px; border: solid 1px #a9a9a9; border-radius: 4px; @@ -88,8 +86,8 @@ .DashboardGraphs-filterDropdownItems { position: fixed; - left: initial; - top: initial; + left: auto; + top: auto; box-shadow: none; } diff --git a/awx/ui/static/js/dashboard/lists/job-templates/job-templates-list.block.less b/awx/ui/static/js/dashboard/lists/job-templates/job-templates-list.block.less index ec5fb2e38f..776a7eb243 100644 --- a/awx/ui/static/js/dashboard/lists/job-templates/job-templates-list.block.less +++ b/awx/ui/static/js/dashboard/lists/job-templates/job-templates-list.block.less @@ -2,8 +2,6 @@ .DashboardJobTemplates { flex: 1; - display: flex; - flex-direction: column; } .DashboardJobTemplates--noJobTemplates { color: #8d8d8d; @@ -17,10 +15,8 @@ .DashboardJobTemplates-container { flex: 1; - display: flex; - flex-direction: column; width: 100%; - padding-bottom: 15px; + padding-bottom: 42px; } .DashboardJobTemplates-item { @@ -44,7 +40,7 @@ .DashboardJobTemplates-seeMore { padding-top: 11px; padding-bottom: 11px; - width: ~"calc(100% + 32px)"; + width: ~"calc(100% + 2px)"; margin-left: -16px; margin-bottom: -16px; border-bottom-left-radius: 4px; @@ -53,6 +49,10 @@ font-size: 17px; text-align: center; background-color: #1778c3; + display: block; + position: absolute; + max-width: ~"calc(100% + 2px)"; + bottom: 16px; } .DashboardJobTemplates-seeMore:hover { diff --git a/awx/ui/static/js/dashboard/lists/jobs/jobs-list.block.less b/awx/ui/static/js/dashboard/lists/jobs/jobs-list.block.less index ae408a8aea..2160056071 100644 --- a/awx/ui/static/js/dashboard/lists/jobs/jobs-list.block.less +++ b/awx/ui/static/js/dashboard/lists/jobs/jobs-list.block.less @@ -2,8 +2,6 @@ .DashboardJobs { flex: 1; - display: flex; - flex-direction: column; } .DashboardJobs--noJobs { @@ -18,10 +16,8 @@ .DashboardJobs-container { flex: 1; - display: flex; - flex-direction: column; width: 100%; - padding-bottom: 15px; + padding-bottom: 42px; } .DashboardJobs-item { @@ -94,7 +90,7 @@ .DashboardJobs-seeMore { padding-top: 11px; padding-bottom: 11px; - width: ~"calc(100% + 32px)"; + width: ~"calc(100% + 2px)"; margin-left: -16px; margin-bottom: -16px; border-bottom-left-radius: 4px; @@ -103,6 +99,10 @@ font-size: 17px; text-align: center; background-color: #1778c3; + display: block; + position: absolute; + max-width: ~"calc(100% + 2px)"; + bottom: 16px; } .DashboardJobs-seeMore:hover {