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

Resolving issue no.#366 #480

Merged
merged 8 commits into from
Jul 15, 2024
Merged

Resolving issue no.#366 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a314632
Solving issue Feat:container box and text is overriding #366
Garima-149 Jun 18, 2024
6b82278
Merge branch 'master' into master
Garima-149 Jun 18, 2024
c1ba66a
Update Footer.jsx
Garima-149 Jun 18, 2024
2a6237f
Update Footer.jsx
Garima-149 Jun 18, 2024
34e2503
Update Footer.jsx
Garima-149 Jun 18, 2024
69931e5
Merge branch 'Satyam1923:master' into master
Garima-149 Jun 18, 2024
811a416
Merge branch 'Satyam1923:master' into master
Garima-149 Jul 11, 2024
fa23846
Resolved
Garima-149 Jul 13, 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
6 changes: 5 additions & 1 deletion frontend/src/components/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ import { Link } from "react-router-dom";
const Footer = () => {
const currentYear = new Date().getFullYear();
return (
<div className="h-[300px] mt-56 w-full flex flex-col bgfooter sm:h-full">

<div className="h-[300px] w-full flex flex-col bgfooter sm:h-full" style={{padding:"66px",marginTop:"13rem"}}>



{/* //for logo and social links */}
<div className="sec1 xs:text-[36px]">
<div>SPRING</div>
Expand Down
14 changes: 11 additions & 3 deletions frontend/src/components/Home/Home.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function RecentlyPlayedElement({ setCurrentSong, song, name, image, singer }) {

function Genres() {
return (
<div className="bg-[#18181D] w-full h-full rounded-lg">
<div className="bg-[#18181D] w-full h-full rounded-lg" style={{marginTop:"50px"}}>
<div className="h-full w-full flex flex-col p-2">
<div className="flex h-[15%] justify-between items-center text-center pl-4 pr-4">
<h1 className="text-2xl text-white font-medium">Genres</h1>
Expand Down Expand Up @@ -244,7 +244,11 @@ function TopSongs({ currentArtist, setCurrentSong }) {
// console.log(topSongs)

return (
<div className="bg-[#18181D] w-full h-full rounded-lg">

<div className="bg-[#18181D] w-full h-full rounded-lg" style={{marginTop:"50px"}}>



<div className="w-full h-full flex flex-col">
<div className="flex h-[15%] justify-between items-center text-center p-1 ml-4 mr-4 mt-2">
<h1 className="text-2xl text-white font-medium">{title}</h1>
Expand Down Expand Up @@ -311,7 +315,11 @@ function TopArtists({ setCurrentArtist }) {
}, []);

return (
<div className="bg-[#18181D] w-full h-full rounded-lg">

<div className="bg-[#18181D] w-full h-full rounded-lg" style={{height:"14rem",padding:"2rem",marginTop:"2rem"}}>



<div className="flex flex-col h-[100%] pl-4 pr-4 gap-2 pt-2">
<div className="flex h-[15%] justify-between items-center text-center p-1">
<h1 className="text-2xl text-white font-medium">Top Artists</h1>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/MusicPlayer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function MusicPlayer({ currSong, shouldAutoPlay }) {
}

return (
<div className="bg-[#18181D] w-full h-full rounded-lg">
<div className="bg-[#18181D] w-full h-full rounded-lg" style={{marginTop:"2rem",height:"34.8rem"}}>
<div className="flex flex-col h-full justify-between p-2">
{/* Image and like details */}
<div className="flex h-full pt-6">
Expand Down