Skip to content

Commit f20b897

Browse files
committed
refactor(dock-manager): add typography mixin
1 parent 2e8dfeb commit f20b897

File tree

2 files changed

+37
-21
lines changed

2 files changed

+37
-21
lines changed

projects/igniteui-angular/src/lib/core/styles/components/dock-manager/_dock-manager-theme.scss

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,17 @@
6969

7070
@return extend($theme, (name: 'igc'), keywords($rest));
7171
}
72+
73+
74+
/// Adds typography styles for the dock manager component.
75+
/// @access private
76+
/// @group typography
77+
/// @requires {mixin} igx-type-style
78+
@mixin igx-dock-manager-typography() {
79+
$scope: if(is-root(), ':root', '&');
80+
81+
#{$scope} {
82+
@include css-vars-from-theme((font-family: inherit), 'igc');
83+
}
84+
}
85+

projects/igniteui-angular/src/lib/core/styles/typography/_typography.scss

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,33 @@
1010
@import '../components/button/button-theme';
1111
@import '../components/calendar/calendar-theme';
1212
@import '../components/card/card-theme';
13+
@import '../components/charts/data-chart-theme';
14+
@import '../components/charts/financial-chart-theme';
15+
@import '../components/charts/funnel-chart-theme';
16+
@import '../components/charts/gauge-theme';
17+
@import '../components/charts/graph-theme';
18+
@import '../components/charts/shape-chart-theme';
1319
@import '../components/checkbox/checkbox-theme';
1420
@import '../components/chip/chip-theme';
1521
@import '../components/column-hiding/column-hiding-theme';
22+
@import '../components/date-range-picker/date-range-picker-theme';
1623
@import '../components/dialog/dialog-theme';
24+
@import '../components/dock-manager/dock-manager-theme';
1725
@import '../components/drop-down/drop-down-theme';
18-
@import '../components/date-range-picker/date-range-picker-theme';
1926
@import '../components/expansion-panel/expansion-panel-theme';
2027
@import '../components/grid/excel-filtering-theme';
2128
@import '../components/input/input-group-theme';
29+
@import '../components/list/list-theme';
2230
@import '../components/navbar/navbar-theme';
2331
@import '../components/navdrawer/navdrawer-theme';
24-
@import '../components/list/list-theme';
2532
@import '../components/radio/radio-theme';
26-
@import '../components/snackbar/snackbar-theme';
2733
@import '../components/slider/slider-theme';
34+
@import '../components/snackbar/snackbar-theme';
2835
@import '../components/switch/switch-theme';
2936
@import '../components/tabs/tabs-theme';
3037
@import '../components/time-picker/time-picker-theme';
3138
@import '../components/toast/toast-theme';
3239
@import '../components/tooltip/tooltip-theme';
33-
@import '../components/charts/data-chart-theme';
34-
@import '../components/charts/financial-chart-theme';
35-
@import '../components/charts/graph-theme';
36-
@import '../components/charts/shape-chart-theme';
37-
@import '../components/charts/funnel-chart-theme';
38-
@import '../components/charts/gauge-theme';
3940

4041
/// Adds typography styles for h1-h6, paragraph and creates
4142
/// custom typography class selectors. The produces styles
@@ -101,36 +102,37 @@
101102
}
102103

103104
// Call the individual component styles with the type scale
104-
@include igx-button-typography($type-scale);
105-
@include igx-bottom-nav-typography($type-scale);
105+
@include _excel-filtering-typography($type-scale);
106106
@include igx-banner-typography($type-scale);
107+
@include igx-bottom-nav-typography($type-scale);
108+
@include igx-button-typography($type-scale);
107109
@include igx-calendar-typography($type-scale);
108110
@include igx-card-typography($type-scale);
109111
@include igx-checkbox-typography($type-scale);
110112
@include igx-chip-typography($type-scale);
111113
@include igx-column-hiding-typography($type-scale);
114+
@include igx-data-chart-typography($type-scale);
115+
@include igx-date-range-typography($type-scale);
112116
@include igx-dialog-typography($type-scale);
117+
@include igx-dock-manager-typography();
113118
@include igx-drop-down-typography($type-scale);
114-
@include igx-date-range-typography($type-scale);
115119
@include igx-expansion-panel-typography($type-scale);
116-
@include _excel-filtering-typography($type-scale);
120+
@include igx-financial-chart-typography($type-scale);
121+
@include igx-funnel-chart-typography($type-scale);
122+
@include igx-gauge-typography();
123+
@include igx-graph-typography();
117124
@include igx-input-group-typography($type-scale);
125+
@include igx-list-typography($type-scale);
118126
@include igx-navbar-typography($type-scale);
119127
@include igx-navdrawer-typography($type-scale);
120-
@include igx-list-typography($type-scale);
121128
@include igx-radio-typography($type-scale);
129+
@include igx-shape-chart-typography($type-scale);
130+
@include igx-slider-typography($type-scale);
122131
@include igx-snackbar-typography($type-scale);
123132
@include igx-switch-typography($type-scale);
124-
@include igx-slider-typography($type-scale);
125133
@include igx-tabs-typography($type-scale);
126134
@include igx-time-picker-typography($type-scale);
127135
@include igx-toast-typography($type-scale);
128136
@include igx-tooltip-typography($type-scale);
129-
@include igx-data-chart-typography($type-scale);
130-
@include igx-financial-chart-typography($type-scale);
131-
@include igx-graph-typography();
132-
@include igx-shape-chart-typography($type-scale);
133-
@include igx-funnel-chart-typography($type-scale);
134-
@include igx-gauge-typography();
135137
}
136138
}

0 commit comments

Comments
 (0)