Skip to content

Commit 0db814b

Browse files
simeonoffdesig9steinadrianptrv
authored
refactor(styles): add fixes and improvements to samples (#3981)
Co-authored-by: desig9stein <mspopovv@gmail.com> Co-authored-by: Adrian Petrov <adrian.ptrv1@gmail.com>
1 parent 1bf77ad commit 0db814b

37 files changed

Lines changed: 351 additions & 850 deletions

File tree

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"file-saver": "^2.0.2",
7474
"fuse.js": "^7.1.0",
7575
"hammerjs": "^2.0.8",
76-
"igniteui-angular": "^22.0.0-beta.2",
76+
"igniteui-angular": "^22.0.0-beta.4",
7777
"igniteui-angular-charts": "^22.0.0-alpha.0",
7878
"igniteui-angular-core": "^22.0.0-alpha.0",
7979
"igniteui-angular-extras": "^22.0.0-beta.2",
@@ -113,8 +113,8 @@
113113
"@angular/compiler": "^22.0.0"
114114
},
115115
"igniteui-angular-extras": {
116-
"igniteui-angular": "^22.0.0-beta.2",
117-
"@infragistics/igniteui-angular": "^22.0.0-beta.2",
116+
"igniteui-angular": "^22.0.0-beta.4",
117+
"@infragistics/igniteui-angular": "^22.0.0-beta.4",
118118
"igniteui-angular-core": "^22.0.0-alpha.0",
119119
"igniteui-angular-charts": "^22.0.0-alpha.0",
120120
"@angular/core": "^22.0.0",

projects/app-crm/src/app/grid-crm/grid-crm.component.html

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,55 @@
77
<igx-grid-toolbar-exporter></igx-grid-toolbar-exporter>
88
</igx-grid-toolbar-actions>
99
<igx-grid-toolbar-title>
10-
<div class="crm-toolbar-template">
11-
<div class="crm-sample-toolbar__title">
12-
<span class="logo-propeller">
13-
<img width="28px" height="28px" src="assets/images/grid-crm/propeller-logo.svg" class="animated-fan" />
14-
</span>
15-
<span class="crm-sample-toolbar__ellipsis">Business Propeller</span>
16-
</div>
17-
<div class="sample-flex-container">
1810
<igx-input-group type="search">
1911
<igx-prefix>
2012
@if (searchText.length === 0) {
21-
<igx-icon class="prefixIcon">search</igx-icon>
13+
<igx-icon>search</igx-icon>
2214
}
2315
@if (searchText.length > 0) {
24-
<igx-icon class="prefixIcon" (click)="clearSearch()">clear
25-
</igx-icon>
16+
<igx-icon (click)="clearSearch()">clear</igx-icon>
2617
}
2718
</igx-prefix>
2819

29-
<input #search1 name="search" id="search1" class="searchInput" igxInput placeholder="Search" [(ngModel)]="searchText" (ngModelChange)="grid1.findNext(searchText, caseSensitive)" (keydown)="searchKeyDown($event)" />
20+
<input #search1 name="search" id="search1" igxInput placeholder="Search" [(ngModel)]="searchText" (ngModelChange)="grid1.findNext(searchText, caseSensitive)" (keydown)="searchKeyDown($event)" />
3021

3122
@if (searchText.length > 0) {
32-
<igx-suffix>
23+
<igx-suffix class="search-extras">
3324
@if (grid1.lastSearchInfo) {
34-
<div class="resultsText">
25+
<div class="search-extras__inner-container">
3526
@if (grid1.lastSearchInfo.matchInfoCache.length > 0) {
36-
<span>
27+
<span class="search-results">
3728
{{ grid1.lastSearchInfo.activeMatchIndex + 1 }} of {{
3829
grid1.lastSearchInfo.matchInfoCache.length }} results
3930
</span>
4031
}
4132
@if (grid1.lastSearchInfo.matchInfoCache.length === 0) {
42-
<span>
33+
<span class="search-results">
4334
No results
4435
</span>
4536
}
4637
</div>
4738
}
48-
<div class="caseSensitiveButton">
49-
<button igxIconButton="flat" igxRipple [igxRippleCentered]="true" (click)="updateSearch()" [class]="caseSensitive? 'case-sensitive--active' : ''">
50-
<igx-icon class="caseSensitiveIcon" family="material">text_fields</igx-icon>
39+
40+
<div class="search-extras__inner-container">
41+
<button igxIconButton="flat" (click)="updateSearch()" [class]="caseSensitive? 'case-sensitive--active' : 'case-sensitive--inactive'">
42+
<igx-icon family="material">text_fields</igx-icon>
5143
</button>
44+
5245
</div>
53-
<div class="searchButtons">
54-
<button igxIconButton="flat" igxRipple [igxRippleCentered]="true" (click)="grid1.findPrev(searchText, caseSensitive)">
46+
47+
<div class="search-extras__inner-container">
48+
<button igxIconButton="flat" (click)="grid1.findPrev(searchText, caseSensitive)">
5549
<igx-icon family="material">navigate_before</igx-icon>
5650
</button>
57-
<button igxIconButton="flat" igxRipple [igxRippleCentered]="true" (click)="grid1.findNext(searchText, caseSensitive)">
51+
52+
<button igxIconButton="flat" (click)="grid1.findNext(searchText, caseSensitive)">
5853
<igx-icon family="material">navigate_next</igx-icon>
5954
</button>
6055
</div>
6156
</igx-suffix>
6257
}
6358
</igx-input-group>
64-
</div>
65-
</div>
6659
</igx-grid-toolbar-title>
6760
</igx-grid-toolbar>
6861

0 commit comments

Comments
 (0)