Skip to content

Commit d761efa

Browse files
Scheduler: switch from generic to fluent_blue_light theme
1 parent 48c60bd commit d761efa

40 files changed

+69
-69
lines changed

packages/devextreme/testing/tests/DevExpress.knockout/scheduler.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ require('integration/knockout');
55
const Scheduler = require('ui/scheduler');
66
const { waitAsync } = require('../../helpers/scheduler/waitForAsync.js');
77

8-
require('generic_light.css!');
8+
require('fluent_blue_light.css!');
99

1010
if(QUnit.urlParams['nocsp']) {
1111
QUnit.module('scheduler');

packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import executeAsyncMock from '../../helpers/executeAsyncMock.js';
66
import { checkDxFontIcon, DX_ICON_XLSX_FILE_CONTENT_CODE } from '../../helpers/checkDxFontIconHelper.js';
77

88
import 'ui/pivot_grid/ui.pivot_grid';
9-
import 'generic_light.css!';
9+
import 'fluent_blue_light.css!';
1010

1111
QUnit.testStart(function() {
1212
const markup =

packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
import { isRenderer } from 'core/utils/type';
3131
import { addShadowDomStyles } from 'core/utils/shadow_dom';
3232
import { triggerShownEvent } from 'common/core/events/visibility_change';
33-
import 'generic_light.css!';
33+
import 'fluent_blue_light.css!';
3434
import $ from 'jquery';
3535
import dateLocalization from 'common/core/localization/date';
3636
import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source';

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
} from '../../helpers/scheduler/helpers.js';
1818
import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js';
1919

20-
import 'generic_light.css!';
20+
import 'fluent_blue_light.css!';
2121

2222
const { module, test, testStart } = QUnit;
2323

@@ -261,9 +261,9 @@ module('All day appointments common', config, () => {
261261
maxAppointmentsPerCell: 2
262262
});
263263

264-
assert.roughEqual(scheduler.appointments.getAppointmentHeight(0), 25, 1.5, 'Appointment has correct height');
265-
assert.roughEqual(scheduler.appointments.getAppointmentHeight(1), 25, 1.5, 'Appointment has correct height');
266-
assert.roughEqual(scheduler.appointments.getAppointmentPosition(0).top, 25, 1.5, 'Appointment has correct top');
264+
assert.roughEqual(scheduler.appointments.getAppointmentHeight(0), 13.5, 1.5, 'Appointment has correct height');
265+
assert.roughEqual(scheduler.appointments.getAppointmentHeight(1), 13.5, 1.5, 'Appointment has correct height');
266+
assert.roughEqual(scheduler.appointments.getAppointmentPosition(0).top, 30, 1.5, 'Appointment has correct top');
267267

268268
assert.equal(scheduler.appointments.compact.getButtonCount(), 1, 'Appointment collector is rendered');
269269
});

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
} from '../../helpers/scheduler/helpers.js';
1313
import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js';
1414

15-
import 'generic_light.css!';
15+
import 'fluent_blue_light.css!';
1616
import '__internal/scheduler/m_scheduler';
1717

1818
const { module, test, testStart } = QUnit;
@@ -292,8 +292,8 @@ module('All day appointments common', config, () => {
292292
assert.equal(scheduler.appointments.getTitleText(3), 'Simple appointment', 'Text is right');
293293

294294
assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).left, 0, 1.001, 'Appointment position is OK');
295-
assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).top, 100, 1.001, 'Appointment position is OK');
296-
assert.roughEqual(scheduler.appointments.getAppointmentWidth(3), cellWidth - APPOINTMENT_DEFAULT_LEFT_OFFSET, 1.001, 'Appointment size is OK');
295+
assert.roughEqual(scheduler.appointments.getAppointmentPosition(3).top, 76, 1.001, 'Appointment position is OK');
296+
assert.roughEqual(scheduler.appointments.getAppointmentWidth(3), cellWidth - APPOINTMENT_DEFAULT_LEFT_OFFSET, 5, 'Appointment size is OK');
297297
});
298298

