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 #16019: Close button in Generic Method tab is not working #1125

Merged
merged 1 commit into from
Dec 6, 2019
Merged

Fixes #16019: Close button in Generic Method tab is not working #1125

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions builder/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ body > .container-fluid > .row > div {
}
.show-methods .col-techniques > .row{
transform: translateX(-50px);
pointer-events: none;
}
.dndPlaceholder{
margin: 10px 0;
Expand Down
10 changes: 5 additions & 5 deletions builder/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h1>You are not authenticated in ncf-builder</h1>
<div class="col-xl-4 col-5 col-techniques" ng-click="toggleDisplay(true)">
<div class="row flex-column">
<div class="col-auto">
<div class="row" ng-if="ui.showTechniques">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was used to prevent the user from clicking on the "Import" button when the left menu is folded. We shouldn't remove it, or find another workaround for this bug

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed by adding a css pointer-events, that disable click events https://css-tricks.com/almanac/properties/p/pointer-events/

<div class="row">
<div class="col">
<h3 class="title">Techniques</h3>
</div>
Expand Down Expand Up @@ -210,14 +210,14 @@ <h3 class="title">Techniques</h3>
</div>
</div>
</div>
<div class="col no-technique" ng-if="!selectedTechnique">
<div class="col no-technique" ng-show="!selectedTechnique">
<h1>Technique editor</h1>
<p>Create a new technique or edit one from the list on the left.</p>
<p>Define target configuration using the generic methods from the list on the right as building blocks.</p>
<button class="btn btn-success btn-lg" ng-click="newTechnique()" role="button">Create Technique <i class="fas fa-plus-circle"></i></button>
</div>

<div class="col col-technique" ng-if="selectedTechnique">
<div class="col col-technique" ng-show="selectedTechnique">
<div class="row flex-column no-gutters">
<div class="col-auto main-header">
<div class="row no-margin">
Expand Down Expand Up @@ -610,15 +610,15 @@ <h5>
</div>
</div>
</div>
<div class="col-xl-4 col-5 col-methods" ng-click="toggleDisplay(false)" ng-if="selectedTechnique">
<div class="col-xl-4 col-5 col-methods" ng-click="toggleDisplay(false)" ng-show="selectedTechnique">
<div class="row flex-column">
<div class="col-auto">
<div class="row">
<div class="col">
<h3 class="title">Generic Methods</h3>
</div>
<div class="col-auto">
<button class="btn btn-sm btn-outline-secondary">Close</button>
<button class="btn btn-sm btn-outline-secondary" ng-click="toggleDisplay(true); ; $event.stopPropagation();">Close</button>
</div>
<div class="w-100"></div>
<div class="col input-group input-group-sm">
Expand Down