Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -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
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;
max-width: rem(300px);
}
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