Skip to content

Studio: fix setting menu not open if no sites #340

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

Merged
kozer merged 3 commits into from
Jul 10, 2024
Merged

Studio: fix setting menu not open if no sites #340

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cdba40
Studio: fix setting menu not open if no sites
kozer Jul 4, 2024
edc73a4
Update: Fix bug based on comments
kozer Jul 5, 2024
a52c033
Merge branch 'trunk' into fix/settings_not_open_no_site
kozer Jul 10, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Studio: fix setting menu not open if no sites
  • Loading branch information
@kozer
kozer committed Jul 4, 2024
commit 8cdba40bfce66b1965b13f4fa90e93dc4f849728
2 changes: 2 additions & 0 deletions src/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import MainSidebar from './main-sidebar';
import Onboarding from './onboarding';
import { SiteContentTabs } from './site-content-tabs';
import WindowsTitlebar from './windows-titlebar';
import UserSettings from './user-settings';

export default function App() {
useLocalizationSupport();
Expand Down Expand Up @@ -45,6 +46,7 @@ export default function App() {
>
<SiteContentTabs />
</main>
<UserSettings />
Comment thread
kozer marked this conversation as resolved.
Outdated
</HStack>
</VStack>
);
Expand Down
2 changes: 0 additions & 2 deletions src/components/main-sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import offlineIcon from './offline-icon';
import { RunningSites } from './running-sites';
import SiteMenu from './site-menu';
import Tooltip from './tooltip';
import UserSettings from './user-settings';
import { WordPressLogo } from './wordpress-logo';

interface MainSidebarProps {
Expand Down Expand Up @@ -143,7 +142,6 @@ export default function MainSidebar( { className }: MainSidebarProps ) {
<div className="mb-[6px]">
<SidebarAuthFooter />
</div>
<UserSettings />
</div>
</div>
</div>
Expand Down