Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Property grid new look: fix double borders #5902

Merged
merged 5 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $reverse-cubic-ease-out: cubic-bezier(0.32, 0, 0.67, 0);
min-width: 370px;
width: 450px;
height: 100%;
// border-inline-start: 1px solid var(--ctr-property-grid-border-color, $border);
border-inline-start: 1px solid var(--ctr-property-grid-border-color, $border);
}

.svc-side-bar__wrapper {
Expand Down Expand Up @@ -200,8 +200,6 @@ $reverse-cubic-ease-out: cubic-bezier(0.32, 0, 0.67, 0);
width: auto;
height: 100%;
background-color: var(--ctr-property-grid-form-background-color, $background-dim);
border-inline-start: 1px solid var(--ctr-property-grid-border-color, $border);
// border-inline-start: 1px solid transparent;
}

.svc-side-bar {
Expand Down
14 changes: 7 additions & 7 deletions testCafe/designer/responsiveness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,21 @@ test("Responsive creator: property grid", async (t) => {

.click(questions.find(".sv-string-editor").withText("question1"))
.expect(propertyGridSelector.visible).ok()
.expect(propertyGridSelector.offsetWidth).eql(450)
.expect(propertyGridSelector.offsetWidth).eql(451)
.expect(flyoutPropertyGrid.exists).notOk()
.expect(questionToolbarActions.count).eql(4)

.drag(westResizer, 100, 0)
.expect(propertyGridSelector.offsetWidth).eql(370)
.expect(propertyGridSelector.offsetWidth).eql(371)

.resizeWindow(750, 700)
.click(expandButtonSelector)
.expect(propertyGridSelector.visible).ok()
.expect(propertyGridSelector.offsetWidth).eql(370)
.expect(propertyGridSelector.offsetWidth).eql(371)
.expect(flyoutPropertyGrid.exists).ok()

.drag(westResizer, -150, 0)
.expect(propertyGridSelector.offsetWidth).eql(520)
.expect(propertyGridSelector.offsetWidth).eql(521)

.click(collapseButtonSelector)
.expect(propertyGridSelector.visible).notOk()
Expand All @@ -148,13 +148,13 @@ test("Responsive creator: property grid", async (t) => {
await t
.expect(westResizer.visible).notOk()
.expect(eastResizer.visible).ok()
.expect(propertyGridSelector.offsetWidth).eql(520)
.expect(propertyGridSelector.offsetWidth).eql(521)

.drag(eastResizer, -120, 0)
.expect(propertyGridSelector.offsetWidth).eql(400)
.expect(propertyGridSelector.offsetWidth).eql(401)

.drag(eastResizer, 100, 0)
.expect(propertyGridSelector.offsetWidth).eql(500);
.expect(propertyGridSelector.offsetWidth).eql(501);
});

test("Responsive creator: designer tab for mobile devices", async (t) => {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/drag-drop-scroll.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/no-license-mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/no-license.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions visualRegressionTests/tests/designer/rating.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ test("Multi row rating adorner", async (t) => {
const question2 = Selector("div[data-name=question2]");
await takeElementScreenshot("rating-multiline-text.png", question2, t, comparer);

await t.resizeWindow(550, 900);
await t.resizeWindow(549, 900);
await takeElementScreenshot("rating-multiline-mobile.png", question, t, comparer);
await takeElementScreenshot("rating-multiline-text-mobile.png", question2, t, comparer);

Expand All @@ -157,7 +157,7 @@ test("Multi row rating adorner smileys", async (t) => {
const question2 = Selector("div[data-name=question2]");
await takeElementScreenshot("rating-multiline-smileys-text.png", question2, t, comparer);

await t.resizeWindow(550, 900);
await t.resizeWindow(549, 900);
await takeElementScreenshot("rating-multiline-smileys-mobile.png", question, t, comparer);
await takeElementScreenshot("rating-multiline-smileys-text-mobile.png", question2, t, comparer);

Expand All @@ -184,7 +184,7 @@ test("Multi row rating adorner stars", async (t) => {
const question2 = Selector("div[data-name=question2]");
await takeElementScreenshot("rating-multiline-stars-text.png", question2, t, comparer);

await t.resizeWindow(550, 900);
await t.resizeWindow(549, 900);
await takeElementScreenshot("rating-multiline-stars-mobile.png", question, t, comparer);
await takeElementScreenshot("rating-multiline-stars-text-mobile.png", question2, t, comparer);

Expand Down
4 changes: 2 additions & 2 deletions visualRegressionTests/tests/designer/surface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2072,7 +2072,7 @@ test("Composite question - check no scroll", async (t) => {
],
});
})();
await t.resizeWindow(1152, 900);
await t.resizeWindow(1151, 900);
await setJSON({
"pages": [
{
Expand Down Expand Up @@ -2245,7 +2245,7 @@ test("Page adorner - collapsed", async (t) => {

test("Question adorner - collapsed mobile", async (t) => {
await wrapVisualTest(t, async (t, comparer) => {
await t.resizeWindow(552, 1080);
await t.resizeWindow(551, 1080);
const json = {
elements: [
{
Expand Down
Loading