Skip to content

Commit f474367

Browse files
authored
Merge branch 'master' into bpenkov/mask-refactor
2 parents 21283c4 + bf899d5 commit f474367

26 files changed

+3756
-5765
lines changed

gulpfile.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ function typedocBuildExportFn(cb) {
184184
}
185185

186186
function typedocImportJsonFn(cb) {
187-
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-from-json", TYPEDOC.EXPORT_JSON_PATH],
187+
spawnSync('typedoc', [TYPEDOC.PROJECT_PATH, "--generate-from-json", TYPEDOC.EXPORT_JSON_PATH, "--warns"],
188188
{ stdio: 'inherit', shell: true});
189189
cb();
190190
}
@@ -206,6 +206,7 @@ function typedocBuildDocsJA (cb) {
206206
slash(path.join(__dirname, 'i18nRepo', 'typedoc', 'ja')),
207207
'--templateStrings',
208208
TYPEDOC.TEMPLATE_STRINGS_PATH,
209+
'--warns',
209210
'--localize',
210211
'jp'], { stdio: 'inherit', shell: true });
211212

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
"ts-node": "~7.0.1",
116116
"tslint": "~5.12.1",
117117
"typedoc": "^0.16.9",
118-
"typedoc-plugin-localization": "^1.6.1",
118+
"typedoc-plugin-localization": "^2.2.0",
119119
"typescript": "~3.7.5",
120120
"webpack-sources": "1.3.0"
121121
}

projects/igniteui-angular/src/lib/calendar/calendar.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ export class IgxCalendarComponent extends IgxMonthPickerBaseDirective implements
316316
/**
317317
* Sets the header template.
318318
*
319-
* @example
319+
* @example
320320
* ```html
321321
* <igx-calendar headerTemplateDirective = "igxCalendarHeader"></igx-calendar>
322322
* ```

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

Lines changed: 1904 additions & 2994 deletions
Large diffs are not rendered by default.

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@
303303
overflow: hidden;
304304
outline-style: none;
305305
border-radius: --var($theme, 'border-radius');
306+
min-height: 300px;
307+
min-width: 300px;
306308
}
307309

308310
%igx-carousel-slide {

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@
852852
%grid-mrl-block {
853853
display: grid;
854854
background: inherit;
855+
position: relative;
855856

856857
%grid-thead-item {
857858
display: flex;

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_toast.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ $_bootstrap-toast: extend(
5656
(
5757
variant: 'bootstrap',
5858
background: #fff,
59+
60+
text-color: (
61+
igx-color: ('grays', 600)
62+
)
5963
)
6064
);
6165

0 commit comments

Comments
 (0)