From e9ce00e1d73cb504b840363bd9d24cdd782475c8 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 18 May 2016 13:29:12 -0400 Subject: [PATCH] 1831, 953 - Global ux audit and tooltip styling --- awx/ui/client/legacy-styles/ansible-ui.less | 84 +++++++++++++++---- awx/ui/client/legacy-styles/jobs.less | 4 +- awx/ui/client/legacy-styles/lists.less | 2 + .../graphs/dashboard-graphs.block.less | 2 +- awx/ui/client/src/lookup/lookup.block.less | 2 +- .../src/main-menu/main-menu.partial.html | 2 +- .../src/portal-mode/portal-mode.block.less | 6 +- awx/ui/client/src/search/tagSearch.block.less | 4 +- .../client/src/search/tagSearch.partial.html | 2 +- .../src/setup-menu/setup-item.block.less | 2 +- .../smart-status/smart-status.controller.js | 6 +- awx/ui/templates/ui/index.html | 2 +- 12 files changed, 88 insertions(+), 30 deletions(-) diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index bf8301eb4f..0d0bfc9928 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -422,6 +422,7 @@ textarea.allowresize { max-width: 325px; background-color: @default-interface-txt; color: @default-bg; //white + text-align: left; code { color: @default-data-txt; @@ -442,6 +443,12 @@ textarea.allowresize { .popover.left>.arrow:after { border-left-color: @default-interface-txt; } + .popover.bottom>.arrow:after { + border-bottom-color: @default-interface-txt; + } + .popover.top>.arrow:after { + border-top-color: @default-interface-txt; + } .popover pre { white-space: pre-wrap; } @@ -457,10 +464,16 @@ textarea.allowresize { border-radius: 3px; } } - .tooltip { - z-index: 2050; - opacity: 1.0; - } + +.tooltip { + z-index: 2050; + opacity: 1.0; +} + +.tooltip-inner { + padding: 10px; + text-align:left; +} .alert { margin-top: 15px; @@ -765,6 +778,16 @@ legend { border-color: none; border: 1px solid @default-link; } + .alert { + padding: 0; + border: none; + margin: 0; + } + .alert-danger { + background-color: @default-bg; + border: none; + color: @default-interface-txt; + } } .footer-navigation { @@ -1645,15 +1668,15 @@ tr td button i { /* overrides to TB modal */ .modal-header { - padding: 15px 10px; - color: @default-link; - border-bottom: 1px solid @default-border; - -webkit-border-top-right-radius: 3px; - -moz-border-top-right-radius: 3px; - border-top-right-radius: 3px; - -webkit-border-top-left-radius: 3px; - -moz-border-top-left-radius: 3px; - border-top-left-radius: 3px; + color: @default-interface-txt; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; + width: 100%; + border: none; + padding: 12px 14px 0 12px; } .modal { @@ -1672,13 +1695,18 @@ tr td button i { .modal-header h3 { margin: 0; - font-size: 22px; - font-weight: bold; text-rendering: optimizeLegibility; + font-size: 15px; + color: @default-interface-txt; + font-weight: bold; + line-height: normal; + font-family: 'Open Sans', helvetica; + text-transform: uppercase; } .modal-body { - padding-top: 30px; + padding: 20px 14px 7px 14px; + min-height: 120px; } #prompt-modal .modal-body { @@ -1689,6 +1717,30 @@ tr td button i { padding: 5px 10px 0 10px; } +.modal-footer { + padding: .3em 1em .5em .4em; + border: none; + + .btn.btn-primary { + text-transform: uppercase; + background-color: @default-succ; + border-color: @default-succ; + padding: 5px 15px; + margin: .5em .4em .5em 0; + cursor: pointer; + + &:hover { + background-color: @default-succ-hov; + border-color: @default-succ-hov; + } + + &:disabled { + background-color: @default-succ-disabled; + border-color: @default-succ-disabled; + } + } +} + /* form navigation */ .navigation-buttons { height: 40px; diff --git a/awx/ui/client/legacy-styles/jobs.less b/awx/ui/client/legacy-styles/jobs.less index 05f4fd8d44..a3b403c44c 100644 --- a/awx/ui/client/legacy-styles/jobs.less +++ b/awx/ui/client/legacy-styles/jobs.less @@ -22,9 +22,7 @@ } .pagination li a { font-size: 12px; - padding-left: 3px; - padding-right: 3px; - padding-bottom: 2px; + padding: 3px 6px; } i[class*="icon-job-"] { font-size: 13px; diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 68c0df4eca..3f3013b274 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -195,6 +195,8 @@ table, tbody { .List-auxAction { align-items: center; display: flex; + order: 1; + margin-left: 20px; } .List-auxActionStream { diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less index a00b974edc..8abd237d0d 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less @@ -113,7 +113,7 @@ } .DashboardGraphs-filterDropdownItems { - position: fixed; + position: absolute; left: auto; top: auto; box-shadow: none; diff --git a/awx/ui/client/src/lookup/lookup.block.less b/awx/ui/client/src/lookup/lookup.block.less index 25c05ef803..ca76af6dde 100644 --- a/awx/ui/client/src/lookup/lookup.block.less +++ b/awx/ui/client/src/lookup/lookup.block.less @@ -7,7 +7,7 @@ .List-tableHeaderRow { .List-tableHeader:first-of-type { - width: 3%; + width: 4%; } } diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html index bead6337d4..65518a5543 100644 --- a/awx/ui/client/src/main-menu/main-menu.partial.html +++ b/awx/ui/client/src/main-menu/main-menu.partial.html @@ -175,7 +175,7 @@ data-trigger="hover" data-container="body" target="_blank"> - 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 70d90f8626..de3d6331e1 100644 --- a/awx/ui/client/src/portal-mode/portal-mode.block.less +++ b/awx/ui/client/src/portal-mode/portal-mode.block.less @@ -20,4 +20,8 @@ position: absolute; top: 45px; right: 35px; -} \ No newline at end of file + + .btn.btn-xs { + padding: 1px 10px; + } +} diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 7f68e4d676..55c3d7851d 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -30,8 +30,10 @@ white-space: nowrap; align-items: center; max-height: 400px; - width: 100px; + width: 120px; + overflow-y: scroll; cursor: pointer; + text-transform: uppercase; } .TagSearch-typeDropdown.is-open { diff --git a/awx/ui/client/src/search/tagSearch.partial.html b/awx/ui/client/src/search/tagSearch.partial.html index 16138d3109..3f1108018d 100644 --- a/awx/ui/client/src/search/tagSearch.partial.html +++ b/awx/ui/client/src/search/tagSearch.partial.html @@ -1,5 +1,5 @@
-
+
" + job.status.charAt(0).toUpperCase() + job.status.slice(1); + data.smartStatus = " " + job.status.toUpperCase(); } else if (isFailureState(job.status)) { data.value = -1; - data.smartStatus = " " + job.status.charAt(0).toUpperCase() + job.status.slice(1); + data.smartStatus = " " + job.status.toUpperCase(); } else { data.value = 0; - data.smartStatus = " " + job.status.charAt(0).toUpperCase() + job.status.slice(1); + data.smartStatus = " " + job.status.toUpperCase(); } data.jobId = job.id; diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html index 3d1c7ba0d6..bace4a628d 100644 --- a/awx/ui/templates/ui/index.html +++ b/awx/ui/templates/ui/index.html @@ -122,7 +122,7 @@
+ data-dismiss="modal" class="modal" aria-hidden="true">