diff --git a/package.json b/package.json index 48789f5a..6ce02db6 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@capacitor/android": "3.6.0", "@capacitor/app": "1.1.1", "@capacitor/core": "3.6.0", - "@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#30095e763d80e29168dc6ee1fe7515fd91065489", + "@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#c0ecfc0432d64993dee738b40e59c26898a98108", "@testing-library/dom": "9.0.1", "@testing-library/jest-dom": "5.14.1", "@testing-library/react": "14.0.0", diff --git a/public/assets/banners/banner-20.png b/public/assets/banners/banner-20.png new file mode 100644 index 00000000..6992f179 Binary files /dev/null and b/public/assets/banners/banner-20.png differ diff --git a/src/components/styled/views/Board.styled.jsx b/src/components/styled/views/Board.styled.jsx index b90370e2..b106e7c7 100644 --- a/src/components/styled/views/Board.styled.jsx +++ b/src/components/styled/views/Board.styled.jsx @@ -2049,30 +2049,26 @@ export const BoardForm = styled.div` border-top: none; margin: 0; clear: both; + padding-bottom: 25px; hr { - margin-top: 30px; - margin-bottom: 30px; + padding-top: 25px; } .op-container { - margin: 0 -5px; - padding: 5px; display: block; overflow: hidden; .op { display: inline; - margin: 4px 0; overflow: hidden; } .post-info-mobile { overflow: hidden; - padding: 5px; - margin: -5px -6px -5px -5px; display: block; clear: left; + padding: 5px; } .post-menu-button-mobile { @@ -2107,12 +2103,12 @@ export const BoardForm = styled.div` display: block; .file-thumb-mobile { - margin-left: 10px !important; - margin-right: 10px !important; + padding-left: 10px !important; + padding-right: 10px !important; text-decoration: none; float: left; - margin-bottom: 5% !important; - margin-top: 15px !important; + padding-bottom: 5% !important; + padding-top: 15px !important; } .file-info-mobile { @@ -2148,27 +2144,25 @@ export const BoardForm = styled.div` } .thread-icons-mobile { - margin-top: -1px; - margin-right: 2px; image-rendering: pixelated; } blockquote { - padding-top: 5px; display: block; - margin: 10px !important; + margin: 0; + padding: 10px; } .post-link-mobile { clear: both !important; padding: 5px; overflow: hidden; - margin: -5px; + /* margin: -5px; */ display: block !important; } .info-mobile { - margin-top: 8px; + padding-top: 8px; float: left; } @@ -2182,8 +2176,8 @@ export const BoardForm = styled.div` } .reply-container { - margin: 7px 2px 0; - padding-left: 0; + padding: 7px 7px 0 7px; + background-color: inherit; .button-mobile { float: right; @@ -2210,12 +2204,11 @@ export const BoardForm = styled.div` display: block; .file-thumb-mobile { - margin-left: 10px !important; - margin-right: 10px !important; + padding-left: 10px !important; + padding-right: 10px !important; text-decoration: none; float: left; - margin-bottom: 5px; - margin-top: 15px; + padding-top: 15px; } .file-info-mobile { @@ -2278,7 +2271,8 @@ export const BoardForm = styled.div` blockquote { display: block; - margin: 10px !important; + margin: 0; + padding: 10px; } } } @@ -3329,6 +3323,8 @@ export const BoardForm = styled.div` @media (max-width: 480px) { margin-bottom: 335px; + margin-left: -5px; + margin-right: -5px; .offline-mobile-sub { width: 16px; @@ -3343,21 +3339,10 @@ export const BoardForm = styled.div` display: none; } - hr { - margin-left: calc((100% - 100vw) / 2); - margin-right: calc((100% - 100vw) / 2); - } - .name-block { display: block; } - .post-info { - display: flex; - flex-wrap: wrap; - margin: 4px; - } - #bottombar-desktop { display: none; } diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx index 035b2592..2121f9bb 100755 --- a/src/components/views/Board.jsx +++ b/src/components/views/Board.jsx @@ -1740,7 +1740,8 @@ const Board = () => { ) : null} { if (editedComments[thread.cid]) { @@ -3139,11 +3140,7 @@ const Board = () => { })}
- {index === 0 && !subplebbit.rules && !subplebbit.description ? ( -
- ) : ( -
- )} +
@@ -3337,7 +3334,7 @@ const Board = () => { src='assets/sticky.gif' alt='Sticky' title='Sticky' - style={{ all: 'unset', marginBottom: '-2px', paddingLeft: '2px', imageRendering: 'pixelated' }} + style={{ all: 'unset', paddingBottom: '-2px', paddingLeft: '2px', imageRendering: 'pixelated' }} /> ) : null} {thread.locked ? ( @@ -3345,7 +3342,7 @@ const Board = () => { src='assets/closed.gif' alt='Closed' title='Closed' - style={{ all: 'unset', marginBottom: '-2px', paddingLeft: '2px', imageRendering: 'pixelated' }} + style={{ all: 'unset', paddingBottom: '-2px', paddingLeft: '2px', imageRendering: 'pixelated' }} /> ) : null} @@ -3415,7 +3412,7 @@ const Board = () => { {isMobileThreadThumbnailClicked[index] && commentMediaInfo.url ? (
@@ -3443,7 +3440,7 @@ const Board = () => { )} {commentMediaInfo?.type === 'video' || commentMediaInfo?.type === 'iframe' ? ( isMobileThreadThumbnailClicked[index] ? ( -
+
{ style={ isMobileThreadThumbnailClicked[index] || !thread.thumbnailUrl ? {} - : { width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px' } + : { width: displayWidthMobile, height: displayHeightMobile, paddingBottom: '25px' } } > {thread.thumbnailUrl ? ( @@ -3503,7 +3500,7 @@ const Board = () => { key={`mob-ft${thread.cid}`} className='file-thumb-mobile' style={ - isMobileThreadThumbnailClicked[index] ? {} : { width: displayWidthMobile, height: displayHeightMobile, marginBottom: '25px' } + isMobileThreadThumbnailClicked[index] ? {} : { width: displayWidthMobile, height: displayHeightMobile, paddingBottom: '25px' } } > { {isMobileThreadThumbnailClicked[index] ? (