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

Fix video border size on About Us page #2375

Merged
merged 4 commits into from
Nov 9, 2024
Merged

Fix video border size on About Us page #2375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
028972e
Fix video border size on About Us page
geetanjaligit Oct 24, 2024
5837170
Applied suggested changes based on PR feedback
geetanjaligit Oct 26, 2024
aa92d0f
Resolved merge conflict
geetanjaligit Oct 30, 2024
bcdfeee
Merge branch 'main' into anshu_fix/about-us-layout
geetanjaligit Oct 30, 2024
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
3 changes: 0 additions & 3 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,13 +157,10 @@ export default function App() {
{/* Other user routes */}
<Route path="contributors" element={<Contributors />} />
<Route path="about-us" element={<AboutUs />} />
<<<<<<< HEAD
<Route path="help" element={<Help />} /> {/* Help page route */}
<Route path="privacy-policy" element={<Privacy />} />
=======
<Route path="help" element={<Help />} />
<Route path="privacy" element={<Privacy />} />
>>>>>>> 5eed12d9 (revert sadaf commit for category changes)
{/* Privacy policy page route */}
<Route path="cart" element={<Cart />} />
<Route
Expand Down
2 changes: 1 addition & 1 deletion src/User/pages/AboutUs/Aboutus.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const AboutUs = () => {
</div>

<div class="md:w-1/2 md:p-4 mt-10">
<div class="aspect-w-16 aspect-h-9 border-8 border-green-600 rounded-md ">
<div class="aspect-w-16 aspect-h-9 border-8 border-green-600 rounded-md w-316 ">
geetanjaligit marked this conversation as resolved.
Show resolved Hide resolved
<iframe
className="md:w-[685px] md:h-[410px] w-[300px] h-[150px]"
// width="685"
Expand Down
5 changes: 4 additions & 1 deletion tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ export default {
'pop': ['Poppins'],
'baloo': ["Baloo 2", 'sans-serif'],
'roboto': ['Roboto', 'sans-serif'],
}
},
width: {
'316': '316px', // Add custom width class
},
},
},
plugins: [],
Expand Down