External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-25 15:06:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Z-index fix

Browse Source 
Fixed styling conflicts between bootstrap menu and jquery dialog.
This commit is contained in:
Chris Houseknecht
2014-07-08 09:12:59 -04:00
parent 0fc5025636
commit 0cfb666548
5 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/less/ansible-ui.less
View File

@@ -766,7 +766,7 @@ select.page-size {
http://stackoverflow.com/questions/8878033/how-to-make-twitter-bootstrap-menu-dropdown-on-hover-rather-than-click 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 { /* .dropdown-toggle:hover .dropdown-menu, .dropdown:hover .dropdown-menu {
display: block; display: block;
} }
@@ -778,7 +778,7 @@ select.page-size {
margin-top: 0; margin-top: 0;
z-index: 200; z-index: 200;
} }
*/
/* end */ /* end */

16
awx/ui/static/less/jquery-ui-overrides.less
View File

@@ -1,9 +1,9 @@
/********************************************* /*********************************************
* Copyright (c) 2014 AnsibleWorks, Inc. * Copyright (c) 2014 AnsibleWorks, Inc.
* *
* jquery-ui-overrides.less * jquery-ui-overrides.less
* *
* Additions to the custom-theme to make things * Additions to the custom-theme to make things
* look closer to Twitter Bootstrap * look closer to Twitter Bootstrap
* *
*/ */
@@ -15,7 +15,7 @@ table.ui-datepicker-calendar {
/* Modal dialog */ /* Modal dialog */
.ui-dialog-title { .ui-dialog-title {
font-size: 22px; font-size: 22px;
color: @blue; color: @blue;
font-weight: bold; font-weight: bold;
@@ -90,8 +90,8 @@ table.ui-datepicker-calendar {
} }
.ui-widget-content { .ui-widget-content {
a, a,
a:visited, a:visited,
a:active { a:active {
color: @blue; color: @blue;
text-decoration: none; text-decoration: none;
@@ -124,3 +124,7 @@ table.ui-datepicker-calendar {
.ui-spinner a.ui-spinner-button { .ui-spinner a.ui-spinner-button {
border-left: 1px solid #A6C9E2; border-left: 1px solid #A6C9E2;
} }
.ui-front {
z-index: 1100;
}

1
awx/ui/static/less/main-layout.less
View File

@@ -62,6 +62,7 @@ body {
#account-submenu { #account-submenu {
margin-right: 5px; margin-right: 5px;
height: 140px; /* shouldn't need this, but for some reason we do */
} }
@media (max-width: 1075px) { @media (max-width: 1075px) {

14
awx/ui/static/partials/job_detail.html
View File

@@ -226,7 +226,7 @@
<div id="hosts-summary-table" class="table-detail" lr-infinite-scroll="hostSummariesScrollDown" scroll-threshold="10" time-threshold="500"> <div id="hosts-summary-table" class="table-detail" lr-infinite-scroll="hostSummariesScrollDown" scroll-threshold="10" time-threshold="500">
<div class="row" ng-repeat="host in summaryList = (hosts | filter:{ status : searchAllStatus}) track by $index" id="{{ host.id }}"> <div class="row" ng-repeat="host in summaryList = (hosts | filter:{ status : searchAllStatus}) track by $index" id="{{ host.id }}">
<div class="name col-lg-6 col-md-6 col-sm-6 col-xs-6"> <div class="name col-lg-6 col-md-6 col-sm-6 col-xs-6">
<a href="" ng-click="hostEventsViewer(host.id, host.name)" aw-tool-tip="View all events for this host" <a href="" ng-click="hostEventsViewer(host.id, host.name)" aw-tool-tip="View all events for this host"
data-placement="top">{{ host.name }}</a> data-placement="top">{{ host.name }}</a>
</div> </div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 badge-column"> <div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 badge-column">
@@ -257,12 +257,8 @@
</div><!-- col-md-5 --> </div><!-- col-md-5 -->
</div> </div>
<div id="job-detail-footer" class="footer-row"></div>
</div>
<div ng-include="'/static/partials/eventviewer.html'"></div> <div id="host-events-modal-dialog" style="display:none;">
<div id="host-events-modal-dialog">
<form class="form-inline"> <form class="form-inline">
<div class="form-group"> <div class="form-group">
<label>Search</label> <label>Search</label>
@@ -288,6 +284,12 @@
<div class="col-md-2">{{ event.msg }}</div> <div class="col-md-2">{{ event.msg }}</div>
</div> </div>
</div> </div>
<div id="job-detail-footer" class="footer-row"></div>
</div>
<div ng-include="'/static/partials/eventviewer.html'"></div>
</div> </div>
</div> </div>

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

@@ -232,7 +232,7 @@
<li><a href="#/login" id="main_login_link" ng-show="!current_user.username">Login</a></li> <li><a href="#/login" id="main_login_link" ng-show="!current_user.username">Login</a></li>
<li class="dropdown" ng-show="current_user.username"> <li class="dropdown" ng-show="current_user.username">
<a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a> <a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a>
<ul class="dropdown-menu" role="menu" id="account-submenu"> <ul class="dropdown-menu" id="account-submenu">
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li> <li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li> <li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li> <li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>