mirror of
https://github.com/ansible/awx.git
synced 2026-05-07 01:17:37 -02:30
UX feedback on Activity Streams
As well as tags and some select2
This commit is contained in:
committed by
John Mitchell
parent
b6222e5857
commit
1f0d88c7ab
@@ -146,7 +146,7 @@ a:focus {
|
|||||||
|
|
||||||
/* Bring primary (blue) buttons in line with link colors */
|
/* Bring primary (blue) buttons in line with link colors */
|
||||||
.btn-primary {
|
.btn-primary {
|
||||||
background-color: @blue-link;
|
background-color: @default-link;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-primary:hover {
|
.btn-primary:hover {
|
||||||
@@ -2012,7 +2012,7 @@ tr td button i {
|
|||||||
|
|
||||||
.form-control + .select2 .select2-selection {
|
.form-control + .select2 .select2-selection {
|
||||||
border-color: @d7grey !important;
|
border-color: @d7grey !important;
|
||||||
background-color: #f6f6f6 !important;
|
background-color: #fcfcfc !important;
|
||||||
color: @default-data-txt !important;
|
color: @default-data-txt !important;
|
||||||
transition: border-color 0.3s !important;
|
transition: border-color 0.3s !important;
|
||||||
box-shadow: none !important;
|
box-shadow: none !important;
|
||||||
|
|||||||
@@ -272,7 +272,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.select2-container--default .select2-results__option[aria-selected=true]{
|
.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{
|
.select2-container--default .select2-selection--single .select2-selection__arrow b{
|
||||||
|
|||||||
@@ -181,7 +181,6 @@ table, tbody {
|
|||||||
.List-actionHolder {
|
.List-actionHolder {
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
display: flex;
|
display: flex;
|
||||||
height: 34px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.List-actions {
|
.List-actions {
|
||||||
@@ -189,7 +188,7 @@ table, tbody {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.List-auxAction + .List-actions {
|
.List-auxAction + .List-actions {
|
||||||
margin-left: 10px;
|
margin-left: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.List-auxAction {
|
.List-auxAction {
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
.ActivityStream-refreshButton{
|
||||||
|
height: 30px;
|
||||||
|
padding-top: 0px;
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.ActivityStream-eventColumnHeader:hover{
|
||||||
|
cursor: auto;
|
||||||
|
}
|
||||||
@@ -25,9 +25,13 @@
|
|||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.StreamDetail-actions{
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
.StreamDetail-changes {
|
.StreamDetail-changes {
|
||||||
border: none;
|
border: none;
|
||||||
background-color: @default-secondary-bg;
|
background-color: @default-no-items-bord;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
max-height: 200px;
|
max-height: 200px;
|
||||||
overflow: scroll;
|
overflow: scroll;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div ng-show="operation" class="StreamDetail-inlineRow">
|
<div ng-show="operation" class="StreamDetail-inlineRow">
|
||||||
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle">ACTION</div>
|
<div class="StreamDetail-rowTitle StreamDetail-inlineRowTitle">ACTION</div>
|
||||||
<div class="StreamDetail-inlineRowData" ng-bind="operation"></div>
|
<div class="StreamDetail-inlineRowData StreamDetail-actions" ng-bind="operation"></div>
|
||||||
</div>
|
</div>
|
||||||
<div ng-show="changes">
|
<div ng-show="changes">
|
||||||
<div class="StreamDetail-rowTitle StreamDetail-changesRowTitle">CHANGES</div>
|
<div class="StreamDetail-rowTitle StreamDetail-changesRowTitle">CHANGES</div>
|
||||||
@@ -22,7 +22,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="Modal-footer">
|
<div class="Modal-footer">
|
||||||
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn Modal-defaultButton Modal-footerButton StreamDetail-actionButton">OK</a>
|
<a href="#" data-target="#stream-detail-modal" data-dismiss="modal" id="action_cancel_btn" class="btn btn-primary StreamDetail-actionButton">OK</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export default
|
|||||||
|
|
||||||
fields: {
|
fields: {
|
||||||
timestamp: {
|
timestamp: {
|
||||||
label: 'Event Time',
|
label: 'Time',
|
||||||
key: true,
|
key: true,
|
||||||
desc: true,
|
desc: true,
|
||||||
noLink: true,
|
noLink: true,
|
||||||
@@ -44,11 +44,11 @@ export default
|
|||||||
columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3'
|
columnClass: 'col-lg-3 col-md-3 col-sm-3 col-xs-3'
|
||||||
},
|
},
|
||||||
description: {
|
description: {
|
||||||
label: 'Action',
|
label: 'Event',
|
||||||
ngBindHtml: 'activity.description',
|
ngBindHtml: 'activity.description',
|
||||||
nosort: true,
|
nosort: true,
|
||||||
searchable: false,
|
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: {
|
actor: {
|
||||||
label: 'System event',
|
label: 'System event',
|
||||||
@@ -263,7 +263,7 @@ export default
|
|||||||
id: 'activity-stream-refresh-btn',
|
id: 'activity-stream-refresh-btn',
|
||||||
awToolTip: "Refresh the page",
|
awToolTip: "Refresh the page",
|
||||||
ngClick: "refreshStream()",
|
ngClick: "refreshStream()",
|
||||||
actionClass: 'btn List-buttonDefault',
|
actionClass: 'btn List-buttonDefault ActivityStream-refreshButton',
|
||||||
buttonContent: 'REFRESH'
|
buttonContent: 'REFRESH'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -174,7 +174,6 @@
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 2px 10px;
|
padding: 2px 10px;
|
||||||
margin: 4px 0px;
|
margin: 4px 0px;
|
||||||
border: 1px solid @d7grey;
|
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
color: @default-interface-txt;
|
color: @default-interface-txt;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
@@ -192,11 +191,13 @@
|
|||||||
border-bottom-right-radius: 0px;
|
border-bottom-right-radius: 0px;
|
||||||
border-right: 0;
|
border-right: 0;
|
||||||
max-wdith: ~"calc(100% - 23px)";
|
max-wdith: ~"calc(100% - 23px)";
|
||||||
|
background-color: @default-link;
|
||||||
|
color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.TagSearch-deleteContainer {
|
.TagSearch-deleteContainer {
|
||||||
border: 1px solid @d7grey;
|
background-color: @default-link!important;
|
||||||
border-left-color: @default-bg;
|
color: white;
|
||||||
background-color: @default-bg;
|
background-color: @default-bg;
|
||||||
border-top-right-radius: 5px;
|
border-top-right-radius: 5px;
|
||||||
border-bottom-right-radius: 5px;
|
border-bottom-right-radius: 5px;
|
||||||
@@ -210,7 +211,6 @@
|
|||||||
|
|
||||||
.TagSearch-tagDelete {
|
.TagSearch-tagDelete {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
color: @default-icon;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.TagSearch-name {
|
.TagSearch-name {
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
|
|
||||||
.TagSearch-deleteContainer:hover, {
|
.TagSearch-deleteContainer:hover, {
|
||||||
border-color: @default-err;
|
border-color: @default-err;
|
||||||
background-color: @default-err;
|
background-color: @default-err!important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.TagSearch-deleteContainer:hover > .TagSearch-tagDelete {
|
.TagSearch-deleteContainer:hover > .TagSearch-tagDelete {
|
||||||
|
|||||||
Reference in New Issue
Block a user