diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js index 2fd27b9cb5..f5a4995591 100644 --- a/awx/ui/static/js/lists/Projects.js +++ b/awx/ui/static/js/lists/Projects.js @@ -30,18 +30,18 @@ angular.module('ProjectsListDefinition', []) dataTipWatch: 'project.statusTip', dataPlacement: 'top', icon: "icon-job-{{ project.statusIcon }}", - columnClass: "col-md-1 col-sm-2 col-xs-3", + columnClass: "col-lg-1 col-md-1 col-sm-2 col-xs-2", nosort: true }, name: { key: true, label: 'Name', - columnClass: "col-md-4 col-sm-3 col-xs-3" + columnClass: "col-lg-6 col-md-4 col-sm-6 col-xs-6" }, last_updated: { label: 'Last Updated', filter: "date:'MM/dd/yy HH:mm:ss'", - columnClass: "col-md-2 hidden-sm hidden-xs", + columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs", excludeModal: true, searchable: false, nosort: true diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index d6927ddaa4..24d3739eee 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -738,55 +738,54 @@ select.page-size { /* breadcrumbs */ .nav-path { - padding: 5px 0 10px 0; - margin-right: 5px; - margin-bottom: 20px; - font-size: 14px; - font-weight: bold; - background-color: #f5f5f5; - border: 1px solid #d8d8d8; - border-radius: 6px; - box-shadow: 3px 3px 4px 0 #808080; + padding: 5px 0 10px 0; + margin-right: 5px; + margin-bottom: 20px; + font-size: 14px; + font-weight: bold; + background-color: #f5f5f5; + border: 1px solid #d8d8d8; + border-radius: 6px; + box-shadow: 3px 3px 4px 0 #808080; - .breadcrumb { - display: inline-block; - padding-bottom: 0; - padding-left: 0; - padding-right: 0; - margin-bottom: 0; - margin-left: 10px; - } - - .dropdown { - display: inline-block; - margin-right: 0; - paddding-right: 0; - - .toggle, .toggle:visited, .toggle:hover, .toggle:active { - color: @black; + .breadcrumb { + display: inline-block; + padding-bottom: 0; + padding-left: 0; + padding-right: 0; + margin-bottom: 0; + margin-left: 10px; } - li a.active { - color: @grey; + .dropdown { + display: inline-block; + margin-right: 0; + paddding-right: 0; + + .toggle, .toggle:visited, .toggle:hover, .toggle:active { + color: @black; + } + + li a.active { + color: @grey; + } + + .crumb-icon { + font-size: 12px; + } } - - .crumb-icon { - font-size: 12px; - } - - } - } .actions .dropdown { - display: inline-block; + display: inline-block; } /* Display drop-down menus on hover. Remove margin between toggle link and menu, allowing smooth mouse movement between toggle and menu http://stackoverflow.com/questions/8878033/how-to-make-twitter-bootstrap-menu-dropdown-on-hover-rather-than-click - */ +*/ + .dropdown-toggle:hover .dropdown-menu, .dropdown:hover .dropdown-menu { display: block; } @@ -797,6 +796,7 @@ select.page-size { .dropdown-menu { margin-top: 0; + z-index: 200; } /* end */ diff --git a/awx/ui/static/lib/ansible/Socket.js b/awx/ui/static/lib/ansible/Socket.js index 3d84c3946e..d709960a74 100644 --- a/awx/ui/static/lib/ansible/Socket.js +++ b/awx/ui/static/lib/ansible/Socket.js @@ -120,7 +120,7 @@ angular.module('SocketIO', ['AuthService', 'Utilities']) self.scope.$apply(function() { self.scope.socketStatus = 'error'; self.scope.$emit('socketStatusChange'); - }); + }); }); } else { diff --git a/awx/ui/static/lib/ansible/generator-helpers.js b/awx/ui/static/lib/ansible/generator-helpers.js index 86c6f70199..dc135fc0cc 100644 --- a/awx/ui/static/lib/ansible/generator-helpers.js +++ b/awx/ui/static/lib/ansible/generator-helpers.js @@ -728,7 +728,7 @@ angular.module('GeneratorHelpers', []) if (includeSize) { html += "
\n"; } @@ -737,8 +737,7 @@ angular.module('GeneratorHelpers', []) html += "
\n"; html += "