diff --git a/src/components/Grid.jsx b/src/components/Grid.jsx index d72a77b..362bf76 100644 --- a/src/components/Grid.jsx +++ b/src/components/Grid.jsx @@ -1,8 +1,9 @@ export const Grid = ({children, ...other}) => { const gridContainerStyle = { display: 'grid', - columnGap: '4px', - rowGap: '4px', + margin: '8px', + justifyItems: 'stretch', + alignItems: 'stretch', ...other, } @@ -21,6 +22,7 @@ export const GridItem = ({children, row, col, rowSpan, colSpan, ...other}) => { gridColumnEnd: localCol + localColSpan, gridRowStart: localRow, gridRowEnd: localRow + localRowSpan, + padding: '4px', ...other, } diff --git a/src/images/logoSmall.svg b/src/images/logoSmall.svg index 5f8d747..b949a2b 100644 --- a/src/images/logoSmall.svg +++ b/src/images/logoSmall.svg @@ -1,125 +1,92 @@ -image/svg+xml \ No newline at end of file + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/images/pointer.svg b/src/images/pointer.svg index 62cc064..b9d368e 100644 --- a/src/images/pointer.svg +++ b/src/images/pointer.svg @@ -1,12 +1,14 @@ - - - - - - - - - + + + + + + + + + + - \ No newline at end of file diff --git a/src/services/api/services/FileService.ts b/src/services/api/services/FileService.ts index cd51ab2..0703783 100644 --- a/src/services/api/services/FileService.ts +++ b/src/services/api/services/FileService.ts @@ -51,7 +51,7 @@ companyName?: string, fileName?: string, begin?: string, end?: string, -skip?: number, +skip: number =0, take: number = 32, ): Promise { const result = await __request({ diff --git a/src/services/api/services/WellOperationService.ts b/src/services/api/services/WellOperationService.ts index 0fdbd49..e621494 100644 --- a/src/services/api/services/WellOperationService.ts +++ b/src/services/api/services/WellOperationService.ts @@ -48,7 +48,7 @@ begin?: string, end?: string, minDepth: number = -1.7976931348623157e+308, maxDepth: number = 1.7976931348623157e+308, -skip?: number, +skip: number =0, take: number = 32, ): Promise { const result = await __request({