Merge branch 'smart-status' of https://github.com/jaredevantabor/ansible-tower into jaredevantabor-smart-status

Conflicts:
	awx/ui/static/js/controllers/Jobs.js
	awx/ui/static/js/shared/Socket.js
	awx/ui/static/less/ansible-ui.less
This commit is contained in:
John Mitchell
2015-03-10 13:59:08 -04:00
13 changed files with 3263 additions and 5 deletions
+17
View File
@@ -185,6 +185,22 @@ a:focus {
}
}
.jqstooltip{
background-color: black !important;
border-radius:4px;
border: 1px solid black;
}
.smart-status-tooltip{
font-size: 12px;
font-family: 'Open Sans';
background-color: black;
border-radius:4px;
span {
padding: 3px;
}
}
#configure-schedules-tab {
position: relative;
top: 0;
@@ -1872,6 +1888,7 @@ tr td button i {
}
/* Landscape phone to portrait tablet */
@media (max-width: 767px) {