Skip to content

Commit 325d599

Browse files
authored
Merge branch 'layer5io:master' into add-slack-icon
2 parents 4091f37 + e50e979 commit 325d599

File tree

7 files changed

+45
-24
lines changed

7 files changed

+45
-24
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ assignees: ''
3737
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
3838
- 📚 [Instructions for contributing to documentation](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#documentation-contribution-flow)
3939
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
40-
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
40+
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
4141
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/ci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ assignees: ''
2727
#### Contributor [Guides](https://docs.meshery.io/project/contributing) and Resources
2828

2929
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
30-
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
30+
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
3131
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ assignees: ''
1717
- 📚 [Instructions for contributing to documentation](https://docs.meshery.io/project/contributing/contributing-docs)
1818
- Meshery documentation [site](https://docs.meshery.io/) and [source](https://github.com/meshery/meshery/tree/master/docs)
1919
- 🛠 [Meshery Build & Release Strategy](https://docs.meshery.io/project/build-and-release)
20-
- 🎨Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
20+
- 🎨Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)
2121
- 🙋🏾🙋🏼 Questions: [Layer5 Discussion Forum](https://discuss.layer5.io) and [Layer5 Community Slack](http://slack.layer5.io)

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ assignees: ''
3030

3131
**[Contributor Guide](https://docs.meshery.io/project/contributing)**
3232

33-
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/qJy1c95qirjgWQODApilR9)
33+
- 🎨 Wireframes and [designs for Sistent site](https://www.figma.com/file/ekm0Hh6M25bSKpP5BcIJom/Sistent-Design-System?type=design&node-id=596%3A5227&mode=design&t=8MExPykHN1vQFCTZ-1) in Figma [(open invite)](https://www.figma.com/team_invite/redeem/GvB8SudhEOoq3JOvoLaoMs)

.github/dependabot.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Basic `dependabot.yml` file with
2+
# minimum configuration for two package managers
3+
4+
version: 2
5+
updates:
6+
# Enable version updates for npm
7+
- package-ecosystem: "npm"
8+
# Look for `package.json` and `lock` files in the `root` directory
9+
directory: "/"
10+
# Check the npm registry for updates every day (weekdays)
11+
schedule:
12+
interval: "daily"
13+
14+
# # Enable version updates for Docker
15+
# - package-ecosystem: "docker"
16+
# # Look for a `Dockerfile` in the `root` directory
17+
# directory: "/"
18+
# # Check for updates once a week
19+
# schedule:
20+
# interval: "weekly"

.github/workflows/notify-dependents.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
cache-dependency-path: '**/package-lock.json'
7878
- name: Make changes to pull request
7979
working-directory: ui
80-
run: npm install @sistent/sistent@${{ env.RELEASE_VERSION }}
80+
run: npm install @sistent/sistent@^${{ env.RELEASE_VERSION }}
8181
- name: Create Pull Request
8282
id: cpr
8383
uses: peter-evans/create-pull-request@v8
@@ -120,7 +120,7 @@ jobs:
120120
cache-dependency-path: '**/package-lock.json'
121121
- name: Make changes to pull request
122122
working-directory: meshmap
123-
run: npm install @sistent/sistent@${{ env.RELEASE_VERSION }}
123+
run: npm install @sistent/sistent@^${{ env.RELEASE_VERSION }}
124124
- name: Create Pull Request
125125
id: cpr
126126
uses: peter-evans/create-pull-request@v8
@@ -163,7 +163,7 @@ jobs:
163163
cache: "npm"
164164
cache-dependency-path: '**/package-lock.json'
165165
- name: Make changes to pull request
166-
run: npm install @sistent/sistent@${{ env.RELEASE_VERSION }} --legacy-peer-deps
166+
run: npm install @sistent/sistent@^${{ env.RELEASE_VERSION }} --legacy-peer-deps
167167
- name: Create Pull Request
168168
id: cpr
169169
uses: peter-evans/create-pull-request@v8
@@ -206,7 +206,7 @@ jobs:
206206
cache-dependency-path: '**/package-lock.json'
207207
- name: Make changes to pull request
208208
working-directory: ui
209-
run: npm install @sistent/sistent@${{ env.RELEASE_VERSION }}
209+
run: npm install @sistent/sistent@^${{ env.RELEASE_VERSION }}
210210
- name: Create Pull Request
211211
id: cpr
212212
uses: peter-evans/create-pull-request@v8

src/custom/DashboardWidgets/RecentDesignWidget.tsx

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { Modal, ModalBody } from '../Modal';
2424
interface Resource {
2525
link: string;
2626
name: string;
27-
icon?: string;
27+
icon?: React.ReactNode;
2828
external?: boolean;
2929
timestamp: string;
3030
}
@@ -77,18 +77,17 @@ const ResourcesList = styled('ul')({
7777
margin: '0'
7878
});
7979

80-
const ResourceItem = styled('li')({
80+
const ResourceItem = styled('li')(({ theme }) => ({
8181
listStyleType: 'none',
8282
display: 'flex',
8383
flexDirection: 'row',
84-
alignItems: 'center'
85-
});
84+
alignItems: 'center',
85+
gap: '0.25rem',
8686

87-
const ResourceIcon = styled('img')({
88-
width: '12px',
89-
height: '12px',
90-
marginRight: '.25rem'
91-
});
87+
'&:hover': {
88+
color: theme.palette.primary.main
89+
}
90+
}));
9291

9392
const ResourceLink = styled(Link)({
9493
fontSize: '1rem',
@@ -97,7 +96,12 @@ const ResourceLink = styled(Link)({
9796
overflow: 'hidden',
9897
textOverflow: 'ellipsis',
9998
maxWidth: '12rem',
100-
textDecoration: 'none'
99+
textDecoration: 'none',
100+
color: 'inherit',
101+
102+
'&:hover': {
103+
textDecoration: 'none'
104+
}
101105
});
102106

103107
const TimestampText = styled(Typography)({
@@ -201,12 +205,9 @@ const DesignCard: React.FC<DesignCardProps> = ({
201205
<ResourcesList>
202206
{resources.map((item) => (
203207
<ResourceItem key={item.link}>
204-
{item.icon && (
205-
<ResourceIcon
206-
src={item.icon} // Use item.icon as the source of the image
207-
alt={`Icon for ${item.name}`}
208-
/>
209-
)}
208+
<Box sx={{ flexShrink: 0, display: 'flex', alignItems: 'center' }}>
209+
{item.icon}
210+
</Box>
210211
<ResourceLink href={item.link}>{item.name}</ResourceLink>
211212

212213
{item.external == true ? (

0 commit comments

Comments
 (0)