299299
test('dropDown appointment should have correct container & position', async function(assert) {
@@ -325,7 +325,7 @@ module('All day appointments common', config, () => {
325325
const $dropDown = $(scheduler.instance.$element()).find('.dx-scheduler-appointment-collector').eq(0);
326326

327327
assert.equal($dropDown.parent().get(0), $(scheduler.instance.$element()).find('.dx-scheduler-all-day-appointments').get(0), 'Container is OK');
328-
assert.roughEqual(translator.locate($dropDown).left, 128, 1.001, 'Appointment position is OK');
328+
assert.roughEqual(translator.locate($dropDown).left, 133.28125, 1.001, 'Appointment position is OK');
329329
assert.roughEqual(translator.locate($dropDown).top, 0, 1.001, 'Appointment position is OK');
330330
});
331331

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { waitAsync } from '../../helpers/scheduler/waitForAsync.js';
1717

1818
import '__internal/scheduler/m_scheduler';
1919
import 'ui/switch';
20-
import 'generic_light.css!';
20+
import 'fluent_blue_light.css!';
2121

2222
const {
2323
module,

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88

99
import '__internal/scheduler/m_scheduler';
1010
import 'ui/switch';
11-
import 'generic_light.css!';
11+
import 'fluent_blue_light.css!';
1212

1313
const {
1414
module,

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88

99
import '__internal/scheduler/m_scheduler';
1010
import 'ui/switch';
11-
import 'generic_light.css!';
11+
import 'fluent_blue_light.css!';
1212

1313
QUnit.testStart(() => initTestMarkup());
1414

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99

1010
import '__internal/scheduler/m_scheduler';
1111
import 'ui/switch';
12-
import 'generic_light.css!';
12+
import 'fluent_blue_light.css!';
1313

1414
const {
1515
module,

packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { waitAsync, waitForAsync } from '../../helpers/scheduler/waitForAsync.js
2121

2222
import '__internal/scheduler/m_scheduler';
2323
import 'ui/switch';
24-
import 'generic_light.css!';
24+
import 'fluent_blue_light.css!';
2525

2626
const {
2727
module,
@@ -1214,10 +1214,10 @@ module('Integration: Appointment Day, Week views', {
12141214
assert.equal(appointments.length, 2, 'Correct number of appointments');
12151215

12161216
assert.equal(appointments[0].position.top, 0, 'Correct top coordinate');
1217-
assert.roughEqual(appointments[0].position.left, 224, 2, 'Correct left coordinate');
1217+
assert.roughEqual(appointments[0].position.left, 233.25, 2, 'Correct left coordinate');
12181218

12191219
assert.equal(appointments[1].position.top, 0, 'Correct top coordinate');
1220-
assert.roughEqual(appointments[1].position.left, 448, 2, 'Correct left coordinate');
1220+
assert.roughEqual(appointments[1].position.left, 466.5, 2, 'Correct left coordinate');
12211221
});
12221222

12231223
test('Appointments should be rendered correctly when groupByDate is true in Week view', async function(assert) {
@@ -1260,8 +1260,8 @@ module('Integration: Appointment Day, Week views', {
12601260

12611261
assert.equal(appointments.length, 2, 'Correct number of appointments');
12621262

1263-
assert.equal(appointments[0].position.top, 100, 'Correct top coordinate');
1264-
assert.roughEqual(appointments[0].position.left, 320, 2, 'Correct left coordinate');
1263+
assert.equal(appointments[0].position.top, 76, 'Correct top coordinate');
1264+
assert.roughEqual(appointments[0].position.left, 333.203125, 2, 'Correct left coordinate');
12651265

12661266
assert.equal(appointments[1].position.top, 200, 'Correct top coordinate');
12671267
assert.roughEqual(appointments[1].position.left, 640, 2, 'Correct left coordinate');

0 commit comments

Comments
 (0)