diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 5c90f2eeb9..1c78aa9e34 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -132,7 +132,7 @@ table, tbody { font-weight: normal; padding: 2px 10px; height: 14px; - margin: 3px 0; + margin: 0; background-color: @list-title-badge; border-radius: 5px; } @@ -146,6 +146,8 @@ table, tbody { font-size: 14px; font-weight: bold; margin-right: 10px; + line-height: 0.8; + text-transform: uppercase; } .List-actionHolder { diff --git a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less index a33f7b3ec2..c6b11557f3 100644 --- a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less @@ -12,7 +12,7 @@ .DashboardList-header { display: flex; border-bottom: 1px solid @list-header-bord; - height: 50px; + margin-top: 20px; } .DashboardList-headerText { @@ -21,8 +21,6 @@ font-size: 14px; font-weight: bold; color: @list-header-txt; - height: 50px; - line-height: 50px; white-space: nowrap; padding-left: 20px; } @@ -34,12 +32,8 @@ .DashboardList-viewAll { font-size: 11px; margin-right: 15px; - margin-top: 13px; - margin-bottom: 10px; padding-left: 10px; padding-right: 10px; - padding-bottom: 5px; - padding-top: 5px; } .DashboardList-container { diff --git a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less index 2be2cb4e8d..ad98ec351e 100644 --- a/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less +++ b/awx/ui/client/src/job-results/job-results-stdout/job-results-stdout.block.less @@ -71,10 +71,10 @@ width: 18px; height: 18px; width: 18px; - padding-left: 3.8px; + padding: 1px 0 0 4px; border-radius: 50%; margin-top: 10px; - font-size: 12px; + font-size: 11px; background-color: @default-icon; color: @default-bg; } diff --git a/awx/ui/client/src/job-results/job-results.block.less b/awx/ui/client/src/job-results/job-results.block.less index 63a53c413c..5ed1de0b7b 100644 --- a/awx/ui/client/src/job-results/job-results.block.less +++ b/awx/ui/client/src/job-results/job-results.block.less @@ -161,6 +161,10 @@ flex-direction: column; } +.JobResults-panelRight .SmartSearch-bar { + width: 100%; +} + .JobResults-panelRightTitle{ flex-wrap: wrap; } @@ -203,6 +207,7 @@ job-results-standard-out { display: flex; border: 1px solid @d7grey; border-radius: 5px; + margin-top: 20px; } @media screen and (max-width: @breakpoint-md) { job-results-standard-out { diff --git a/awx/ui/client/src/license/license.block.less b/awx/ui/client/src/license/license.block.less index b82a980b89..052159ccba 100644 --- a/awx/ui/client/src/license/license.block.less +++ b/awx/ui/client/src/license/license.block.less @@ -8,7 +8,6 @@ .License-container{ .OnePlusTwo-container; - margin-bottom: 20px; } .License-container--missing { @@ -84,14 +83,12 @@ .License-fields{ .OnePlusTwo-left--details; } -.License-details { - .OnePlusTwo-left--panel(650px); -} + .License-titleText { .OnePlusTwo-panelHeader; } .License-management{ - .OnePlusTwo-right--panel(650px); + display: flex; } .License-management--missingLicense{ height: auto; @@ -109,11 +106,19 @@ color:@default-bg !important; } .License-submit--container{ - height: 33px; + position: absolute; + right: 36px; + bottom: 20px; } + +@media (min-width: 900px) { + .License-details { + margin-right: 20px; + } +} + .License-submit--success{ - line-height:33px; - margin: 0 10px 0 0; + margin: 0; } .License-file--container { input[type=file] { diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html index a4ad990fa2..0c03ef6739 100644 --- a/awx/ui/client/src/license/license.partial.html +++ b/awx/ui/client/src/license/license.partial.html @@ -2,7 +2,7 @@ ng-class="{'License-container--missing': licenseMissing}">
-
Details
+
Details
License
@@ -73,7 +73,7 @@
-
{{title}}
+
{{title}}
Welcome to Ansible Tower! Please complete the steps below to acquire a license.
@@ -117,10 +117,10 @@
-
- - Save successful! -
+
+ + Save successful! +
diff --git a/awx/ui/client/src/portal-mode/portal-mode.block.less b/awx/ui/client/src/portal-mode/portal-mode.block.less index 793c8d8101..9ea8774a9a 100644 --- a/awx/ui/client/src/portal-mode/portal-mode.block.less +++ b/awx/ui/client/src/portal-mode/portal-mode.block.less @@ -12,6 +12,10 @@ .List-tableHeader:last-of-type{ text-align:left; } + + .List-header { + height: 20px; + } } .PortalMode-panelHeader{ .OnePlusOne-panelHeader; diff --git a/awx/ui/client/src/setup-menu/setup-item.block.less b/awx/ui/client/src/setup-menu/setup-item.block.less index bf27cdfc53..ca74e302a7 100644 --- a/awx/ui/client/src/setup-menu/setup-item.block.less +++ b/awx/ui/client/src/setup-menu/setup-item.block.less @@ -7,7 +7,7 @@ background-color: @panel-bg; border-radius: 5px; border: 1px solid @btn-bord; - min-height: 140px; + min-height: 120px; padding: 20px; margin-top: 20px; transition: background-color 0.2s; @@ -25,12 +25,14 @@ margin-bottom: 15px; font-weight: 600; text-transform: uppercase; + margin-top: 0; } .SetupItem-description{ font-size: 12px; color: @default-interface-txt; text-align: center; + margin-bottom: 0; } @media (min-width: 1179px) { diff --git a/awx/ui/client/src/shared/paginate/paginate.block.less b/awx/ui/client/src/shared/paginate/paginate.block.less index 7c1dd865ed..93b287df00 100644 --- a/awx/ui/client/src/shared/paginate/paginate.block.less +++ b/awx/ui/client/src/shared/paginate/paginate.block.less @@ -18,35 +18,41 @@ border-color: @list-pagin-bord; } - .Paginate { - margin-top: 20px; - font-size: 12px !important; - color: @list-pagin-text; - text-transform: uppercase; - display: flex; - justify-content: flex-end; - } +.Paginate { + margin-top: 20px; + font-size: 12px !important; + color: @list-pagin-text; + text-transform: uppercase; + display: flex; + justify-content: flex-end; +} - .Paginate-pager--pageof { - line-height: 22px; - margin-left: 10px; - } +.Paginate-pager--pageof { + line-height: 22px; + margin-left: 10px; +} - .Paginate-wrapper { - display: flex; - flex: 1 0 auto; - } +.Paginate-wrapper { + display: flex; + flex: 1 0 auto; +} - .Paginate-controls { - margin-top: 0; - margin-bottom: 7px; - display: inline-block; - padding-left: 0; - border-radius: 4px; - } +.Paginate-controls { + margin-top: 0; + margin-bottom: 0px; + display: inline-block; + padding-left: 0; + border-radius: 4px; +} - .Paginate-controls--active { - color: #fff !important; - border-color: @default-icon-hov !important; - background-color: @default-icon-hov !important; - } +.Paginate-controls--active { + color: #fff !important; + border-color: @default-icon-hov !important; + background-color: @default-icon-hov !important; +} + +.Paginate-total { + display: flex; + align-items: flex-end; + margin-bottom: -2px; +}