fix: resolve merge conflicts and fix mobile responsive layout#1744
Closed
IshitaSingh0822 wants to merge 7 commits into
Closed
fix: resolve merge conflicts and fix mobile responsive layout#1744IshitaSingh0822 wants to merge 7 commits into
IshitaSingh0822 wants to merge 7 commits into
Conversation
…ines, revert lockfile
- Custom branded not-found.tsx (404) with Go to Dashboard + Go Home buttons - Updated error.tsx (500) with error digest, Try Again, and nav buttons - New ErrorBoundary component with section-level error cards - Wrap all dashboard sections in ErrorBoundary
- Fix unresolved merge conflicts in page.tsx, DashboardHeader.tsx, globals.css - Add overflow-x: hidden to html/body to prevent horizontal scroll - Stack dashboard action buttons vertically on mobile with min-h-[44px] touch targets - Fix DashboardHeader right section overflow on narrow screens - Fix Footer grid: 2-col on mobile, 4-col only at lg breakpoint - Add min-height: 44px to .primary-button and .secondary-button - Tighten section scroll-mt and spacing for mobile navbar height Closes #<your-issue-number>
|
@IshitaSingh0822 is attempting to deploy a commit to the PRIYANSHU DOSHI's projects Team on Vercel. A member of the Team first needs to authorize it. |
github-actions
Bot
added
gssoc26
GSSoC Label Checklist 🏷️@Priyanshu-byte-coder — please apply the appropriate labels before merging: Difficulty (pick one):
Quality (optional):
Validation (required to score):
|
Owner
|
Closing — this PR contains unresolved git conflict markers ( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixed mobile responsive layout across the dashboard — resolved unresolved git merge conflicts in
page.tsx,DashboardHeader.tsx, andglobals.css, and addressed all mobile breakpoint issues causing horizontal overflow, broken grids, and non-tappable buttons.Closes #1302
Type of Change
Changes Made
src/app/dashboard/page.tsx,src/components/DashboardHeader.tsx, andsrc/app/globals.cssoverflow-x: hiddenandmax-width: 100vwtohtml/bodyto eliminate horizontal scroll on all pagesmin-h-[44px]touch targetsDashboardHeaderright section overflowing on narrow screensFootergrid: 2-column on mobile, 4-column only atlgbreakpointmin-height: 44pxto.primary-buttonand.secondary-buttongloballyHow to Test
Screenshots (if UI change)
N/A — use Chrome DevTools mobile emulator to verify
Checklist
npm run lintpasses locallynpm run type-check)Accessibility Checklist
Additional Notes
The merge conflicts in the codebase were the root cause of compile failures on mobile. All layout fixes use Tailwind's
sm:,md:, andlg:responsive prefixes — no custom CSS breakpoints added.