Skip to content

Commit 94c97da

Browse files
committed
Merge branch '4.0.0-dev' into update-plyr-library
2 parents ed84d35 + cd03ef4 commit 94c97da

527 files changed

Lines changed: 3655 additions & 2590 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.storybook/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Global, css } from '@emotion/react';
1+
import { css, Global } from '@emotion/react';
22
import { withThemeFromJSXProvider } from '@storybook/addon-themes';
33
import { type Preview } from 'storybook-react-rsbuild';
44

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"editor.codeActionsOnSave": {
2929
"source.fixAll.eslint": "explicit",
3030
"source.fixAll.tslint": "always",
31-
"source.organizeImports": "explicit"
31+
"source.organizeImports": "never"
3232
},
3333
"prettier.enable": true,
3434
"eslint.enable": true,

assets/core/scss/components/_progress.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
&-fill {
1414
--tutor-progress-width: 0%;
15+
--tutor-progress-start: 0%;
1516
height: 100%;
1617
width: 100%;
1718
transform: translateX(calc(var(--tutor-progress-width) - 100%));
@@ -85,7 +86,7 @@
8586

8687
@keyframes tutor-progress-fill-animate {
8788
from {
88-
transform: translateX(-100%);
89+
transform: translateX(calc(var(--tutor-progress-start, 0%) - 100%));
8990
}
9091
to {
9192
transform: translateX(calc(var(--tutor-progress-width) - 100%));

assets/core/scss/mixins/_avatars.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
}
1616

1717
@mixin tutor-avatar-image {
18+
position: absolute;
19+
inset: 0;
1820
width: 100%;
1921
height: 100%;
2022
object-fit: cover;

assets/core/scss/tokens/_colors.scss

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
// =============================================================================
77

88
// Brand Colors
9-
$tutor-brand-100: #f6f8fe;
10-
$tutor-brand-200: #e4ebfc;
11-
$tutor-brand-300: #dbe4fa;
12-
$tutor-brand-400: #a4bcf4;
13-
$tutor-brand-500: #4979e8;
14-
$tutor-brand-600: #3e64de;
15-
$tutor-brand-700: #2b49ca;
16-
$tutor-brand-800: #293da4;
17-
$tutor-brand-900: #263782;
18-
$tutor-brand-950: #1c234f;
9+
$tutor-brand-100: var(--tutor-brand-100, #f6f8fe);
10+
$tutor-brand-200: var(--tutor-brand-200, #e4ebfc);
11+
$tutor-brand-300: var(--tutor-brand-300, #dbe4fa);
12+
$tutor-brand-400: var(--tutor-brand-400, #a4bcf4);
13+
$tutor-brand-500: var(--tutor-brand-500, #4979e8);
14+
$tutor-brand-600: var(--tutor-brand-600, #3e64de);
15+
$tutor-brand-700: var(--tutor-brand-700, #2b49ca);
16+
$tutor-brand-800: var(--tutor-brand-800, #293da4);
17+
$tutor-brand-900: var(--tutor-brand-900, #263782);
18+
$tutor-brand-950: var(--tutor-brand-950, #1c234f);
1919

2020
// Gray Colors
2121
$tutor-gray-1: #ffffff;

assets/core/ts/ComponentRegistry.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { type Alpine } from 'alpinejs';
2+
13
import { type AlpineComponentMeta, type LazyComponentLoader, type ServiceMeta, type TutorCore } from '@Core/ts/types';
24
import { makeFirstCharacterUpperCase } from '@Core/ts/utils/string';
3-
import { type Alpine } from 'alpinejs';
45

56
interface RegisterAllOptions {
67
components?: AlpineComponentMeta[];

assets/core/ts/components/calendar.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import { __ } from '@wordpress/i18n';
22
import dayjs from 'dayjs';
3+
import { type Calendar, Calendar as VanillaCalendar, type Options } from 'vanilla-calendar-pro';
34

45
import { DateFormats } from '@Core/ts/date-formats';
56
import { type AlpineComponentMeta } from '@Core/ts/types';
7+
68
import { tutorConfig } from '@TutorShared/config/config';
7-
import { type Calendar, type Options, Calendar as VanillaCalendar } from 'vanilla-calendar-pro';
89

910
// @ts-ignore
1011
import 'vanilla-calendar-pro/styles/index.css';

assets/core/ts/components/file-uploader.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { type FormControlMethods, type SetValueOptions, type ValidationRules } f
44
import { type WPMedia, type WPMediaType } from '@Core/ts/services/WPMedia';
55
import { type AlpineComponentMeta } from '@Core/ts/types';
66
import { formatBytes } from '@Core/ts/utils/format';
7+
78
import { tutorConfig } from '@TutorShared/config/config';
89

910
type FileUploaderVariant = 'file-uploader' | 'image-uploader';

assets/core/ts/components/icon.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { type AlpineComponentMeta } from '@Core/ts/types';
2+
23
import { tutorConfig } from '@TutorShared/config/config';
34

45
interface IconCacheEntry {

assets/core/ts/components/password-input.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import { type AlpineComponentMeta } from '@Core/ts/types';
21
import { __ } from '@wordpress/i18n';
32

3+
import { type AlpineComponentMeta } from '@Core/ts/types';
4+
45
export interface PasswordInputProps {
56
showStrength?: boolean;
67
minStrength?: number;

0 commit comments

Comments
 (0)