zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-05 05:51:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the spacing issue between the bottom of the search bar and the top of the table. There should now be 20px between the two.

Browse Source
This commit is contained in:
Michael Abashian
2016-01-26 16:02:35 -05:00
parent 65e40ff433
commit 2012e75160
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -905,7 +905,6 @@ input[type="checkbox"].checkbox-no-label {
/* Display list actions next to search widget */ /* Display list actions next to search widget */
.list-actions { .list-actions {
text-align: right; text-align: right;
margin-bottom: 10px;
button { button {
margin-left: 4px; margin-left: 4px;

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

@@ -263,3 +263,11 @@ table, tbody {
background-color: @list-actn-bg-hov !important; background-color: @list-actn-bg-hov !important;
color: @list-actn-icn-hov; color: @list-actn-icn-hov;
} }
.List-searchWidget {
height: 34px;
}
.List-searchRow {
margin-bottom: 20px;
}

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -1653,7 +1653,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
} }
//html += "<div class=\"well\">\n"; //html += "<div class=\"well\">\n";
html += "<div class=\"row\">\n"; html += "<div class=\"row List-searchRow\">\n";
html += SearchWidget({ html += SearchWidget({
iterator: collection.iterator, iterator: collection.iterator,

4
awx/ui/client/src/shared/generator-helpers.js
View File

@@ -662,8 +662,8 @@ angular.module('GeneratorHelpers', [systemStatus.name])
modifier = (i === 1) ? '' : i; modifier = (i === 1) ? '' : i;
if (includeSize) { if (includeSize) {
html += "<div class=\""; html += "<div class=\"List-searchWidget ";
html += (size) ? size : "col-lg-4 col-md-6 col-sm-8 col-xs-9"; html += (size) ? size : "col-lg-4 col-md-8 col-sm-12 col-xs-12";
html += "\" id=\"search-widget-container" + modifier + "\">\n"; html += "\" id=\"search-widget-container" + modifier + "\">\n";
} }

2
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -348,7 +348,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
if (options.showSearch=== undefined || options.showSearch === true) { if (options.showSearch=== undefined || options.showSearch === true) {
// Only show the search bar if we are loading results or if we have at least 1 base result // Only show the search bar if we are loading results or if we have at least 1 base result
html += "<div class=\"row\" ng-show=\"" + list.iterator + "Loading == true || " + list.iterator + "_active_search == true || (" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows > 0)\">\n"; html += "<div class=\"row List-searchRow\" ng-show=\"" + list.iterator + "Loading == true || " + list.iterator + "_active_search == true || (" + list.iterator + "Loading == false && " + list.iterator + "_active_search == false && " + list.iterator + "_total_rows > 0)\">\n";
if (options.searchSize) { if (options.searchSize) {
html += SearchWidget({ html += SearchWidget({
iterator: list.iterator, iterator: list.iterator,