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.

Sign up for GitHub

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

html question themed #6821

Merged
merged 10 commits into from
Aug 29, 2023
Merged

html question themed #6821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aefa916
work for #6673 update themes
Aug 24, 2023
5d23df4
work for #6673 import font settings for article elements
Aug 24, 2023
f0af957
work for #6673 import font settings for article elements
Aug 24, 2023
6e80309
Merge branch 'issue/6673-html-themed' of github.com:surveyjs/survey-l…
Aug 25, 2023
986dcab
work for #6673 update article settings
Aug 25, 2023
3f8442c
work for #6673 add button styles
Aug 25, 2023
fc8931e
work for #6673 add rules for buttons
Aug 28, 2023
74ebfed
work for #6673 update etalons
Aug 28, 2023
f7f9124
Merge branch 'master' of github.com:surveyjs/survey-library into issu…
Aug 28, 2023
3bfff5a
Merge branch 'master' of github.com:surveyjs/survey-library into issu…
Aug 29, 2023
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
68 changes: 67 additions & 1 deletion src/defaultV2-theme/blocks/sd-completedpage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,74 @@
text-align: center;
height: auto;

// h3 {
// font-size: calcFontSize(1.5);
// }

h1 {
@include articleXXLargeFont;
}

h2 {
@include articleXLargeFont;
}

h3 {
font-size: calcFontSize(1.5);
@include articleLargeFont;
}

h4 {
@include articleMediumFont;
}

h5,
h6 {
color: $foreground;
}

span,
div,
p {
@include articleDefaultFont;
}

a {
color: $primary;
}

button {
display: flex;
align-items: center;
padding: calcSize(1.5) calcSize(4);
vertical-align: baseline;
text-align: center;
background-color: $background;
box-shadow: $shadow-small;
border: none;
border-radius: calcSize(0.5);
cursor: pointer;
user-select: none;
outline: solid calcSize(0.25) transparent;

&:hover {
background-color: $background-dark;
}
&:focus {
box-shadow: 0 0 0 2px $primary;
}

span {
display: flex;
align-items: center;
flex-grow: 1;
justify-content: center;
color: $primary;
font-weight: 600;
font-style: normal;
font-family: var(--font-family, $font-family);
font-size: $font-questiontitle-size;
line-height: multiply(1.5, $font-questiontitle-size);
}
}
}

Expand Down
68 changes: 68 additions & 0 deletions src/defaultV2-theme/blocks/sd-html.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,71 @@
.sd-html {
white-space: initial;
}

.sd-html {
h1 {
@include articleXXLargeFont;
}

h2 {
@include articleXLargeFont;
}

h3 {
@include articleLargeFont;
}

h4 {
@include articleMediumFont;
}

h5,
h6 {
color: $foreground;
}

span,
div,
p {
@include articleDefaultFont;
}

a {
color: $primary;
}

button {
display: flex;
align-items: center;
padding: calcSize(1.5) calcSize(4);
vertical-align: baseline;
text-align: center;
background-color: $background;
box-shadow: $shadow-small;
border: none;
border-radius: calcSize(0.5);
cursor: pointer;
user-select: none;
outline: solid calcSize(0.25) transparent;

&:hover {
background-color: $background-dark;
}
&:focus {
box-shadow: 0 0 0 2px $primary;
}

span {
display: flex;
align-items: center;
flex-grow: 1;
justify-content: center;
color: $primary;
font-weight: 600;
font-style: normal;
font-family: var(--font-family, $font-family);
font-size: $font-questiontitle-size;
line-height: multiply(1.5, $font-questiontitle-size);
}
}
}
72 changes: 71 additions & 1 deletion src/defaultV2-theme/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,74 @@ $base-unit: var(--sjs-base-unit, var(--base-unit, 8px));
@mixin borderLight {
border: calcSize(0.25) solid $border-light;
border-radius: calcCornerRadius(1);
}
}

@mixin articleXXLargeFont {
color: $foreground;
font-size: var(--sjs-article-font-xx-large-fontSize, 64px);
text-decoration: var(--sjs-article-font-xx-large-textDecoration, "none");
font-family: $font-family;
font-weight: var(--sjs-article-font-xx-large-fontWeight, 700);
font-style: var(--sjs-article-font-xx-large-fontStyle, "normal");
font-stretch: var(--sjs-article-font-xx-large-fontStretch, "normal");
letter-spacing: var(--sjs-article-font-xx-large-letterSpacing, 0);
line-height: var(--sjs-article-font-xx-large-lineHeight, 64px);
text-indent: var(--sjs-article-font-xx-large-paragraphIndent, 0px);
text-transform: var(--sjs-article-font-xx-large-textCase, "none");
}

