Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e7f767e
refactor(button-group): update styles and simplify layout structure a…
desig9stein Aug 25, 2026
ae7231c
fix(button-group): remove unused additionalFiles property from stylin…
desig9stein Aug 25, 2026
09bca81
fix(button-group): update disabled state and alignment styles
desig9stein Aug 26, 2026
e8edca1
fix(button-group): update labels styling
Hristo313 Aug 27, 2026
e04d647
fix(button-group): update labels styling
Hristo313 Aug 27, 2026
244cf8c
Merge branch 'vnext' into mpopov/update-samples-styles
Hristo313 Aug 29, 2026
95d8242
fix(samples): update styling content
Hristo313 Aug 31, 2026
20637f1
fix(button-group): update samples to use bootstrap
Hristo313 Sep 8, 2026
797d37b
fix(badge): update outlined sample css
Hristo313 Sep 10, 2026
19dc379
Merge branch 'vnext' into mpopov/update-samples-styles
Hristo313 Sep 18, 2026
08c4d5c
fix(button): remove hardcoded bootstrap theme
IMinchev64 Sep 23, 2026
a40bf7d
fix(*): change style layer order so Tailwind Preflight does not overr…
IMinchev64 Sep 23, 2026
0ff3766
fix(button-group): remove hardcoded bootstrap theme
IMinchev64 Sep 23, 2026
bc50495
fix(button-group): interaction states sample dark theme
IMinchev64 Sep 23, 2026
292f379
fix(button-group): states sample dark theme
IMinchev64 Sep 23, 2026
8a3a031
fix(switch): remove hardcoded bootstrap theme
IMinchev64 Sep 23, 2026
db35ed7
fix(switch): change overview sample h6 to secondary color
IMinchev64 Sep 23, 2026
69ba86b
Merge branch 'vnext' into mpopov/update-samples-styles
ChronosSF Sep 23, 2026
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
1 change: 0 additions & 1 deletion live-editing/configs/ButtonGroupConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ export class ButtonGroupConfigGenerator implements IConfigGenerator {
// button group styling
configs.push(new Config({
component: 'ButtonGroupStylingComponent',
additionalFiles: ["/src/app/data-entries/buttonGroup/button-group-styling/layout.scss"],
appConfig: BaseAppConfig,
shortenComponentPathBy: "/data-entries/buttonGroup/"
}));
Expand Down
8 changes: 6 additions & 2 deletions src/app/data-display/badge/badge-dot/badge-dot.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@use "igniteui-theming/sass/typography" as *;

:host {
--sample-accent: #0057a9;
--sample-accent: var(--ig-primary-800);

display: grid;
grid-auto-flow: column;
Expand All @@ -21,6 +21,10 @@ igx-badge {
translate: -50% -50%;
}

igx-avatar.icon-anchor {
--ig-avatar-background: var(--ig-gray-300);
}

$anchors: icon, avatar;

@each $anchor in $anchors {
Expand Down Expand Up @@ -70,7 +74,7 @@ $anchors: icon, avatar;
}

.unread {
color: var(--sample-accent);
color: var(--ig-gray-900);
font-weight: 600;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ span {

grid-row: 2;
text-align: center;
color: var(--ig-gray-700);
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: rem(13px);
font-weight: 400;
line-height: rem(20px);
letter-spacing: rem(0.3px);
}

igx-badge:last-of-type {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
place-content: center;
place-items: center;
column-gap: rem(60px);
min-height: 7rem;
min-height: 100vh;
padding-inline: rem(16px);

::ng-deep {
Expand Down Expand Up @@ -55,7 +55,7 @@ igx-stepper {
--ig-stepper-step-separator-style: dashed;
--ig-stepper-step-separator-color: var(--ig-gray-400);

max-width: rem(316px);
inline-size: rem(320px);
}

span[igxStepIndicator] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@

span {
justify-self: end;
color: var(--ig-gray-700);
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: rem(13px);
font-weight: 400;
line-height: rem(20px);
letter-spacing: rem(0.3px);

@include type-style("body-2") {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@

span {
justify-self: end;
color: var(--ig-gray-700);
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: rem(13px);
font-weight: 400;
line-height: rem(20px);
letter-spacing: rem(0.3px);

@include type-style("body-2") {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ igx-avatar {
span {
grid-row: 2;
text-align: center;
color: var(--ig-gray-700);
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: rem(13px);
font-weight: 400;
line-height: rem(20px);
letter-spacing: rem(0.3px);

@include type-style("caption") {
margin: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,12 @@ igx-avatar {
span {
grid-row: 2;
text-align: center;
color: var(--ig-gray-700);
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: rem(13px);
font-weight: 400;
line-height: rem(20px);
letter-spacing: rem(0.3px);

@include type-style("body-2") {
margin: 0;
Expand Down
61 changes: 0 additions & 61 deletions src/app/data-entries/button/_bootstrap-button-theme.scss

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-sample {
display: flex;
padding: 2.5rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-sample {
display: flex;
padding: 2.5rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-sample {
display: flex;
padding: 2rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-sample {
display: flex;
padding: 2.5rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '../_bootstrap-button-theme';
@use "igniteui-angular/theming" as *;

.button-container {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-container {
display: flex;
align-items: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-sample {
display: flex;
padding: 2.5rem;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.form {
display: flex;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

:host {
display: flex;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use '../_bootstrap-button-theme';

.button-container {
display: flex;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<article class="button-group-alignment">
<div class="sample-layout">
@for (alignment of alignments; track alignment.value) {
<div class="button-group-alignment-item">
<div class="sample-inner-layout">
<span>{{ alignment.label }}</span>
<igx-buttongroup [alignment]="alignment.value">
@for (city of cities; track city) {
Expand All @@ -9,4 +9,4 @@
</igx-buttongroup>
</div>
}
</article>
</div>
Original file line number Diff line number Diff line change
@@ -1,35 +1,36 @@
.button-group-alignment {
display: flex;
align-items: flex-start;
justify-content: center;
gap: 60px;
padding: 24px;
@use 'igniteui-theming' as *;

:host {
display: grid;
place-items: center;
height: 100vh;
}

.button-group-alignment-item {
.sample-layout {
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
gap: 16px;
gap: rem(32px);
align-items: start;
justify-content: center;
flex-wrap: wrap;
}

.button-group-alignment-item igx-buttongroup {
width: 240px;
.sample-inner-layout {
display: grid;
gap: rem(8px);
align-items: start;
}

.button-group-alignment-item:first-child igx-buttongroup {
width: 320px;
igx-buttongroup {
min-width: rem(280px);
}

.button-group-alignment-item span {
width: 100%;
text-align: center;
color: #556c86;
span {
color: var(--ig-gray-600);
font-family: "Aktiv Grotesk", sans-serif;
font-size: 13px;
font-size: rem(13px);
font-weight: 400;
font-style: normal;
line-height: 20px;
letter-spacing: 0.3px;
line-height: rem(20px);
letter-spacing: rem(0.3px);
margin: rem(8px);
text-align: center;
}
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<article class="button-group-custom-toggle">
<igx-buttongroup selectionMode="multi" [values]="bordersButtons"></igx-buttongroup>
</article>
<igx-buttongroup selectionMode="multi" [values]="bordersButtons"></igx-buttongroup>
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
.button-group-custom-toggle {
display: flex;
justify-content: center;
align-items: center;
min-height: 7rem;
@use 'igniteui-theming' as *;

:host {
display: grid;
place-items: center;
height: 100vh;
}

igx-buttongroup {
display: inline-block;
width: 300px;
inline-size: rem(180px);
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<article class="button-group-interaction-states">
<div class="button-group-interaction-states-row">
<article class="states-matrix" [style.--state-columns]="states.length">
<header class="states-row">
<span class="row-label"></span>
@for (state of states; track state) {
<span class="column-label">{{ getLabel(state) }}</span>
}
</div>
</header>

@for (row of rows; track row.label) {
<div class="button-group-interaction-states-row">
<section class="states-row">
<span class="row-label">{{ row.label }}</span>
@for (state of states; track state) {
<igx-buttongroup>
<button
igxButton
[igxRipple]="rippleColor"
[selected]="row.selected"
[class]="'state-' + state"
[class.state-selected]="row.selected">
<igx-icon>notifications</igx-icon>
Button
<igx-icon>notifications</igx-icon>
</button>
</igx-buttongroup>
<div class="state-cell">
<span class="cell-label">{{ getLabel(state) }}</span>
<igx-buttongroup>
<button
igxButton
[igxRipple]="rippleColor"
[selected]="row.selected"
[class]="'state-' + state"
[class.state-selected]="row.selected">
<igx-icon>notifications</igx-icon>
Button
<igx-icon>notifications</igx-icon>
</button>
</igx-buttongroup>
</div>
}
</div>
</section>
}
</article>
Loading
Loading