Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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/CalendarConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export class CalendarConfigGenerator implements IConfigGenerator {

configs.push(new Config({
component: 'CalendarStylingSampleComponent',
additionalFiles: ["/src/app/scheduling/calendar/calendar-styling-sample/layout.scss"],
appConfig: BaseAppConfig,
shortenComponentPathBy: "/scheduling/calendar/"
}));
Expand Down
1 change: 0 additions & 1 deletion live-editing/configs/CheckboxConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ export class CheckboxConfigGenerator implements IConfigGenerator {
// checkbox styling
configs.push(new Config({
component: 'CheckboxStylingComponent',
additionalFiles: ["/src/app/data-entries/checkbox/checkbox-styling/layout.scss"],
appConfig: BaseAppConfig,
shortenComponentPathBy: "/data-entries/checkbox/"
}));
Expand Down
2 changes: 1 addition & 1 deletion live-editing/configs/InputGroupConfigGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export class InputGroupConfigGenerator implements IConfigGenerator {

configs.push(new Config({
component: 'InputGroupStyleComponent',
additionalFiles: ["/src/app/data-entries/input-group/base-input.component.ts", "/src/app/data-entries/input-group/input-group-styling/layout.scss"],
additionalFiles: ["/src/app/data-entries/input-group/base-input.component.ts"],
appConfig: BaseAppConfig,
shortenComponentPathBy: "/data-entries/"
}));
Expand Down
32 changes: 16 additions & 16 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
"file-saver": "^2.0.2",
"fuse.js": "^7.1.0",
"hammerjs": "^2.0.8",
"igniteui-angular": "22.1.0-beta.1",
"igniteui-angular": "22.1.0-beta.4",
"igniteui-angular-charts": "^22.0.0",
"igniteui-angular-core": "^22.0.0",
"igniteui-angular-extras": "22.1.0-beta.1",
"igniteui-angular-i18n": "22.1.0-beta.1",
"igniteui-angular-extras": "22.1.0-beta.4",
"igniteui-angular-i18n": "22.1.0-beta.4",
"igniteui-dockmanager": "^1.17.0",
"igniteui-grid-lite": "0.9.0",
"igniteui-i18n-resources": "^1.0.4",
Expand Down Expand Up @@ -112,7 +112,7 @@
"@angular/compiler": "^22.0.0"
},
"igniteui-angular-extras": {
"igniteui-angular": "22.1.0-beta.1",
"igniteui-angular": "22.1.0-beta.4",
"@infragistics/igniteui-angular": "^22.0.0",
"igniteui-angular-core": "^22.0.0",
"igniteui-angular-charts": "^22.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { FloatingPanesService } from '../../services/floating-panes.service';
import { DockSlotComponent } from './dock-slot/dock-slot.component';
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
import { IColumnSelectionEventArgs, IgxCellTemplateDirective, IgxColumnComponent } from 'igniteui-angular/grids/core';
import { IgxDividerDirective } from 'igniteui-angular/directives';
import { IgxDividerComponent } from 'igniteui-angular/directives';
import { IgxBadgeComponent } from 'igniteui-angular/badge';
import { NgClass, DecimalPipe, TitleCasePipe, CurrencyPipe } from '@angular/common';
import { debounceTime } from 'rxjs/operators';
Expand Down Expand Up @@ -57,7 +57,7 @@ export class HastDuplicateLayouts implements PipeTransform {
templateUrl: './data-analysis-dock-manager.component.html',
styleUrls: ['./data-analysis-dock-manager.component.scss'],
providers: [FloatingPanesService],
imports: [IgxGridComponent, IgxConditionalFormattingDirective, IgxChartIntegrationDirective, IgxContextMenuDirective, IgxBadgeComponent, IgxColumnComponent, IgxCellTemplateDirective, NgClass, IgxDividerDirective, DockSlotComponent, DecimalPipe, TitleCasePipe, CurrencyPipe, FilterTypePipe, HastDuplicateLayouts],
imports: [IgxGridComponent, IgxConditionalFormattingDirective, IgxChartIntegrationDirective, IgxContextMenuDirective, IgxBadgeComponent, IgxColumnComponent, IgxCellTemplateDirective, NgClass, IgxDividerComponent, DockSlotComponent, DecimalPipe, TitleCasePipe, CurrencyPipe, FilterTypePipe, HastDuplicateLayouts],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class DataAnalysisDockManagerComponent implements OnInit, AfterViewInit {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { IgxColumnComponent, IgxGridDetailTemplateDirective } from 'igniteui-ang
import { IgxGridComponent } from 'igniteui-angular/grids/grid';
import { IgxTabContentComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabItemComponent, IgxTabsComponent } from 'igniteui-angular/tabs';
import { IgxAvatarComponent } from 'igniteui-angular/avatar';
import { IgxDividerDirective } from 'igniteui-angular/directives';
import { IgxDividerComponent } from 'igniteui-angular/directives';
import { IgxLegendComponent, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartModule } from 'igniteui-angular-charts';
import { employeesData } from '../../data/employeesData';
import { IgxPreventDocumentScrollDirective } from '../../../../../../src/app/directives/prevent-scroll.directive';
Expand All @@ -13,7 +13,7 @@ import { IgxPreventDocumentScrollDirective } from '../../../../../../src/app/dir
selector: 'app-grid-master-detail',
styleUrls: ['./grid-master-detail.component.scss'],
templateUrl: 'grid-master-detail.component.html',
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxColumnComponent, IgxGridDetailTemplateDirective, IgxTabsComponent, IgxTabItemComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabContentComponent, IgxAvatarComponent, IgxDividerDirective, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartModule]
imports: [IgxGridComponent, IgxPreventDocumentScrollDirective, IgxColumnComponent, IgxGridDetailTemplateDirective, IgxTabsComponent, IgxTabItemComponent, IgxTabHeaderComponent, IgxTabHeaderLabelDirective, IgxTabContentComponent, IgxAvatarComponent, IgxDividerComponent, IgxPieChartCoreModule, IgxLegendModule, IgxCategoryChartModule]
})

export class GridMasterDetailSampleComponent {
Expand Down
67 changes: 37 additions & 30 deletions src/app/data-display/chip/chip-styling/chip-styling.component.scss
Original file line number Diff line number Diff line change
@@ -1,49 +1,56 @@
@use "layout.scss";
@use "igniteui-angular/theming" as *;

// CSS variables approach
igx-chips-area {
--ig-size: var(--ig-size-medium);

gap: rem(8px);
}

igx-icon {
--ig-icon-size: #{rem(13px)};
}

// CSS variables approach
igx-chip {
--text-color: #fff;
--hover-text-color: #fff;
--focus-text-color: #fff;
--border-radius: #{rem(5px)};
}

.xcom {
--background: #000;
--hover-background: #000;
--focus-background: #323232;
&.xcom {
--background: #000;
--hover-background: #000;
--focus-background: #323232;
}

&.youtube {
--background: #cd201f;
--hover-background: #cd201f;
--focus-background: #9f1717;
}

&.facebook {
--background: #3b5999;
--hover-background: #3b5999;
--focus-background: #2c4378;
}

&.linkedin {
--background: #55acee;
--hover-background: #55acee;
--focus-background: #4682af;
}
}

.youtube {
--background: #cd201f;
--hover-background: #cd201f;
--focus-background: #9f1717;
}

.facebook {
--background: #3b5999;
--hover-background: #3b5999;
--focus-background: #2c4378;
}

.linkedin {
--background: #55acee;
--hover-background: #55acee;
--focus-background: #4682af;
}

// Sass theme approach

//Sass theme approach
// $custom-chip-theme: chip-theme(
// $background: #cd201f,
// $text-color: #fff,
// $hover-background: #cd201f,
// $focus-background: #9f1717,
// $hover-background: #fff,
// $focus-background: #fff,
// $border-radius: rem(5px)
// );

//
// :host {
// @include tokens($custom-chip-theme);
// }
22 changes: 3 additions & 19 deletions src/app/data-display/chip/chip-styling/layout.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
@use "igniteui-angular/theming" as *;

:host {
::ng-deep {
.igx-chip__item {
height: rem(20px);
font-size: rem(12px);
}
}
display: grid;
place-content: center;
height: 100%;
}

igx-chip {
margin-right: rem(8px);
margin-top: rem(20px);
}

igx-chips-area {
margin-left: rem(20px);
}

igx-icon {
--size: #{rem(12px)};
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<igx-checkbox id="checkbox-1" [disableRipple]="true" [checked]="true">
<igx-checkbox id="checkbox-1" disableRipple [checked]="true">
Styled checkbox
</igx-checkbox>
</igx-checkbox>
Original file line number Diff line number Diff line change
@@ -1,37 +1,39 @@
@use "layout.scss";
@use "sass:map";
@use "igniteui-angular/theming" as *;

// CSS variables approach
:host {
--ig-font-family: Arial, Helvetica, sans-serif;
--ig-subtitle-1-font-size: #{rem(14px)};

igx-checkbox {
--tick-color: #0064d9;
--tick-color-hover: #e3f0ff;
--tick-width: 2;
--fill-color: transparent;
--fill-color-hover: #e3f0ff;
--label-color: #131e29;
--focus-outline-color: #0032a5;
--border-radius: #{rem(4px)};
display: block;
padding: rem(18px) 0 0 rem(18px);
}

igx-checkbox:hover {
--empty-fill-color: #e3f0ff;
// CSS variables approach
.igx-checkbox {
--tick-color: black;
--tick-color-hover: black;
--tick-width: 4;
--fill-color: orange;
--fill-color-hover: oklch(from var(--fill-color) calc(l * 0.9) c h);
--label-color: black;
--empty-color: orange;
--border-width: #{rem(3px)};
--border-radius: #{rem(3px)};
}

// Sass theme approach

// $custom-checkbox-theme: checkbox-theme(
// $tick-color: #0064d9,
// $tick-width: 2,
// $tick-color-hover: #e3f0ff,
// $fill-color: transparent,
// $fill-color-hover: #e3f0ff,
// $label-color: #131e29,
// $focus-outline-color: #0032a5,
// $empty-color: #131e29,
// $border-radius: rem(4px),
// $tick-color: black,
// $tick-color-hover: black,
// $tick-width: 4,
// $fill-color: orange,
// $fill-color-hover: oklch(from var(--fill-color) calc(l * 0.9) c h),
// $label-color: black,
// $empty-color: orange,
// $border-radius: rem(3px),
// );

// :host {
//
// :host ::ng-deep {
// @include tokens($custom-checkbox-theme);
// }
45 changes: 0 additions & 45 deletions src/app/data-entries/checkbox/checkbox-styling/layout.scss

This file was deleted.

Loading