@mixin articleXLargeFont {
color: $foreground;
font-size: var(--sjs-article-font-x-large-fontSize, 48px);
text-decoration: var(--sjs-article-font-x-large-textDecoration, "none");
font-family: $font-family;
font-weight: var(--sjs-article-font-x-large-fontWeight, 700);
font-style: var(--sjs-article-font-x-large-fontStyle, "normal");
font-stretch: var(--sjs-article-font-x-large-fontStretch, "normal");
letter-spacing: var(--sjs-article-font-x-large-letterSpacing, 0);
line-height: var(--sjs-article-font-x-large-lineHeight, 56px);
text-indent: var(--sjs-article-font-x-large-paragraphIndent, 0px);
text-transform: var(--sjs-article-font-x-large-textCase, "none");
}

@mixin articleLargeFont {
color: $foreground;
font-size: var(--sjs-article-font-large-fontSize, 32px);
text-decoration: var(--sjs-article-font-large-textDecoration, "none");
font-family: $font-family;
font-weight: var(--sjs-article-font-large-fontWeight, 700);
font-style: var(--sjs-article-font-large-fontStyle, "normal");
font-stretch: var(--sjs-article-font-large-fontStretch, "normal");
letter-spacing: var(--sjs-article-font-large-letterSpacing, 0);
line-height: var(--sjs-article-font-large-lineHeight, 40px);
text-indent: var(--sjs-article-font-large-paragraphIndent, 0px);
text-transform: var(--sjs-article-font-large-textCase, "none");
}

@mixin articleMediumFont {
color: $foreground;
font-size: var(--sjs-article-font-medium-fontSize, 24px);
text-decoration: var(--sjs-article-font-medium-textDecoration, "none");
font-family: $font-family;
font-weight: var(--sjs-article-font-medium-fontWeight, 700);
font-style: var(--sjs-article-font-medium-fontStyle, "normal");
font-stretch: var(--sjs-article-font-medium-fontStretch, "normal");
letter-spacing: var(--sjs-article-font-medium-letterSpacing, 0);
line-height: var(--sjs-article-font-medium-lineHeight, 32px);
text-indent: var(--sjs-article-font-medium-paragraphIndent, 0px);
text-transform: var(--sjs-article-font-medium-textCase, "none");
}

