fix: resolve merge conflicts for v1.1.0-a release #164
Conversation
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
…sponsive feat: mobile responsive design (Issue openscan-explorer#114)
…t-151-feat/mobile-responsive Revert "feat: mobile responsive design (Issue openscan-explorer#114)"
Priority given to dev branch code over main to preserve: - Mobile responsive navbar with hamburger menu - DevTools page styling and structure - Footer component - Address header component - Blocks and transactions pages
|
🚀 Preview: https://pr-164--openscan.netlify.app |
MatiasOS
approved these changes
Jan 20, 2026
Merged
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.
Description
Resolves merge conflicts between
mainanddevbranches for the v1.1.0-a release, prioritizing code from thedevbranch to preserve bun/vite migration and mobile responsive features.Related Issue
Closes #150
Type of Change
Changes Made
mainintodevbranchpackage.json(kept vite devDependencies, removed webpack)package-lock.json(bun uses bun.lock)src/files from dev branch to preserve:Screenshots (if applicable)
N/A
Checklist
npm run format:fixandnpm run lint:fixnpm run typecheckwith no errorsnpm run test:runAdditional Notes
This PR ensures that the
devbranch code takes priority overmainbranch code, preserving all the recent work on bun/vite migration and mobile responsive features.