Skip to content

Commit 972cc63

Browse files
authored
Merge pull request #2972 from pie-framework/fix/PD-5450
fix: missing spacing PD-5450
2 parents e9c9eb0 + 4325d6c commit 972cc63

74 files changed

Lines changed: 273 additions & 290 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -89,31 +89,31 @@
8989
"@jest/test-sequencer": "29.7.0",
9090
"@types/d3-array": "3.0.3",
9191
"@pie-lib/categorize": "1.2.0-next.3",
92-
"@pie-lib/charting": "6.2.0-next.29",
93-
"@pie-lib/config-ui": "12.2.0-next.29",
92+
"@pie-lib/charting": "6.2.0-next.35",
93+
"@pie-lib/config-ui": "12.2.0-next.35",
9494
"@pie-lib/controller-utils": "1.2.0-next.3",
95-
"@pie-lib/correct-answer-toggle": "3.2.0-next.7",
96-
"@pie-lib/drag": "3.2.0-next.8",
97-
"@pie-lib/editable-html": "12.2.0-next.13",
98-
"@pie-lib/editable-html-tip-tap": "1.2.0-next.28",
95+
"@pie-lib/correct-answer-toggle": "3.2.0-next.8",
96+
"@pie-lib/drag": "3.2.0-next.9",
97+
"@pie-lib/editable-html": "12.2.0-next.15",
98+
"@pie-lib/editable-html-tip-tap": "1.2.0-next.34",
9999
"@pie-lib/feedback": "1.2.0-next.3",
100-
"@pie-lib/graphing-solution-set": "3.2.0-next.28",
100+
"@pie-lib/graphing-solution-set": "3.2.0-next.34",
101101
"@pie-lib/graphing-utils": "2.2.0-next.3",
102-
"@pie-lib/graphing": "3.2.0-next.28",
102+
"@pie-lib/graphing": "3.2.0-next.34",
103103
"@pie-lib/icons": "3.2.0-next.4",
104-
"@pie-lib/mask-markup": "2.2.0-next.29",
104+
"@pie-lib/mask-markup": "2.2.0-next.35",
105105
"@pie-lib/math-evaluator": "3.2.0-next.4",
106106
"@pie-lib/math-input": "7.2.0-next.12",
107107
"@pie-lib/math-rendering-accessible": "4.2.0-next.4",
108108
"@pie-lib/math-rendering": "4.2.0-next.3",
109-
"@pie-lib/math-toolbar": "2.2.0-next.14",
110-
"@pie-lib/plot": "3.2.0-next.27",
111-
"@pie-lib/render-ui": "5.2.0-next.7",
112-
"@pie-lib/rubric": "1.2.0-next.29",
109+
"@pie-lib/math-toolbar": "2.2.0-next.15",
110+
"@pie-lib/plot": "3.2.0-next.34",
111+
"@pie-lib/render-ui": "5.2.0-next.8",
112+
"@pie-lib/rubric": "1.2.0-next.35",
113113
"@pie-lib/scoring-config": "4.2.0-next.3",
114114
"@pie-lib/style-utils": "1.2.0-next.3",
115115
"@pie-lib/test-utils": "1.2.0-next.3",
116-
"@pie-lib/text-select": "2.2.0-next.7",
116+
"@pie-lib/text-select": "2.2.0-next.9",
117117
"@pie-lib/tools": "1.2.0-next.4",
118118
"@pie-lib/translator": "3.2.0-next.3",
119119
"@pie-framework/mathquill": "1.2.1-beta.1"

packages/boilerplate-item-type/configure/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"@mui/icons-material": "^7.3.4",
1212
"@mui/material": "^7.3.4",
1313
"@pie-framework/pie-configure-events": "^1.3.0",
14-
"@pie-lib/config-ui": "12.2.0-next.29",
15-
"@pie-lib/editable-html-tip-tap": "1.2.0-next.28",
16-
"@pie-lib/render-ui": "5.2.0-next.7",
14+
"@pie-lib/config-ui": "12.2.0-next.35",
15+
"@pie-lib/editable-html-tip-tap": "1.2.0-next.34",
16+
"@pie-lib/render-ui": "5.2.0-next.8",
1717
"debug": "^4.1.1",
1818
"lodash-es": "^4.17.23",
1919
"prop-types": "^15.6.2",

packages/boilerplate-item-type/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"@mui/material": "^7.3.4",
1414
"@pie-framework/pie-player-events": "^0.1.0",
1515
"@pie-lib/math-rendering": "4.2.0-next.3",
16-
"@pie-lib/render-ui": "5.2.0-next.7",
16+
"@pie-lib/render-ui": "5.2.0-next.8",
1717
"prop-types": "^15.6.1",
1818
"react": "18.3.1",
1919
"react-dom": "18.3.1"

packages/calculator/configure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@mui/material": "^7.3.4",
1212
"@pie-framework/material-ui-calculator": "4.0.0",
1313
"@pie-framework/pie-configure-events": "^1.3.0",
14-
"@pie-lib/config-ui": "12.2.0-next.29",
14+
"@pie-lib/config-ui": "12.2.0-next.35",
1515
"react": "18.3.1",
1616
"react-dom": "18.3.1"
1717
},

