Skip to content

Commit

Permalink
🪢 Merge 2.1.0 into dev (Joystream#4690)
Browse files Browse the repository at this point in the history
  • Loading branch information
thesan authored Dec 8, 2023
2 parents 0cc8324 + 7d92ed8 commit 5d255ae
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 12 deletions.
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.1.0] - 2023-12-08

### Added
- Display error messages when a page or a modal crashes instead of crashing the whole app.
- Make some members social links clickable.

### Fixed
- Runtime upgrade proposal creation.
- Various UI bugs on responsive devices.

### Changed
- Expand the size of the Signal side pane.
- Rename Twitter to X.

## [2.0.2] - 2023-11-27

### Remove
- Remove forum activities button.

## [2.0.1] - 2023-11-24

### Fixed
- Some proposal page breaking on opening their rationale.

## [2.0.0 (Notifications and RWD)][2.0.0] - 2023-11-23

### Added
Expand Down Expand Up @@ -225,7 +249,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.1.1] - 2022-12-02

[unreleased]: https://github.com/Joystream/pioneer/compare/v2.0.0...HEAD
[unreleased]: https://github.com/Joystream/pioneer/compare/v2.1.0...HEAD
[2.1.0]: https://github.com/Joystream/pioneer/compare/v2.0.2...v2.1.0
[2.0.2]: https://github.com/Joystream/pioneer/compare/v2.0.1...v2.0.2
[2.0.1]: https://github.com/Joystream/pioneer/compare/v2.0.0...v2.0.1
[2.0.0]: https://github.com/Joystream/pioneer/compare/v1.9.0...v2.0.0
[1.9.0]: https://github.com/Joystream/pioneer/compare/v1.8.0...v1.9.0
[1.8.0]: https://github.com/Joystream/pioneer/compare/v1.7.0...v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@joystream/pioneer",
"version": "2.0.0",
"version": "2.1.0",
"license": "GPL-3.0-only",
"scripts": {
"build": "node --max_old_space_size=4096 ./build.js",
Expand Down
10 changes: 1 addition & 9 deletions packages/ui/src/app/pages/Forum/Forum.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'

import { PageLayout } from '@/app/components/PageLayout'
import { ButtonGhost } from '@/common/components/buttons'
import { PageTitle } from '@/common/components/page/PageTitle'
import { useToggle } from '@/common/hooks/useToggle'
import { ForumMain } from '@/forum/components/category'
Expand All @@ -15,14 +14,7 @@ export const Forum = () => {
return (
<PageLayout
header={
<ForumPageHeader
title={<PageTitle>Forum</PageTitle>}
buttons={
<ButtonGhost size="medium" onClick={toggle}>
Forum Activities
</ButtonGhost>
}
>
<ForumPageHeader title={<PageTitle>Forum</PageTitle>}>
<ForumTabs />
</ForumPageHeader>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ const normalFontSize = ({ size }: MarkdownPreviewStylesProps) => {
const normalColor = ({ isReply }: MarkdownPreviewStylesProps) => Colors.Black[isReply ? 800 : 700]

export const MarkdownPreviewStyles = createGlobalStyle<MarkdownPreviewStylesProps>`
* {
word-break: normal;
}
.markdown-preview {
width: 100%;
}
Expand Down Expand Up @@ -188,7 +192,6 @@ export const MarkdownPreviewStyles = createGlobalStyle<MarkdownPreviewStylesProp
border-spacing: 0;
border-collapse: collapse;
display: block;
width: max-content;
max-width: 100%;
overflow: auto;
margin-top: 8px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const RationaleSection = styled(RowGapBlock).attrs({ gap: 24 })`
background: ${Colors.Black[50]};
border: 1px solid ${Colors.Black[200]};
border-radius: ${BorderRad.s};
overflow: auto;
`

const RationaleToggle = styled.label`
Expand Down

0 comments on commit 5d255ae

Please sign in to comment.