Skip to content

Commit 45ea6cf

Browse files
committed
Merge branch 'release-2.17.1' into release
2 parents b82e8f5 + 53ad474 commit 45ea6cf

File tree

6 files changed

+19
-6
lines changed

6 files changed

+19
-6
lines changed

client/modules/About/About.styles.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@ export const SectionItem = styled.div`
121121
& a {
122122
font-weight: 700;
123123
font-size: ${remSize(16)};
124+
text-decoration: underline;
124125
125126
&:hover {
126127
text-decoration: underline;
128+
text-decoration-thickness: 0.1em;
127129
}
128130
}
129131
@@ -176,6 +178,7 @@ export const ContactHandles = styled.p`
176178
177179
& a {
178180
color: ${prop('logoColor')};
181+
text-decoration: underline;
179182
180183
&:hover {
181184
text-decoration: underline;
@@ -202,9 +205,11 @@ export const Footer = styled.div`
202205
& a {
203206
margin: ${remSize(20)} 9.5% 0 0;
204207
color: ${prop('logoColor')};
208+
text-decoration: underline;
205209
206210
&:hover {
207211
text-decoration: underline;
212+
text-decoration-thickness: 0.1em;
208213
}
209214
}
210215

client/modules/IDE/components/CollectionList/CollectionListRow.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ const SketchsTableRow = styled.tr`
3434
3535
a {
3636
color: ${prop('primaryTextColor')};
37+
text-decoration: underline;
38+
39+
&:hover {
40+
text-decoration: underline;
41+
text-decoration-thickness: 0.1em;
42+
}
3743
}
3844
3945
&.is-deleted > * {

client/modules/User/components/CollectionItemRow.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ const CollectionItemRow = ({ collection, item, isOwner }) => {
1919
t('Collection.DeleteFromCollection', { name_sketch: name })
2020
)
2121
) {
22-
dispatch(removeFromCollection(collection.id, item.projectId));
22+
dispatch(removeFromCollection(collection.id, item.project.id));
2323
}
2424
};
2525

2626
const name = projectIsDeleted ? (
2727
<span>{t('Collection.SketchDeleted')}</span>
2828
) : (
29-
<Link to={`/${item.project.user.username}/sketches/${item.projectId}`}>
29+
<Link to={`/${item.project.user.username}/sketches/${item.project.id}`}>
3030
{item.project.name}
3131
</Link>
3232
);
@@ -64,7 +64,6 @@ CollectionItemRow.propTypes = {
6464
}).isRequired,
6565
item: PropTypes.shape({
6666
createdAt: PropTypes.string.isRequired,
67-
projectId: PropTypes.string.isRequired,
6867
isDeleted: PropTypes.bool.isRequired,
6968
project: PropTypes.shape({
7069
id: PropTypes.string.isRequired,

client/styles/components/_sketch-list.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,10 @@
148148

149149
.sketches-table__row a {
150150
@include themify() {
151+
text-decoration: underline;
151152
color: getThemifyVariable("primary-text-color");
152153
}
154+
153155
}
154156

155157
.sketches-table__row.is-deleted > * {
@@ -186,4 +188,5 @@
186188
@include themify() {
187189
color: getThemifyVariable("logo-color");
188190
}
191+
text-decoration-thickness: 0.1em;
189192
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "p5.js-web-editor",
3-
"version": "2.17.0",
3+
"version": "2.17.1",
44
"description": "The web editor for p5.js.",
55
"scripts": {
66
"clean": "rimraf dist",

0 commit comments

Comments
 (0)