Skip to content

Commit

Permalink
Fix markup tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dk981234 committed Aug 23, 2023
1 parent f61e5a0 commit c36fb2c
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 48 deletions.
1 change: 0 additions & 1 deletion src/defaultCss/defaultV2Css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ export var defaultV2Css = {
contentLeft: "sd-question__content--left",
titleNumInline: "sd-element__title--num-inline",
titleLeftRoot: "sd-question--left",
titleTopRoot: "sd-question--top",
titleOnAnswer: "sd-question__title--answer",
titleOnError: "sd-question__title--error",
title: "sd-title sd-element__title sd-question__title",
Expand Down
94 changes: 48 additions & 46 deletions src/defaultV2-theme/blocks/sd-element.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@

.sv-string-viewer {
white-space: normal;

&::before {
content: "\200B";
}
Expand Down Expand Up @@ -238,71 +239,72 @@
}

&.sd-question--table:not(.sd-element--collapsed) {
&.sd-question--top {
&>.sd-question__header--location-top {
margin-top: calcSize(-1);
}

&>.sd-question__erbox--above-question {
margin-top: calcSize(1);
margin-bottom: var(--sd-base-vertical-padding);
}
&>.sd-question__erbox--above-question {
margin-top: calcSize(1);
margin-bottom: var(--sd-base-vertical-padding);
}
}
}

&.sd-element--collapsed {
&.sd-element--collapsed {

&>.sd-element__header:hover,
&>.sd-element__header:focus-within {
box-shadow: 0 calcSize(-2) 0 0 $background-dim-light, 0 calcSize(2) 0 $background-dim-light;
}
&>.sd-element__header:hover,
&>.sd-element__header:focus-within {
box-shadow: 0 calcSize(-2) 0 0 $background-dim-light, 0 calcSize(2) 0 $background-dim-light;
}
}

&.sd-panel,
&.sd-question--paneldynamic {
border: 1px solid $border-light;
border-radius: calc(var(--sjs-corner-radius, 4px) - 4px);
box-sizing: border-box;
padding-left: var(--sd-base-padding);
padding-right: var(--sd-base-padding);

&>.sd-element__header--location-top {
padding-top: calc(0.5 * var(--sd-base-vertical-padding));
padding-bottom: calc(0.5 * var(--sd-base-vertical-padding));
&.sd-panel,
&.sd-question--paneldynamic {
border: 1px solid $border-light;
border-radius: calc(var(--sjs-corner-radius, 4px) - 4px);
box-sizing: border-box;
padding-left: var(--sd-base-padding);
padding-right: var(--sd-base-padding);

&:after {
left: calc(-1 * var(--sd-base-padding));
width: calc(100% + 2 * var(--sd-base-padding));
bottom: calc(-0.5 * var(--sd-base-vertical-padding));
}
}
&>.sd-element__header--location-top {
padding-top: calc(0.5 * var(--sd-base-vertical-padding));
padding-bottom: calc(0.5 * var(--sd-base-vertical-padding));

&>.sd-question__erbox--outside-question {
margin-left: calc(-1 * var(--sd-base-padding));
margin-right: calc(-1 * var(--sd-base-padding));
&:after {
left: calc(-1 * var(--sd-base-padding));
width: calc(100% + 2 * var(--sd-base-padding));
bottom: calc(-0.5 * var(--sd-base-vertical-padding));
}
}

&>.sd-question__erbox--below-question {
bottom: 0;
margin-top: 0;
}
&>.sd-question__erbox--outside-question {
margin-left: calc(-1 * var(--sd-base-padding));
margin-right: calc(-1 * var(--sd-base-padding));
width: calc(100% + 2 * var(--sd-base-padding));
}

&>.sd-question__erbox--below-question {
bottom: 0;
margin-top: 0;
}

&.sd-element--collapsed {
&>.sd-element__header--location-top {
&:after {
display: none;
}
&.sd-element--collapsed {
&>.sd-element__header--location-top {
&:after {
display: none;
}

&:hover,
&:focus-within {
box-shadow: none;
}
&:hover,
&:focus-within {
box-shadow: none;
}
}
}
}

&>.sd-panel__content {
padding-bottom: var(--sd-base-padding);
}
&>.sd-panel__content {
padding-bottom: var(--sd-base-padding);
}
}

//compact styles
Expand Down
1 change: 0 additions & 1 deletion src/question.ts
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,6 @@ export class Question extends SurveyElement<Question>
.append(this.isFlowLayout && !this.isDesignMode
? cssClasses.flowRoot
: cssClasses.mainRoot)
.append(cssClasses.titleTopRoot, this.hasTitleOnTop)
.append(cssClasses.titleLeftRoot, !this.isFlowLayout && this.hasTitleOnLeft)
.append(cssClasses.hasError, this.errors.length > 0)
.append(cssClasses.small, !this.width)
Expand Down

0 comments on commit c36fb2c

Please sign in to comment.