Skip to content

Commit 0dd29a5

Browse files
authored
Merge pull request #789 from Lemoncode/dev
icons
2 parents 9538fb6 + b0fcba9 commit 0dd29a5

File tree

8 files changed

+39
-11
lines changed

8 files changed

+39
-11
lines changed

public/containers/mobile.svg

Lines changed: 4 additions & 4 deletions
Loading

public/icons/phCopy.svg

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

public/icons/phTreeViewDuotone.svg

Lines changed: 1 addition & 0 deletions
Loading

src/common/components/mock-components/front-components/timepickerinput/timepickerinput-shape.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import disabledClockIconSrc from '/icons/clock-disabled.svg';
1313

1414
const timepickerInputShapeRestrictions: ShapeSizeRestrictions = {
1515
minWidth: 100,
16-
minHeight: 50,
16+
minHeight: 38,
1717
maxWidth: -1,
18-
maxHeight: 50,
18+
maxHeight: 38,
1919
defaultWidth: 220,
20-
defaultHeight: 50,
20+
defaultHeight: 38,
2121
};
2222

2323
const shapeType: ShapeType = 'timepickerinput';
@@ -114,7 +114,7 @@ export const TimepickerInputShape = forwardRef<any, ShapeProps>(
114114
<Text
115115
text={text}
116116
x={10}
117-
y={(restrictedHeight - fontSize) / 2 + 2}
117+
y={(restrictedHeight - fontSize) / 2}
118118
width={availableWidth}
119119
fontFamily={BASIC_SHAPE.DEFAULT_FONT_FAMILY}
120120
fontSize={BASIC_SHAPE.DEFAULT_FONT_SIZE}

src/common/components/mock-components/front-containers/mobilephone-shape.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const MobilePhoneShape = forwardRef<any, ShapeProps>((props, ref) => {
4646

4747
const adornerIconSize = 20;
4848
const adornerPadding = 5;
49-
const adornerTotalWidth = adornerIconSize * 3 + 17 * 2 + 30;
49+
const adornerTotalWidth = adornerIconSize * 3 + screenMargin;
5050

5151
// Calculate inner screen coordinates (excluding frame margins)
5252
const screenX = margin + screenMargin; // Left edge of inner screen
@@ -62,7 +62,7 @@ export const MobilePhoneShape = forwardRef<any, ShapeProps>((props, ref) => {
6262
const signalX = adornerStartX + 17;
6363
const batteryX = adornerStartX + 20 * 2;
6464

65-
const timeX = adornerStartX + 23 * 3;
65+
const timeX = screenX + screenMargin;
6666
const timeY = adornerY + 4;
6767
const timeWidth = 40;
6868

@@ -88,7 +88,7 @@ export const MobilePhoneShape = forwardRef<any, ShapeProps>((props, ref) => {
8888
const now = new Date();
8989
setCurrentTime(
9090
now.toLocaleTimeString('es-ES', {
91-
hour: '2-digit',
91+
hour: 'numeric',
9292
minute: '2-digit',
9393
hour12: false,
9494
})

src/pods/properties/components/icon-selector/modal/icons.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,4 +2560,28 @@ export const iconCollection: IconInfo[] = [
25602560
searchTerms: ['calculator', 'math', 'arithmetic', 'compute', 'calculate'],
25612561
categories: ['IT'],
25622562
},
2563+
{
2564+
name: 'Tree view doutone',
2565+
filename: 'phTreeViewDuotone.svg',
2566+
searchTerms: ['tree', 'view', 'doutone'],
2567+
categories: ['IT'],
2568+
},
2569+
{
2570+
name: 'Square Split horizontal',
2571+
filename: 'phSquareSplitHorizontal.svg',
2572+
searchTerms: ['square', 'split', 'horizontal'],
2573+
categories: ['IT'],
2574+
},
2575+
{
2576+
name: 'Square Split vertical light',
2577+
filename: 'phSquareSplitVerticalLight.svg',
2578+
searchTerms: ['square', 'split', 'vertical'],
2579+
categories: ['IT'],
2580+
},
2581+
{
2582+
name: 'Copy',
2583+
filename: 'phCopy.svg',
2584+
searchTerms: ['copy', 'duplicate', 'clone'],
2585+
categories: ['IT'],
2586+
},
25632587
];

0 commit comments

Comments
 (0)