Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #18871: Directive filter display is broken on Safari #3488

Merged
merged 1 commit into from
Jan 28, 2021
Merged

Fixes #18871: Directive filter display is broken on Safari #3488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions ...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/directiveManagement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@ <h1>Directives</h1>

<div id="directiveFilter" ng-controller="filterTagCtrl" ng-cloak>
<div class="header-filter">
<div class="input-group search-addon main-filter">
<div class="input-group-btn">
<button type="button" class="btn btn-sm btn-default" aria-label="Bold" onclick="toggleTree('#activeTechniquesTree', this);">
<span class="fa fa-folder fa-folder-open"></span>
</button>
</div>
<input class="form-control input-sm" placeholder="Filter" id="treeSearch" ng-model="searchStr" ng-keydown="refuseEnter($event)" ng-keyup="searchTree('#activeTechniquesTree')">
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm" aria-label="Bold" ng-click="clearSearchFieldTree('#activeTechniquesTree');" >
<span class="fa fa-times"></span>
</button>
<div class="filter-auto-width">
<div class="input-group search-addon main-filter">
<div class="input-group-btn">
<button type="button" class="btn btn-sm btn-default" aria-label="Bold" onclick="toggleTree('#activeTechniquesTree', this);">
<span class="fa fa-folder fa-folder-open"></span>
</button>
</div>
<input class="form-control input-sm" placeholder="Filter" id="treeSearch" ng-model="searchStr" ng-keydown="refuseEnter($event)" ng-keyup="searchTree('#activeTechniquesTree')">
<div class="input-group-btn">
<button type="button" class="btn btn-default btn-sm" aria-label="Bold" ng-click="clearSearchFieldTree('#activeTechniquesTree');" >
<span class="fa fa-times"></span>
</button>
</div>
</div>
</div>
<button class="btn btn-default more-filters" onclick="$('.filters-container').toggleClass('hidden');"></button>
Expand Down
4 changes: 4 additions & 0 deletions webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-template.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,10 @@
margin: 10px 0;
display: flex;
}
.rudder-template .template-sidebar .sidebar-header .header-filter .filter-auto-width{
flex: 1;
display: flex;
}
.rudder-template .template-sidebar .sidebar-header .header-filter .main-filter{
flex: 1;
margin-bottom: 0;
Expand Down