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

work for https://github.com/surveyjs/private-tasks/issues/266 #6783

Merged
merged 3 commits into from
Aug 25, 2023
Merged

work for https://github.com/surveyjs/private-tasks/issues/266 #6783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
740b951
work for https://github.com/surveyjs/private-tasks/issues/266
Aug 23, 2023
534de1f
work for https://github.com/surveyjs/private-tasks/issues/266
Aug 24, 2023
d4d8886
work for https://github.com/surveyjs/private-tasks/issues/266
Aug 24, 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
2 changes: 1 addition & 1 deletion src/actions/action.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export interface IAction {
* The action item's icon size in pixels.
* @see iconName
*/
iconSize?: number;
iconSize?: number | string;
/**
* The action item's location in a matrix question's row.
*
Expand Down
1 change: 1 addition & 0 deletions src/common-styles/sv-ranking.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAArSURBVHgB7cuhEQAwDMNAtUN4//m8RMtygcE5PxMQxAKnh6Q3mWzXd4mAD4cJBAQCqfbUAAAAAElFTkSuQmCC");
background-position: center;
background-repeat: no-repeat;
background-size: multiply(1, $font-editorfont-size);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/defaultV2-theme/blocks/sd-context-btn.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
outline: none;
svg {
display: block;
width: calcSize(3);
height: calcSize(3);
width: multiply(1.5, $font-editorfont-size);
height: multiply(1.5, $font-editorfont-size);
}
use {
fill: $foreground-light;
Expand Down
4 changes: 2 additions & 2 deletions src/defaultV2-theme/blocks/sd-file.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@

.sd-file__clean-btn {
z-index: 2;
right: calcSize(1);
inset-inline-end: calcSize(1);

span:first-child {
display: none;
}
}

.sd-file__choose-btn--icon {
right: calcSize(8);
inset-inline-end: calc(multiply(1.5, $font-editorfont-size) + calcSize(5));
}

.sd-file__list {
Expand Down
7 changes: 3 additions & 4 deletions src/defaultV2-theme/blocks/sd-imagepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
position: absolute;
top: calcSize(1);
right: calcSize(1);
width: calcSize(6);
height: calcSize(6);
padding: calcSize(1.5);
box-sizing: border-box;
border-radius: 100%;
Expand All @@ -54,8 +52,9 @@
}

.sd-imagepicker__check-icon {
width: calcSize(3);
height: calcSize(3);
display: block;
width: multiply(1.5, $font-editorfont-size);
height: multiply(1.5, $font-editorfont-size);
fill: $primary;
}

Expand Down
5 changes: 5 additions & 0 deletions src/defaultV2-theme/blocks/sd-matrixdynamic.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
opacity: 0.5;
}

.sd-action.sd-matrixdynamic__remove-btn .sd-action__icon {
width: multiply(1.5, $font-editorfont-size);
height: multiply(1.5, $font-editorfont-size);
}

.sd-matrixdynamic__btn {
appearance: none;
background: transparent;
Expand Down
1 change: 1 addition & 0 deletions src/defaultV2-theme/blocks/sd-rating.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,4 +357,5 @@ legend+sv-ng-rating-item+.sd-rating__item-smiley {

.sd-rating__item--selected .sd-rating__item-text.sd-rating__item-text {
color: $primary-foreground;
font-weight: inherit;
}
9 changes: 4 additions & 5 deletions src/defaultV2-theme/blocks/sd-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}

.sd-table--no-header {
padding-top: calcSize(3)
padding-top: calcSize(3);
}
.sd-table--alternate-rows {
margin-left: calcSize(1);
Expand Down Expand Up @@ -197,13 +197,12 @@
border: none;
background: transparent;
border-radius: calcSize(2);
width: calcSize(4);
height: calcSize(4);
padding: calcSize(1);

svg {
width: calcSize(2);
height: calcSize(2);
display: block;
width: multiply(1, $font-editorfont-size);
height: multiply(1, $font-editorfont-size);
fill: $foreground-light;
}

Expand Down
10 changes: 5 additions & 5 deletions src/defaultV2-theme/blocks/sd-tagbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
}

.sd-tagbox_clean-button {
height: calcSize(3);
padding: calcSize(1);
height: multiply(1.5, $font-editorfont-size);
padding: multiply(0.5, $font-editorfont-size);
margin: auto 0;
}

Expand Down Expand Up @@ -58,9 +58,9 @@

.sd-tagbox-item_clean-button-svg {
display: flex;
padding: calcSize(0.5);
width: calcSize(2);
height: calcSize(2);
padding: multiply(0.25, $font-editorfont-size);
width: multiply(1, $font-editorfont-size);
height: multiply(1, $font-editorfont-size);
}

.sd-tagbox-item_clean-button-svg:hover {
Expand Down
6 changes: 2 additions & 4 deletions src/knockout/components/matrix-actions/detail-button/detail-button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@
type="button"
data-bind="css:question.getDetailPanelButtonCss(row), click:row.showHideDetailPanelClick, attr:{ 'aria-expanded': question.getIsDetailPanelShowing($data.row) ? 'true': 'false', 'aria-controls': question.getIsDetailPanelShowing($data.row) ? row.detailPanelId: false}"
>
<span
data-bind="css: question.getDetailPanelIconCss(row), component: { name: 'sv-svg-icon', params: {iconName: question.getDetailPanelIconId(row)} }"
>
</span>
<!-- ko component: { name: 'sv-svg-icon', params: { css: question.getDetailPanelIconCss(row), iconName: question.getDetailPanelIconId(row), size: 'auto' } } -->
<!-- /ko -->
</button>
<!-- ko if: question.detailPanelMode === "popup" && question.getKoPopupIsVisible(row) -->
<sv-popup
Expand Down
1 change: 1 addition & 0 deletions src/question_matrixdropdownrendered.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ export class QuestionMatrixDropdownRenderedTable extends Base {
new Action({
id: "remove-row",
iconName: "icon-delete",
iconSize: "auto",
component: "sv-action-bar-item",
innerCss: new CssClassBuilder().append(this.matrix.cssClasses.button).append(this.matrix.cssClasses.buttonRemove).toString(),
location: "end",
Expand Down
4 changes: 2 additions & 2 deletions tests/markup/snapshots/matrixdynamic-defaultV2.snap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@
<div class="sv-action" id="remove-row">
<div class="sv-action__content">
<button class="sd-action sd-action--icon sd-action--negative sd-matrixdynamic__btn sd-matrixdynamic__remove-btn" role="button" tabindex="0" title="Remove" type="button">
<svg aria-label="Remove" class="sd-action__icon sv-svg-icon" role="img" style="height:24px; width:24px;">
<svg aria-label="Remove" class="sd-action__icon sv-svg-icon" role="img">
<use xlink:href="#icon-delete" class="">
</use>
<title class="">Remove</title>
Expand Down Expand Up @@ -310,7 +310,7 @@
<div class="sv-action" id="remove-row">
<div class="sv-action__content">
<button class="sd-action sd-action--icon sd-action--negative sd-matrixdynamic__btn sd-matrixdynamic__remove-btn" role="button" tabindex="0" title="Remove" type="button">
<svg aria-label="Remove" class="sd-action__icon sv-svg-icon" role="img" style="height:24px; width:24px;">
<svg aria-label="Remove" class="sd-action__icon sv-svg-icon" role="img">
<use xlink:href="#icon-delete" class="">
</use>
<title class="">Remove</title>
Expand Down