cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-25 16:40:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix: Add bottom navigation padding to settings.

Browse source 
Fix: New members joining don't show.
This commit is contained in:
Paul 2021-07-05 17:55:08 +01:00
parent f1d413b6ef
commit ed12d5f4f9
9 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -94,7 +94,7 @@
"react-router-dom": "^5.2.0",
"react-scroll": "^1.8.2",
"redux": "^4.1.0",
"revolt.js": "4.3.3-alpha.8",
"revolt.js": "4.3.3-alpha.9",
"rimraf": "^3.0.2",
"sass": "^1.35.1",
"shade-blend-color": "^1.0.0",

2
src/components/navigation/BottomNavigation.tsx
View file

@ -14,8 +14,8 @@ import IconButton from "../ui/IconButton";
const NavigationBase = styled.div`
z-index: 100;
height: 50px;
display: flex;
height: var(--bottom-navigation-height);
background: var(--secondary-background);
`;

2
src/components/navigation/items/Item.module.scss
View file

@ -150,7 +150,7 @@
height: 40px;
&.compact {
height: 50px;
height: var(--bottom-navigation-height);
> div {
gap: 20px;

8
src/components/navigation/right/MemberSidebar.tsx
View file

@ -233,7 +233,10 @@ export function ServerMemberSidebar({
<GenericSidebarBase>
<GenericSidebarList>
<ChannelDebugInfo id={channel._id} />
<Category
<div>
{!members && <Preloader type="ring" />}
</div>
{ members && <Category
variant="uniform"
text={
<span>
@ -241,8 +244,7 @@ export function ServerMemberSidebar({
{users.length}
</span>
}
/>
{!members && <Preloader type="ring" />}
/> }
{members && users.length === 0 && <img src={placeholderSVG} />}
{users.map(
(user) =>

4
src/pages/friends/Friend.module.scss
View file

@ -28,6 +28,10 @@
flex-direction: column;
justify-content: center;
}
&[data-mobile="true"] {
padding-bottom: var(--bottom-navigation-height);
}
}
.friend {

4
src/pages/friends/Friends.tsx
View file

@ -121,7 +121,7 @@ export default function Friends() {
*/}
</div>
</Header>
<div className={styles.list} data-empty={isEmpty}>
<div className={styles.list} data-empty={isEmpty} data-mobile={isTouchscreenDevice}>
{isEmpty && (
<>
<img src="https://img.insrt.uk/xexu7/XOPoBUTI47.png/raw" />
@ -210,6 +210,8 @@ export default function Friends() {
</CollapsibleSection>
);
})}
<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><h1>test</h1>
</div>
</>
);

2
src/pages/settings/Settings.module.scss
View file

@ -41,7 +41,7 @@
}
.content {
padding: 10px 12px 50px;
padding: 10px 12px var(--bottom-navigation-height);
}
}

2
src/styles/_variables.scss
View file

@ -4,4 +4,6 @@
--app-height: 100vh;
--codeblock-font: "Fira Code";
--sidebar-active: var(--secondary-background);
--bottom-navigation-height: 50px;
}

8
yarn.lock
View file

@ -3590,10 +3590,10 @@ reusify@^1.0.4:
resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
revolt.js@4.3.3-alpha.8:
version "4.3.3-alpha.8"
resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-4.3.3-alpha.8.tgz#2a191ffa9d4c304e328b5eb8d9dc1e13e1f99d9a"
integrity sha512-A6sjZ7cmeQuqS9otzANv+Rg4CfvpsTMoDARBwQuez4O7NPRopdWNHylUPo20UutAPzW9xoqVbF8673VlTu5Jag==
revolt.js@4.3.3-alpha.9:
version "4.3.3-alpha.9"
resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-4.3.3-alpha.9.tgz#7015793e465438a78b7e6e57a688be4e75f9c934"
integrity sha512-RIFexFJMInTeEvOGx+l0VPtzoFIcl3ruQN0NA2UFYiz1zoQ4J3KGmmt5ig/OK/mZTbTysyQx1LSIdmMs2yZBFw==
dependencies:
"@insertish/mutable" "1.1.0"
axios "^0.19.2"