Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the alignment of the navbar on mobile #283

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Updated the alignment of the navbar on mobile #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b5cdcc
This update makes the navbar align better on mobile.
varunv5000 Feb 1, 2022
c9415cd
Slight Ui fix
varunv5000 Feb 1, 2022
74ee2cb
Merge branch 'develop' into issue-282-navbar-mobile-ui
varunv5000 Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/react-app/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ function App(props) {

return (
<div className="App pb-20 bg-purple-darkpurple">
<div className="p-10 mx-auto flex flex-wrap">
<div className="p-10 mx-auto flex">
<a
href="/"
target="_blank"
Expand Down Expand Up @@ -541,7 +541,7 @@ function App(props) {
networkDisplay={networkDisplay}
hostToggleSwitch={
room && (
<div className="flex flex-col mt-5 px-7">
<div className="flex flex-col mt-5 md:px-7 order-last md:order-first">
<Space>
<Button
size="large"
Expand Down
10 changes: 7 additions & 3 deletions packages/react-app/src/components/Account/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,14 @@ export default function Account({
modalButtons.push(
<div key="first">
{isValidAddress(address) ? (
<div className="flex flex-row">
<div>
<div className="flex flex-col md:flex-row items-end">
{hostToggleSwitch}
<div className="flex flex-col mr-4">
<div className="flex flex-col mt-2 md:mt-0">
<label className="text-base">Select Network:</label>
{networkSelect}
</div>
<div className="flex md:ml-4 order-first md:order-last" >
<Dropdown.Button overlay={menu} icon={<DownOutlined />} trigger="click">
<Address
address={address}
Expand All @@ -94,6 +96,8 @@ export default function Account({
/>
</Dropdown.Button>
{networkDisplay}
</div>
</div>
</div>
) : (
""
Expand All @@ -104,7 +108,7 @@ export default function Account({
modalButtons.push(
<Button
key="loginbutton"
style={{ verticalAlign: "top", marginLeft: 8, marginTop: 4, width: width }}
style={{ verticalAlign: "top", position: "fixed", top: 20, right: 10, width: width }}
size="large"
onClick={loadWeb3Modal}
key="second"
Expand Down