External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-14 11:20:39 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'kensible-1831-auditGlobal+953' into devel

Browse Source
This commit is contained in:
Ken Hoes 2016-05-20 13:48:24 -04:00
commit 17272fec05
12 changed files with 87 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
awx/ui/client/legacy-styles/ansible-ui.less
View File

@ -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;

4
awx/ui/client/legacy-styles/jobs.less
View File

@ -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;

1
awx/ui/client/legacy-styles/lists.less
View File

@ -195,6 +195,7 @@ table, tbody {
.List-auxAction {
align-items: center;
display: flex;
order: 1;
margin-left: 20px;
}

2
awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less
View File

@ -113,7 +113,7 @@
}
.DashboardGraphs-filterDropdownItems {
position: fixed;
position: absolute;
left: auto;
top: auto;
box-shadow: none;

2
awx/ui/client/src/lookup/lookup.block.less
View File

@ -7,7 +7,7 @@
.List-tableHeaderRow {
.List-tableHeader:first-of-type {
width: 3%;
width: 4%;
}
}

2
awx/ui/client/src/main-menu/main-menu.partial.html
View File

@ -175,7 +175,7 @@
data-trigger="hover"
data-container="body"
target="_blank">
<i class="MainMenu-itemImage MainMenu-itemImage--docs fa fa-question-circle"
<i class="MainMenu-itemImage MainMenu-itemImage--docs fa fa-book"
alt="View Documentation">
</i>
</a>

6
awx/ui/client/src/portal-mode/portal-mode.block.less
View File

@ -20,4 +20,8 @@
position: absolute;
top: 45px;
right: 35px;
}
.btn.btn-xs {
padding: 1px 10px;
}
}

4
awx/ui/client/src/search/tagSearch.block.less
View File

@ -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 {

2
awx/ui/client/src/search/tagSearch.partial.html
View File

@ -1,5 +1,5 @@
<div class="TagSearch row">
<div ng-class="listConfig.searchSize || 'col-lg-4 col-md-12 col-sm-12 col-xs-12'">
<div ng-class="listConfig.searchSize || 'col-lg-5 col-md-12 col-sm-12 col-xs-12'">
<div class="TagSearch-bar">
<div class="TagSearch-typeDropdown"
ng-click="toggleTypeDropdown()"

2
awx/ui/client/src/setup-menu/setup-item.block.less
View File

@ -7,7 +7,7 @@
background-color: @panel-bg;
border-radius: 5px;
border: 1px solid @btn-bord;
min-height: 110px;
min-height: 140px;
padding: 20px;
margin-top: 20px;
transition: background-color 0.2s;

6
awx/ui/client/src/smart-status/smart-status.controller.js
View File

@ -20,13 +20,13 @@ export default ['$scope', '$filter',
if (job.status === 'successful') {
data.value = 1;
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--success icon-job-successful\"></i> " + job.status.charAt(0).toUpperCase() + job.status.slice(1);
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--success icon-job-successful\"></i> " + job.status.toUpperCase();
} else if (isFailureState(job.status)) {
data.value = -1;
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--failed icon-job-successful\"></i> " + job.status.charAt(0).toUpperCase() + job.status.slice(1);
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--failed icon-job-successful\"></i> " + job.status.toUpperCase();
} else {
data.value = 0;
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--running icon-job-successful\"></i> " + job.status.charAt(0).toUpperCase() + job.status.slice(1);
data.smartStatus = "<i class=\"fa DashboardList-status SmartStatus-tooltip--running icon-job-successful\"></i> " + job.status.toUpperCase();
}
data.jobId = job.id;

2
awx/ui/templates/ui/index.html
View File

@ -122,7 +122,7 @@
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" ng-hide="disableButtons" data-target="#alert-modal"
data-dismiss="modal" class="modal" aria-hidden="true">&times;</button>
data-dismiss="modal" class="modal" aria-hidden="true"><i class="fa fa-times-circle"></i></button>
<h3 id= "alertHeader" ng-bind="alertHeader"></h3>
</div>
<div class="modal-body">