Skip to content

refactor(button): new button sample including individual type themes (vnext) #3674

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

Merged
merged 5 commits into from
Jun 17, 2025
Merged

refactor(button): new button sample including individual type themes (vnext) #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26994c3
refactor(button): new button sample
adrianptrv Apr 29, 2025
b55032f
refactor(button): new CSS properties
adrianptrv Apr 30, 2025
eded2fe
Merge branch 'vnext' into apetrov/update-button-sample-vnext
simeonoff May 23, 2025
b2d12da
Merge branch 'vnext' into apetrov/update-button-sample-vnext
simeonoff Jun 17, 2025
2598844
deps(igniteui-angular): bump to latest version
simeonoff Jun 17, 2025
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
18 changes: 10 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@
"express": "^4.18.2",
"file-saver": "^2.0.2",
"hammerjs": "^2.0.8",
"igniteui-angular": "20.0.0",
"igniteui-angular": "20.0.2",
"igniteui-angular-charts": "^19.0.1",
"igniteui-angular-core": "^19.0.1",
"igniteui-angular-extras": "^20.0.0",
"igniteui-angular-i18n": "^20.0.0",
"igniteui-angular-i18n": "^20.0.2",
"igniteui-dockmanager": "^1.16.0",
"igniteui-live-editing": "^3.0.3",
"igniteui-webcomponents": "^6.0.1",
Expand Down
23 changes: 16 additions & 7 deletions src/app/data-entries/buttons/buttons-style/buttons-style.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
<div class="buttons-sample">
<div class="button-sample">
<button igxButton="contained" igxRipple="#fdfdfd">Styled Button</button>
</div>
<div class="button-sample">
<button igxButton="contained" [disabled]="'true'" igxRipple>Disabled</button>
</div>
</div>
<div class="button-sample">
<button igxButton="contained" igxRipple>Contained Button</button>
</div>
<div class="button-sample">
<button igxButton="flat" igxRipple>Flat Button</button>
</div>
<div class="button-sample">
<button igxButton="outlined" igxRipple>Outlined Button</button>
</div>
<div class="button-sample">
<button igxButton="fab" igxRipple>Fab Button</button>
</div>
<div class="button-sample">
<button igxButton="contained" [disabled]="'true'">Disabled</button>
</div>
</div>
29 changes: 19 additions & 10 deletions src/app/data-entries/buttons/buttons-style/buttons-style.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
@use "layout.scss";
@use "igniteui-angular/theming" as *;

$custom-button-theme: button-theme(
$foreground: #fdfdfd,
$hover-foreground: #fdfdfd,
$focus-foreground: #fdfdfd,
$background: #345779,
$hover-background: #2e4d6b,
$focus-background: #2e4d6b,
$disabled-foreground: #2e4d6b,
$custom-contained-theme: contained-button-theme(
$background: #348ae0
);

$custom-flat-theme: flat-button-theme(
$foreground: var(--ig-error-800)
);

$custom-outlined-theme: outlined-button-theme(
$foreground: var(--ig-success-500)
);

$custom-fab-theme: fab-button-theme(
$background: #ffc506
);

.button-sample {
@include css-vars($custom-button-theme);
}
@include css-vars($custom-contained-theme);
@include css-vars($custom-flat-theme);
@include css-vars($custom-outlined-theme);
@include css-vars($custom-fab-theme);
};

1 change: 0 additions & 1 deletion src/app/data-entries/input-group/input-group-styling/input-group-styling.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ $custom-input-group: input-group-theme(
$focused-text-color: #174f30,
$idle-text-color: #288a54,
$idle-bottom-line-color: #288a54,
$interim-bottom-line-color: #288a54,
$hover-bottom-line-color: #288a54,
$focused-secondary-color: #174f30,
$box-background: #eeeeee
Expand Down
1 change: 0 additions & 1 deletion ...app/grid/grid-column-hiding-toolbar-style/grid-column-hiding-toolbar-style.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ $dark-input-group: input-group-theme(
$focused-text-color: $yellow,
$idle-text-color: $yellow,
$idle-bottom-line-color: $yellow,
$interim-bottom-line-color: $yellow,
$hover-bottom-line-color: $yellow,
$focused-secondary-color: $gray,
$box-background: $bg
Expand Down
1 change: 0 additions & 1 deletion src/app/grid/grid-editing-style-sample/grid-editing-style-sample.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ $input-theme: input-group-theme(
$idle-text-color: $white,
$idle-bottom-line-color: $white,
$focused-bottom-line-color: $white,
$interim-bottom-line-color: $white,
$hover-bottom-line-color: $white,
$box-background: $blue
);
Expand Down
1 change: 0 additions & 1 deletion ...hical-grid/hierarchical-grid-editing-style/hierarchical-grid-editing-style.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ $input-theme: input-group-theme(
$idle-text-color: $white,
$idle-bottom-line-color: $white,
$focused-bottom-line-color: $white,
$interim-bottom-line-color: $white,
$hover-bottom-line-color: $white,
$box-background: $blue
);
Expand Down
3 changes: 1 addition & 2 deletions src/app/scheduling/daterangepicker/daterangepicker-styling/daterangepicker-styling.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ $custom-input-group-theme: input-group-theme(
$idle-text-color: $text-color,
$focused-text-color: $color-focused,
$idle-bottom-line-color: $purple,
$hover-bottom-line-color: $color-focused,
$interim-bottom-line-color: $color-focused
$hover-bottom-line-color: $color-focused
);

// CALENDAR styling specific overlay component requires outlet -> [overlaySettings]="{ outlet: element }"
Expand Down
1 change: 0 additions & 1 deletion src/app/tree-grid/tree-grid-editing-style/tree-grid-editing-sample.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ $input-theme: input-group-theme(
$idle-text-color: $white,
$idle-bottom-line-color: $white,
$focused-bottom-line-color: $white,
$interim-bottom-line-color: $white,
$hover-bottom-line-color: $white,
$box-background: $blue
);
Expand Down
Loading