diff --git a/src/index.less b/src/index.less index 79ae1a2..b3f9380 100644 --- a/src/index.less +++ b/src/index.less @@ -102,6 +102,10 @@ --table-profit-color: 38, 165, 78; } + h1{ + padding: 0 16px; + } + .ant-btn-link { color: rgb(var(--pro-link-color)); } @@ -399,12 +403,6 @@ h1.ant-typography { } } -@media only screen and (max-width: 700px) { - .SearchContainer { - display: initial; - } -} - .MobilePosition { display: none; @@ -421,15 +419,16 @@ h1.ant-typography { } } - &:not(:last-child) { - margin-bottom: 16px; - } + //&:not(:last-child) { + // margin-bottom: 16px; + //} .title-container { display: flex; justify-content: space-between; width: 100%; - padding: 8px 20px; + padding: 8px 0; + //padding: 8px 20px; } .title { @@ -723,12 +722,20 @@ header { } @media only screen and (max-width: 700px) { + h1.ant-typography{ + margin-bottom: 0; + } + + .body-content > * { + padding: 0 16px; + } + .widget { width: 100%; /*padding: 16px 20px;*/ padding: 8px 20px; border-radius: 20px; - margin-top: 16px; + //margin-top: 16px; } .widget .widget_header { @@ -756,6 +763,10 @@ header { display: block; } + //.slick-slide, .SearchContainer, h1{ + // padding: 0 16px; + //} + .MobileSummaryCarousel, .ant-carousel { display: block; } @@ -764,6 +775,10 @@ header { display: block; } + .SearchContainer { + display: block; + } + .mobile-position-spinner { display: block; } @@ -777,11 +792,13 @@ header { } .body-content { - padding: 0 16px 16px !important; - } - - .Diary { - padding: 0; /* 16px; */ + & > *{ + padding: 0 16px; + } + padding: 0 !important; + display: flex; + flex-direction: column; + gap: 16px; } .collapsed-row { diff --git a/src/pages/Analytics/Analytics.tsx b/src/pages/Analytics/Analytics.tsx index 55589cd..b82b43d 100644 --- a/src/pages/Analytics/Analytics.tsx +++ b/src/pages/Analytics/Analytics.tsx @@ -108,8 +108,8 @@ const Analytics: FC = ({getIsinBySymbol, getListSectionBySymbol, data, a return <> Аналитика - +
{/*
*/} {/*
Reasons
*/} {/* = ({getIsinBySymbol, getListSectionBySymbol, data, a {/* options={reasonOptions}*/} {/* />*/} {/*
*/} -
+
diff --git a/src/pages/Diary/Diary.tsx b/src/pages/Diary/Diary.tsx index ddd53d5..7ca003b 100644 --- a/src/pages/Diary/Diary.tsx +++ b/src/pages/Diary/Diary.tsx @@ -971,43 +971,45 @@ const Diary: FC = ({ setSearchParams(searchParams); } - return
-
-
-
{moment(summary.openDate).format('DD.MM.YYYY')}
-
-
0 ? 'profit' : 'loss'}`}>{summary.PnL > 0 ? '+' : ''}{moneyFormat(summary.PnL)} - {/*{shortNumberFormat(netProfitPercent)}%*/} + return
+
+
+
+
{moment(summary.openDate).format('DD.MM.YYYY')}
+
+
0 ? 'profit' : 'loss'}`}>{summary.PnL > 0 ? '+' : ''}{moneyFormat(summary.PnL)} + {/*{shortNumberFormat(netProfitPercent)}%*/} +
-
- {dayPositions.map(dp => -
handleSelectTicker(dp)}> -
- -
-
{dp?.symbol}
-
- {moment(dp?.openDate).format('HH:mm:ss')} + {dayPositions.map(dp => +
handleSelectTicker(dp)}> +
+ +
+
{dp?.symbol}
+
+ {moment(dp?.openDate).format('HH:mm:ss')} +
-
-
-
0 ? 'rgba(var(--table-profit-color),1)' : 'rgba(var(--table-loss-color),1)'}}> - {moneyFormat(dp?.PnL || 0)} - {`${numberToPercent(dp?.PnLPercent)}%`} +
+
0 ? 'rgba(var(--table-profit-color),1)' : 'rgba(var(--table-loss-color),1)'}}> + {moneyFormat(dp?.PnL || 0)} + {`${numberToPercent(dp?.PnLPercent)}%`} +
+
на сумму {moneyFormat(dp?.volume, 0)}
-
на сумму {moneyFormat(dp?.volume, 0)}
-
-
)} +
)} +
} @@ -1180,47 +1182,50 @@ const Diary: FC = ({
{boardsWithLabel.filter(bwl => securitiesGroupByBoard[bwl.value]?.length).map(bwl => -
-
-
-
{bwl.label}
- {(securitiesGroupByBoard[bwl.value] || []).length > 3 &&
- {!hideMap[bwl.value] && } - {hideMap[bwl.value] && } -
} +
+
+
+
+
{bwl.label}
+ {(securitiesGroupByBoard[bwl.value] || []).length > 3 &&
+ {!hideMap[bwl.value] && } + {hideMap[bwl.value] && } +
} +
-
- {(securitiesGroupByBoard[bwl.value] || []).filter((_, i) => !hideMap[bwl.value] ? i < 3 : true).map(dp => -
handleSelectTicker(dp)}> -
- -
-
{dp?.description}
-
- {dp?.symbol} + {(securitiesGroupByBoard[bwl.value] || []).filter((_, i) => !hideMap[bwl.value] ? i < 3 : true).map(dp => +
handleSelectTicker(dp)}> +
+ +
+
{dp?.description}
+
+ {dp?.symbol} +
-
- {/*
*/} - {/*
0 ? 'rgba(var(--table-profit-color),1)' : 'rgba(var(--table-loss-color),1)'}}>*/} - {/* {moneyFormat(dp?.PnL || 0)}*/} - {/* {`${numberToPercent(dp?.PnLPercent)}%`}*/} - {/*
*/} - {/*
на сумму {moneyFormat(dp?.volume, 0)}
*/} - {/*
*/} -
)} + {/*
*/} + {/*
0 ? 'rgba(var(--table-profit-color),1)' : 'rgba(var(--table-loss-color),1)'}}>*/} + {/* {moneyFormat(dp?.PnL || 0)}*/} + {/* {`${numberToPercent(dp?.PnLPercent)}%`}*/} + {/*
*/} + {/*
на сумму {moneyFormat(dp?.volume, 0)}
*/} + {/*
*/} +
)} + +
)} @@ -1275,7 +1280,7 @@ const Diary: FC = ({ const listHeight = useMemo(() => isMobile ? height - 186 : height - 56, [isMobile, height]); return ( -
+ <> Дневник @@ -1674,7 +1679,7 @@ const Diary: FC = ({ /> {!isLoading && dayPositions.map(dp => )} } -
+ ); };