-
Notifications
You must be signed in to change notification settings - Fork 28
Resolve PR 267 conflicts #287
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.
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
Conversation
Feature branding
- Resolved add/add conflicts in Claude workflow files - Updated docusaurus.config.js with new logo paths - Applied updated design system from dev branch in custom.css - Kept favicon.ico from dev branch (was deleted in main) - Successfully merged Release: 13 October 2025 changes
PR Review: Resolve PR 267 conflictsOverviewThis PR resolves merge conflicts from PR #267 by merging the dev branch into main. The changes primarily involve design system updates, workflow configurations, and branding assets. Critical Issues🔴 HIGH PRIORITY: Duplicate Content in Workflow FileFile: Issue: The entire workflow configuration is duplicated twice in the file. Lines 1-50 are identical to lines 51-100. Impact:
Fix Required: # Remove lines 51-100 (the duplicate section)
# Keep only lines 1-50Location: 🟡 MEDIUM PRIORITY: Duplicate Font DeclarationsFile: Issue: Font-face declarations for both "Hubot Sans" and "Syne" are defined twice (lines 9-48 and lines 50-90). Impact:
Fix Required: /* Remove duplicate @font-face blocks at lines 50-90 */Location: 🟡 MEDIUM PRIORITY: Duplicate CSS RulesFile: Issues Found:
Impact:
Recommended Fix: Code Quality Issues
|
PR Review: Resolve PR 267 conflictsOverviewThis PR resolves merge conflicts from PR #267 by merging the dev branch into main. The changes include workflow file cleanup, CSS design system updates, theme enhancements, and branding asset updates. 🐛 Critical Bug - Memory LeakFile: Issue: The return () => observer.disconnect(); // ❌ ReferenceError: observer is not definedImpact: This will cause a runtime error when the component unmounts. Fix Required: useEffect(() => {
const updateFavicon = () => {
const isDark = document.documentElement.getAttribute('data-theme') === 'dark';
const favicon = document.querySelector("link[rel='icon']");
if (favicon) {
favicon.href = isDark
? '/branding/favicon-light.ico'
: '/branding/favicon-dark.ico';
}
};
// Option 1: Remove cleanup if observer not used
// return () => {};
// Option 2: Enable observer if favicon switching is needed
// updateFavicon();
// const observer = new MutationObserver(updateFavicon);
// observer.observe(document.documentElement, {
// attributes: true,
// attributeFilter: ['data-theme']
// });
// return () => observer.disconnect();
}, []);📋 Code Quality & Best Practices✅ Strengths
|
Conflicts Resolved
Resolution Process