diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 3396792945..287e92b690 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -146,7 +146,7 @@ a:focus { /* Bring primary (blue) buttons in line with link colors */ .btn-primary { - background-color: @blue-link; + background-color: @default-link; } .btn-primary:hover { @@ -2012,7 +2012,7 @@ tr td button i { .form-control + .select2 .select2-selection { border-color: @d7grey !important; - background-color: #f6f6f6 !important; + background-color: #fcfcfc !important; color: @default-data-txt !important; transition: border-color 0.3s !important; box-shadow: none !important; diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index f5c1db9146..79e7c5e5f5 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -272,7 +272,7 @@ } .select2-container--default .select2-results__option[aria-selected=true]{ - background-color: @field-border !important; + background-color: @default-white-button-bord !important; } .select2-container--default .select2-selection--single .select2-selection__arrow b{ diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index a7685c38e7..49e0e840f7 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -181,7 +181,6 @@ table, tbody { .List-actionHolder { justify-content: flex-end; display: flex; - height: 34px; } .List-actions { @@ -189,7 +188,7 @@ table, tbody { } .List-auxAction + .List-actions { - margin-left: 10px; + margin-left: 20px; } .List-auxAction { diff --git a/awx/ui/client/src/activity-stream/activitystream.block.less b/awx/ui/client/src/activity-stream/activitystream.block.less new file mode 100644 index 0000000000..2f49163095 --- /dev/null +++ b/awx/ui/client/src/activity-stream/activitystream.block.less @@ -0,0 +1,9 @@ +.ActivityStream-refreshButton{ + height: 30px; + padding-top: 0px; + padding-bottom: 0px; +} + +.ActivityStream-eventColumnHeader:hover{ + cursor: auto; +} diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less index ae6de6cdae..1cd280225e 100644 --- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less +++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less @@ -25,9 +25,13 @@ margin-bottom: 5px; } +.StreamDetail-actions{ + word-break: break-all; +} + .StreamDetail-changes { border: none; - background-color: @default-secondary-bg; + background-color: @default-no-items-bord; margin-bottom: 0; max-height: 200px; overflow: scroll; diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html index 34c322c72b..4806a2eb4d 100644 --- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html +++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html @@ -14,7 +14,7 @@