packages/categorize/configure/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"@mui/material": "^7.3.4",
1717
"@pie-framework/pie-configure-events": "^1.3.0",
1818
"@pie-lib/categorize": "1.2.0-next.3",
19-
"@pie-lib/config-ui": "12.2.0-next.29",
20-
"@pie-lib/drag": "3.2.0-next.8",
21-
"@pie-lib/editable-html-tip-tap": "1.2.0-next.28",
19+
"@pie-lib/config-ui": "12.2.0-next.35",
20+
"@pie-lib/drag": "3.2.0-next.9",
21+
"@pie-lib/editable-html-tip-tap": "1.2.0-next.34",
2222
"@pie-lib/math-rendering": "4.2.0-next.3",
23-
"@pie-lib/render-ui": "5.2.0-next.7",
23+
"@pie-lib/render-ui": "5.2.0-next.8",
2424
"@pie-lib/translator": "3.2.0-next.3",
2525
"debug": "^4.1.1",
2626
"lodash-es": "^4.17.23",

packages/categorize/configure/src/design/categories/RowLabel.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import EditableHtml from '@pie-lib/editable-html-tip-tap';
55
import { InputContainer } from '@pie-lib/render-ui';
66

77
const RowLabelContainer = styled(InputContainer)(({ theme }) => ({
8-
paddingTop: theme.spacing(2),
98
width: '100%',
9+
paddingTop: theme.spacing(1),
10+
marginTop: theme.spacing(1),
1011
}));
1112

1213
export const RowLabel = ({

packages/categorize/configure/src/design/categories/alternateResponses.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ const CategoriesContainer = styled('div')(({ theme }) => ({
1111

1212
const CategoriesHolder = styled('div')(({ theme }) => ({
1313
display: 'grid',
14-
gridRowGap: `${theme.spacing(1)}px`,
15-
gridColumnGap: `${theme.spacing(1)}px`,
14+
gridRowGap: theme.spacing(1),
15+
gridColumnGap: theme.spacing(1),
1616
}));
1717

1818
const RowLabel = styled('div')({

packages/categorize/configure/src/design/categories/category.jsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ const StyledCard = styled(Card, {
2020
}));
2121

2222
const StyledCardActions = styled(CardActions)(({ theme }) => ({
23-
padding: 0,
24-
paddingBottom: 0,
25-
paddingTop: theme.spacing(1),
23+
padding: `${theme.spacing(1)} 0 0`,
2624
}));
2725

2826
const CategoryHeader = styled('div')(({ theme }) => ({
@@ -97,7 +95,7 @@ export class Category extends React.Component {
9795
mathMlOptions = {},
9896
} = this.props;
9997
const isCategoryHeaderDisabled = !!alternateResponseIndex || alternateResponseIndex === 0;
100-
98+
10199
return (
102100
<StyledCard isDuplicated={isDuplicated}>
103101
<span>

packages/categorize/configure/src/design/categories/droppable-placeholder.jsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ const log = debug('@pie-element:categorize:configure');
1111
const HelperText = styled('div')(({ theme }) => ({
1212
display: 'flex',
1313
alignItems: 'center',
14+
justifyContent: 'center',
1415
fontSize: theme.typography.fontSize - 2,
1516
color: `rgba(${theme.palette.common.black}, 0.4)`,
1617
width: '100%',
@@ -19,10 +20,6 @@ const HelperText = styled('div')(({ theme }) => ({
1920

2021
const Helper = () => <HelperText>Drag your correct answers here</HelperText>;
2122

22-
const DroppablePlaceholderContainer = styled('div')({
23-
minHeight: '100px',
24-
});
25-
2623
const Previews = ({ alternateResponseIndex, category, choices, onDeleteChoice }) => (
2724
<React.Fragment>
2825
{(choices || []).map((c, index) =>
@@ -68,7 +65,6 @@ const DroppablePlaceHolder = ({
6865

6966
return (
7067
<div ref={setNodeRef}>
71-
<DroppablePlaceholderContainer>
7268
<PlaceHolder
7369
isOver={isOver}
7470
extraStyles={{
@@ -87,7 +83,6 @@ const DroppablePlaceHolder = ({
8783
/>
8884
)}
8985
</PlaceHolder>
90-
</DroppablePlaceholderContainer>
9186
</div>
9287
);
9388
};

packages/categorize/configure/src/design/categories/index.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ const CategoriesContainer = styled('div')(({ theme }) => ({
2020

2121
const CategoriesHolder = styled('div')(({ theme }) => ({
2222
display: 'grid',
23-
gridRowGap: `${theme.spacing(1)}px`,
24-
gridColumnGap: `${theme.spacing(1)}px`,
23+
gridRowGap: theme.spacing(1),
24+
gridColumnGap: theme.spacing(1),
2525
}));
2626

2727
const StyledTooltip = styled(Tooltip)(({ theme }) => ({

0 commit comments

Comments
 (0)