@mixin articleDefaultFont {
color: $foreground;
font-size: var(--sjs-article-font-default-fontSize, 16px);
text-decoration: var(--sjs-article-font-default-textDecoration, "none");
font-family: $font-family;
font-weight: var(--sjs-article-font-default-fontWeight, 400);
font-style: var(--sjs-article-font-default-fontStyle, "normal");
font-stretch: var(--sjs-article-font-default-fontStretch, "normal");
letter-spacing: var(--sjs-article-font-default-letterSpacing, 0);
line-height: var(--sjs-article-font-default-lineHeight, 28px);
text-indent: var(--sjs-article-font-default-paragraphIndent, 0px);
text-transform: var(--sjs-article-font-default-textCase, "none");
}
47 changes: 46 additions & 1 deletion src/themes/borderless-dark-panelless.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,52 @@ const Theme = {
"--sjs-special-blue-forecolor": "rgba(48, 48, 48, 1)",
"--sjs-special-yellow": "rgba(255, 152, 20, 1)",
"--sjs-special-yellow-light": "rgba(255, 152, 20, 0.1)",
"--sjs-special-yellow-forecolor": "rgba(48, 48, 48, 1)"
"--sjs-special-yellow-forecolor": "rgba(48, 48, 48, 1)",
"--sjs-article-font-xx-large-fontSize": "64px",
"--sjs-article-font-xx-large-textDecoration": "none",
"--sjs-article-font-xx-large-fontWeight": "700",
"--sjs-article-font-xx-large-fontStyle": "normal",
"--sjs-article-font-xx-large-fontStretch": "normal",
"--sjs-article-font-xx-large-letterSpacing": "0",
"--sjs-article-font-xx-large-lineHeight": "64px",
"--sjs-article-font-xx-large-paragraphIndent": "0px",
"--sjs-article-font-xx-large-textCase": "none",
"--sjs-article-font-x-large-fontSize": "48px",
"--sjs-article-font-x-large-textDecoration": "none",
"--sjs-article-font-x-large-fontWeight": "700",
"--sjs-article-font-x-large-fontStyle": "normal",
"--sjs-article-font-x-large-fontStretch": "normal",
"--sjs-article-font-x-large-letterSpacing": "0",
"--sjs-article-font-x-large-lineHeight": "56px",
"--sjs-article-font-x-large-paragraphIndent": "0px",
"--sjs-article-font-x-large-textCase": "none",
"--sjs-article-font-large-fontSize": "32px",
"--sjs-article-font-large-textDecoration": "none",
"--sjs-article-font-large-fontWeight": "700",
"--sjs-article-font-large-fontStyle": "normal",
"--sjs-article-font-large-fontStretch": "normal",
"--sjs-article-font-large-letterSpacing": "0",
"--sjs-article-font-large-lineHeight": "40px",
"--sjs-article-font-large-paragraphIndent": "0px",
"--sjs-article-font-large-textCase": "none",
"--sjs-article-font-medium-fontSize": "24px",
"--sjs-article-font-medium-textDecoration": "none",
"--sjs-article-font-medium-fontWeight": "700",
"--sjs-article-font-medium-fontStyle": "normal",
"--sjs-article-font-medium-fontStretch": "normal",
"--sjs-article-font-medium-letterSpacing": "0",
"--sjs-article-font-medium-lineHeight": "32px",
"--sjs-article-font-medium-paragraphIndent": "0px",
"--sjs-article-font-medium-textCase": "none",
"--sjs-article-font-default-fontSize": "16px",
"--sjs-article-font-default-textDecoration": "none",
"--sjs-article-font-default-fontWeight": "400",
"--sjs-article-font-default-fontStyle": "normal",
"--sjs-article-font-default-fontStretch": "normal",
"--sjs-article-font-default-letterSpacing": "0",
"--sjs-article-font-default-lineHeight": "28px",
"--sjs-article-font-default-paragraphIndent": "0px",
"--sjs-article-font-default-textCase": "none"
},
"isPanelless": true
};
Expand Down
47 changes: 46 additions & 1 deletion src/themes/borderless-dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,52 @@ const Theme = {
"--sjs-special-blue-forecolor": "rgba(48, 48, 48, 1)",
"--sjs-special-yellow": "rgba(255, 152, 20, 1)",
"--sjs-special-yellow-light": "rgba(255, 152, 20, 0.1)",
"--sjs-special-yellow-forecolor": "rgba(48, 48, 48, 1)"
"--sjs-special-yellow-forecolor": "rgba(48, 48, 48, 1)",
"--sjs-article-font-xx-large-fontSize": "64px",
"--sjs-article-font-xx-large-textDecoration": "none",
"--sjs-article-font-xx-large-fontWeight": "700",
"--sjs-article-font-xx-large-fontStyle": "normal",
"--sjs-article-font-xx-large-fontStretch": "normal",
"--sjs-article-font-xx-large-letterSpacing": "0",
"--sjs-article-font-xx-large-lineHeight": "64px",
"--sjs-article-font-xx-large-paragraphIndent": "0px",
"--sjs-article-font-xx-large-textCase": "none",
"--sjs-article-font-x-large-fontSize": "48px",
"--sjs-article-font-x-large-textDecoration": "none",
"--sjs-article-font-x-large-fontWeight": "700",
"--sjs-article-font-x-large-fontStyle": "normal",
"--sjs-article-font-x-large-fontStretch": "normal",
"--sjs-article-font-x-large-letterSpacing": "0",
"--sjs-article-font-x-large-lineHeight": "56px",
"--sjs-article-font-x-large-paragraphIndent": "0px",
"--sjs-article-font-x-large-textCase": "none",
"--sjs-article-font-large-fontSize": "32px",
"--sjs-article-font-large-textDecoration": "none",
"--sjs-article-font-large-fontWeight": "700",
"--sjs-article-font-large-fontStyle": "normal",
"--sjs-article-font-large-fontStretch": "normal",
"--sjs-article-font-large-letterSpacing": "0",
"--sjs-article-font-large-lineHeight": "40px",
"--sjs-article-font-large-paragraphIndent": "0px",
"--sjs-article-font-large-textCase": "none",
"--sjs-article-font-medium-fontSize": "24px",
"--sjs-article-font-medium-textDecoration": "none",
"--sjs-article-font-medium-fontWeight": "700",
"--sjs-article-font-medium-fontStyle": "normal",
"--sjs-article-font-medium-fontStretch": "normal",
"--sjs-article-font-medium-letterSpacing": "0",
"--sjs-article-font-medium-lineHeight": "32px",
"--sjs-article-font-medium-paragraphIndent": "0px",
"--sjs-article-font-medium-textCase": "none",
"--sjs-article-font-default-fontSize": "16px",
"--sjs-article-font-default-textDecoration": "none",
"--sjs-article-font-default-fontWeight": "400",
"--sjs-article-font-default-fontStyle": "normal",
"--sjs-article-font-default-fontStretch": "normal",
"--sjs-article-font-default-letterSpacing": "0",
"--sjs-article-font-default-lineHeight": "28px",
"--sjs-article-font-default-paragraphIndent": "0px",
"--sjs-article-font-default-textCase": "none"
},
"isPanelless": false
};
Expand Down
47 changes: 46 additions & 1 deletion src/themes/borderless-light-panelless.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,52 @@ const Theme = {
"--sjs-special-blue-forecolor": "rgba(255, 255, 255, 1)",
"--sjs-special-yellow": "rgba(255, 152, 20, 1)",
"--sjs-special-yellow-light": "rgba(255, 152, 20, 0.1)",
"--sjs-special-yellow-forecolor": "rgba(255, 255, 255, 1)"
"--sjs-special-yellow-forecolor": "rgba(255, 255, 255, 1)",
"--sjs-article-font-xx-large-fontSize": "64px",
"--sjs-article-font-xx-large-textDecoration": "none",
"--sjs-article-font-xx-large-fontWeight": "700",
"--sjs-article-font-xx-large-fontStyle": "normal",
"--sjs-article-font-xx-large-fontStretch": "normal",
"--sjs-article-font-xx-large-letterSpacing": "0",
"--sjs-article-font-xx-large-lineHeight": "64px",
"--sjs-article-font-xx-large-paragraphIndent": "0px",
"--sjs-article-font-xx-large-textCase": "none",
"--sjs-article-font-x-large-fontSize": "48px",
"--sjs-article-font-x-large-textDecoration": "none",
"--sjs-article-font-x-large-fontWeight": "700",
"--sjs-article-font-x-large-fontStyle": "normal",
"--sjs-article-font-x-large-fontStretch": "normal",
"--sjs-article-font-x-large-letterSpacing": "0",
"--sjs-article-font-x-large-lineHeight": "56px",
"--sjs-article-font-x-large-paragraphIndent": "0px",
"--sjs-article-font-x-large-textCase": "none",
"--sjs-article-font-large-fontSize": "32px",
"--sjs-article-font-large-textDecoration": "none",
"--sjs-article-font-large-fontWeight": "700",
"--sjs-article-font-large-fontStyle": "normal",
"--sjs-article-font-large-fontStretch": "normal",
"--sjs-article-font-large-letterSpacing": "0",
"--sjs-article-font-large-lineHeight": "40px",
"--sjs-article-font-large-paragraphIndent": "0px",
"--sjs-article-font-large-textCase": "none",
"--sjs-article-font-medium-fontSize": "24px",
"--sjs-article-font-medium-textDecoration": "none",
"--sjs-article-font-medium-fontWeight": "700",
"--sjs-article-font-medium-fontStyle": "normal",
"--sjs-article-font-medium-fontStretch": "normal",
"--sjs-article-font-medium-letterSpacing": "0",
"--sjs-article-font-medium-lineHeight": "32px",
"--sjs-article-font-medium-paragraphIndent": "0px",
"--sjs-article-font-medium-textCase": "none",
"--sjs-article-font-default-fontSize": "16px",
"--sjs-article-font-default-textDecoration": "none",
"--sjs-article-font-default-fontWeight": "400",
"--sjs-article-font-default-fontStyle": "normal",
"--sjs-article-font-default-fontStretch": "normal",
"--sjs-article-font-default-letterSpacing": "0",
"--sjs-article-font-default-lineHeight": "28px",
"--sjs-article-font-default-paragraphIndent": "0px",
"--sjs-article-font-default-textCase": "none"
},
"isPanelless": true
};
Expand Down
Loading