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 @@
ACTION
-
+
CHANGES
@@ -22,7 +22,7 @@
diff --git a/awx/ui/client/src/lists/Streams.js b/awx/ui/client/src/lists/Streams.js index 4cf443c0b8..0842019c4c 100644 --- a/awx/ui/client/src/lists/Streams.js +++ b/awx/ui/client/src/lists/Streams.js @@ -24,7 +24,7 @@ export default fields: { timestamp: { - label: 'Event Time', + label: 'Time', key: true, desc: true, noLink: true, @@ -44,11 +44,11 @@ export default columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3' }, description: { - label: 'Action', + label: 'Event', ngBindHtml: 'activity.description', nosort: true, searchable: false, - columnClass: 'col-lg-5 col-md-6 col-sm-4 col-xs-4' + columnClass: 'ActivityStream-eventColumnHeader col-lg-5 col-md-6 col-sm-4 col-xs-4' }, actor: { label: 'System event', @@ -263,7 +263,7 @@ export default id: 'activity-stream-refresh-btn', awToolTip: "Refresh the page", ngClick: "refreshStream()", - actionClass: 'btn List-buttonDefault', + actionClass: 'btn List-buttonDefault ActivityStream-refreshButton', buttonContent: 'REFRESH' } }, diff --git a/awx/ui/client/src/search/tagSearch.block.less b/awx/ui/client/src/search/tagSearch.block.less index 06bc298d42..80cccde89d 100644 --- a/awx/ui/client/src/search/tagSearch.block.less +++ b/awx/ui/client/src/search/tagSearch.block.less @@ -174,7 +174,6 @@ border-radius: 5px; padding: 2px 10px; margin: 4px 0px; - border: 1px solid @d7grey; font-size: 12px; color: @default-interface-txt; text-transform: uppercase; @@ -192,11 +191,13 @@ border-bottom-right-radius: 0px; border-right: 0; max-wdith: ~"calc(100% - 23px)"; + background-color: @default-link; + color: white; } .TagSearch-deleteContainer { - border: 1px solid @d7grey; - border-left-color: @default-bg; + background-color: @default-link!important; + color: white; background-color: @default-bg; border-top-right-radius: 5px; border-bottom-right-radius: 5px; @@ -210,7 +211,6 @@ .TagSearch-tagDelete { font-size: 13px; - color: @default-icon; } .TagSearch-name { @@ -224,7 +224,7 @@ .TagSearch-deleteContainer:hover, { border-color: @default-err; - background-color: @default-err; + background-color: @default-err!important; } .TagSearch-deleteContainer:hover > .TagSearch-tagDelete {