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

Change criteria selection labels #4815

Merged
merged 1 commit into from
Apr 11, 2019
Merged

Change criteria selection labels #4815

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
5 changes: 0 additions & 5 deletions contribs/gmf/examples/filterselector.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@ gmf-filterselector {
text-decoration: none;
}

.ngeo-filter-condition-criteria-header {
color: #999999;
padding: 0.3rem 2rem;
}

.ngeo-filter-condition-criteria {
opacity: 0;
}
Expand Down
5 changes: 0 additions & 5 deletions contribs/gmf/src/controllers/desktop.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,6 @@ gmf-objecteditingtools {
text-decoration: none;
}

.ngeo-filter-condition-criteria-header {
color: $color-light;
padding: $micro-app-margin calc(2 * #{$app-margin});
}

.ngeo-filter-condition-criteria {
opacity: 0;
}
Expand Down
3 changes: 0 additions & 3 deletions src/filter/component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<span class="fa fa-cog"></span>
</button>
<ul class="dropdown-menu">
<li
class="ngeo-filter-condition-criteria-header"
translate>Criteria taken into account</li>
<li ng-repeat="condition in ::$ctrl.conditions">
<a
href
Expand Down
6 changes: 3 additions & 3 deletions src/filter/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,15 @@ class FilterController {
*/
this.conditions = [
{
text: gettextCatalog.getString('All'),
text: gettextCatalog.getString('Match all criteria'),
value: ngeoFilterCondition.AND
},
{
text: gettextCatalog.getString('At least one'),
text: gettextCatalog.getString('Match at least one criterion'),
value: ngeoFilterCondition.OR
},
{
text: gettextCatalog.getString('None'),
text: gettextCatalog.getString('Does not match any criterion'),
value: ngeoFilterCondition.NOT
}
];
Expand Down