Skip to content

Commit 2129fd8

Browse files
authored
Merge branch 'master' into fix/faheemonhub/update-meshery-cloud-design
2 parents 698a9a1 + 997b552 commit 2129fd8

20 files changed

Lines changed: 251 additions & 6 deletions

File tree

CONTRIBUTING-gitflow.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ While this isn't an absolutely necessary step, if you plan on doing anything mor
1414
## Add 'upstream' repo to list of remotes
1515

1616
```
17-
git remote add upstream https://github.com/layer5io/meshery.git
17+
git remote add upstream https://github.com/layer5io/sistent.git
1818
```
1919

20-
("meshery" is used as the example repo. Be sure to reference the _actual_ repo you're contributing to e.g. "meshery-linkerd").
20+
Note: Replace "sistent" with the actual repository name if contributing to a different project under Layer5, such as "docs"
2121

2222
## Verify the new remote named 'upstream'
2323

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ build:
6767

6868
```
6969
attach sistent to your project:
70-
npm install [path to sistent repo ]
70+
npm install <path-to-sistent-on-local-machine>
7171
```
7272

7373
> [!NOTE]

src/custom/ResourceDetailFormatters/styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export const CodeFormatterPre = styled('pre')(({ theme }) => ({
189189
wordBreak: 'break-all',
190190
margin: 0,
191191
padding: '0.5rem',
192-
maxWidth: '-moz-available'
192+
maxWidth: '100%'
193193
}));
194194

195195
export const TextValue = styled(Box)({

src/custom/ResponsiveDataTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const dataTableTheme = (theme: Theme, backgroundColor?: string) =>
152152
MuiPaper: {
153153
styleOverrides: {
154154
root: {
155-
maxWidth: '-moz-available'
155+
maxWidth: '100%'
156156
}
157157
}
158158
},

src/custom/Workspaces/styles.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ export const DescriptionGrid = styled(Grid)({
344344
});
345345

346346
export const AllocationColumnGrid = styled(Grid)({
347-
width: '-moz-available'
347+
width: '100%'
348348
});
349349

350350
export const CardWrapper = styled(Card)(({ theme }) => ({
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import {
2+
DEFAULT_FILL_NONE,
3+
DEFAULT_HEIGHT,
4+
DEFAULT_STROKE,
5+
DEFAULT_WIDTH
6+
} from '../../constants/constants';
7+
import { IconProps } from '../types';
8+
9+
export const CaretDownIcon = ({
10+
width = DEFAULT_WIDTH,
11+
height = DEFAULT_HEIGHT,
12+
fill = DEFAULT_FILL_NONE,
13+
stroke = DEFAULT_STROKE,
14+
...props
15+
}: IconProps): JSX.Element => {
16+
return (
17+
<svg
18+
xmlns="http://www.w3.org/2000/svg"
19+
viewBox="0 0 320 512"
20+
width={width}
21+
height={height}
22+
{...props}
23+
>
24+
<path
25+
d="M137.4 374.6c12.5 12.5 32.8 12.5 45.3 0l128-128c9.2-9.2 11.9-22.9 6.9-34.9s-16.6-19.8-29.6-19.8L32 192c-12.9 0-24.6 7.8-29.6 19.8s-2.2 25.7 6.9 34.9l128 128z"
26+
fill={fill}
27+
stroke={stroke}
28+
/>
29+
</svg>
30+
);
31+
};
32+
33+
export default CaretDownIcon;

src/icons/CaretDown/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as CaretDownIcon } from './CaretDownIcon';
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import {
2+
DEFAULT_FILL_NONE,
3+
DEFAULT_HEIGHT,
4+
DEFAULT_STROKE,
5+
DEFAULT_WIDTH
6+
} from '../../constants/constants';
7+
import { IconProps } from '../types';
8+
9+
export const DatabaseIcon = ({
10+
width = DEFAULT_WIDTH,
11+
height = DEFAULT_HEIGHT,
12+
fill = DEFAULT_FILL_NONE,
13+
stroke = DEFAULT_STROKE,
14+
...props
15+
}: IconProps): JSX.Element => {
16+
return (
17+
<svg
18+
xmlns="http://www.w3.org/2000/svg"
19+
viewBox="0 0 448 512"
20+
width={width}
21+
height={height}
22+
{...props}
23+
>
24+
<path
25+
d="M448 80v48c0 44.2-100.3 80-224 80S0 172.2 0 128V80C0 35.8 100.3 0 224 0s224 35.8 224 80zM393.2 214.7c20.8-7.4 39.9-16.9 54.8-28.6V288c0 44.2-100.3 80-224 80S0 332.2 0 288V186.1c14.9 11.8 34 21.2 54.8 28.6C99.7 230.7 159.5 240 224 240s124.3-9.3 169.2-25.3zM0 346.1c14.9 11.8 34 21.2 54.8 28.6C99.7 390.7 159.5 400 224 400s124.3-9.3 169.2-25.3c20.8-7.4 39.9-16.9 54.8-28.6v85.9c0 44.2-100.3 80-224 80S0 476.2 0 432v-85.9z"
26+
fill={fill}
27+
stroke={stroke}
28+
/>
29+
</svg>
30+
);
31+
};
32+
33+
export default DatabaseIcon;

src/icons/Database/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default as DatabaseIcon } from './DatabaseIcon';

src/icons/File/FileIcon.tsx

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import {
2+
DEFAULT_FILL_NONE,
3+
DEFAULT_HEIGHT,
4+
DEFAULT_STROKE,
5+
DEFAULT_WIDTH
6+
} from '../../constants/constants';
7+
import { IconProps } from '../types';
8+
9+
export const FileIcon = ({
10+
width = DEFAULT_WIDTH,
11+
height = DEFAULT_HEIGHT,
12+
fill = DEFAULT_FILL_NONE,
13+
stroke = DEFAULT_STROKE,
14+
...props
15+
}: IconProps): JSX.Element => {
16+
return (
17+
<svg
18+
xmlns="http://www.w3.org/2000/svg"
19+
viewBox="0 0 384 512"
20+
width={width}
21+
height={height}
22+
{...props}
23+
>
24+
<path
25+
d="M64 0C28.7 0 0 28.7 0 64L0 448c0 35.3 28.7 64 64 64l256 0c35.3 0 64-28.7 64-64l0-288-128 0c-17.7 0-32-14.3-32-32L224 0 64 0zM256 0l0 128 128 0L256 0zM80 64l64 0c8.8 0 16 7.2 16 16s-7.2 16-16 16L80 96c-8.8 0-16-7.2-16-16s7.2-16 16-16zm0 64l64 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-64 0c-8.8 0-16-7.2-16-16s7.2-16 16-16zm16 96l192 0c17.7 0 32 14.3 32 32l0 64c0 17.7-14.3 32-32 32L96 352c-17.7 0-32-14.3-32-32l0-64c0-17.7 14.3-32 32-32zm0 32l0 64 192 0 0-64L96 256zM240 416l64 0c8.8 0 16 7.2 16 16s-7.2 16-16 16l-64 0c-8.8 0-16-7.2-16-16s7.2-16 16-16z"
26+
fill={fill}
27+
stroke={stroke}
28+
/>
29+
</svg>
30+
);
31+
};
32+
33+
export default FileIcon;

0 commit comments

Comments
 (0)