Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Pull request #100: RED-979: Moved reset filters button

Browse Source 
Merge in RED/ui from RED-979 to master

* commit 'e112c7f371ac60919a799dc50ea8979e9ce322dd':
  Moved reset filters button
This commit is contained in:
Timo Bejan 2021-01-18 19:48:35 +01:00
commit 7b71d63f45
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/red-ui/src/app/screens/project-listing-screen/project-listing-screen.component.html
View File

@ -30,6 +30,7 @@
<mat-icon class="icon-right" svgIcon="red:search"></mat-icon> <mat-icon class="icon-right" svgIcon="red:search"></mat-icon>
</div> </div>
</form> </form>
<div class="reset-filters" *ngIf="hasActiveFilters" (click)="resetFilters()" translate="reset-filters"></div>
</div> </div>
<redaction-icon-button <redaction-icon-button
(action)="openAddProjectDialog()" (action)="openAddProjectDialog()"
@ -46,8 +47,6 @@
<span class="all-caps-label"> <span class="all-caps-label">
{{ 'project-listing.table-header.title' | translate: { length: displayedProjects.length || 0 } }} {{ 'project-listing.table-header.title' | translate: { length: displayedProjects.length || 0 } }}
</span> </span>
<div class="reset-filters" *ngIf="hasActiveFilters"><span (click)="resetFilters()" translate="reset-filters"></span></div>
</div> </div>
<div [class.no-data]="noData" class="table-header" redactionSyncWidth="table-item"> <div [class.no-data]="noData" class="table-header" redactionSyncWidth="table-item">

3
apps/red-ui/src/app/screens/project-overview-screen/project-overview-screen.component.html
View File

@ -30,6 +30,7 @@
<mat-icon class="icon-right" svgIcon="red:search"></mat-icon> <mat-icon class="icon-right" svgIcon="red:search"></mat-icon>
</div> </div>
</form> </form>
<div class="reset-filters" *ngIf="hasActiveFilters" (click)="resetFilters()" translate="reset-filters"></div>
</div> </div>
<div class="actions"> <div class="actions">
@ -123,8 +124,6 @@
</span> </span>
<redaction-bulk-actions [selectedFileIds]="selectedFileIds" (reload)="bulkActionPerformed()"></redaction-bulk-actions> <redaction-bulk-actions [selectedFileIds]="selectedFileIds" (reload)="bulkActionPerformed()"></redaction-bulk-actions>
<div class="reset-filters" *ngIf="hasActiveFilters"><span (click)="resetFilters()" translate="reset-filters"></span></div>
</div> </div>
<div class="table-header" redactionSyncWidth="table-item" [class.no-data]="noData"> <div class="table-header" redactionSyncWidth="table-item" [class.no-data]="noData">

10
apps/red-ui/src/assets/styles/red-grid.scss
View File

@ -24,14 +24,4 @@
margin-right: 25px; margin-right: 25px;
} }
} }
.reset-filters {
flex: 1;
text-align: end;
color: $primary;
span {
cursor: pointer;
}
}
} }

6
apps/red-ui/src/assets/styles/red-page-layout.scss
View File

@ -41,6 +41,12 @@ body {
width: 250px; width: 250px;
} }
} }
.reset-filters {
margin-left: 12px;
color: $primary;
cursor: pointer;
}
} }
.actions { .actions {