-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from CodeURJC-DAW-2022-23/fix-Profile-page
fix: profile page
- Loading branch information
Showing
4 changed files
with
214 additions
and
65 deletions.
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
|
|
||
| <head> | ||
| <meta charset="UTF-8"> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0"> | ||
| <link href="styles/profile.css" rel="stylesheet"> | ||
| <link href="styles/styles.css" rel="stylesheet"> | ||
| <link rel="icon" type="image/x-icon" href="images/favicon.ico"> | ||
| <link href="styles/bootstrap/bootstrap.min.css" rel="stylesheet"> | ||
| <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1/css/all.min.css" | ||
| integrity="sha512-MV7K8+y+gLIBoVD59lQIYicR65iaqukzvf/nwasF0nqhPay5w/9lJmVM2hMDcnK1OnMGCdVK+iQrJ7lzPJQd1w==" | ||
| crossorigin="anonymous" referrerpolicy="no-referrer"> | ||
| <title>Profile</title> | ||
| </head> | ||
|
|
||
| <body class="text-center " > | ||
| <nav class="navbar navbar-expand-lg bg-black"> | ||
| <div class="container-fluid"> | ||
| <div class="row align-items-center"> | ||
| <div class="col-1"> | ||
| <a class="navbar-brand" href="index.html"> | ||
| <img src="images/alistLogo.svg" alt="" width="80" height="30"> | ||
| </a> | ||
| </div> | ||
| <div class="col-3 d-flex justify-content-around ps-5 pe-2"> | ||
| <i class="fa-regular fa-compass fa-xl"></i> | ||
| </div> | ||
| <div class="col-4 ps-0"> | ||
| <form class="d-flex" role="search"> | ||
| <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search"> | ||
| </form> | ||
| </div> | ||
| <div class="col-4 d-flex justify-content-around"> | ||
| <i class="fa-regular fa-heart fa-xl"></i> | ||
| <i class="fa-regular fa-user fa-xl"></i> | ||
| </div> | ||
|
|
||
| </div> | ||
| </div> | ||
| </nav> | ||
| <div class="container-fluid "> | ||
| <div class="row "> | ||
| <div class="profile-nav col-md-3 text-white p-6 "> | ||
| <div class="profile-pic text-center" > | ||
| <img src="images/profile_picture.jpg" alt="profilePic" class="prof-pic rounded-circle "> | ||
| </div> | ||
| <div class="row text-inherit m-0 d-flex align-items-center"> | ||
| <div class="col prof-name fs-2"> | ||
| UserName | ||
| </div> | ||
|
|
||
| </div> | ||
| <div class="row fs-5"> | ||
| <div class="col"> | ||
| 4k <br><small>Following</small> | ||
| </div> | ||
| <div class="col"> | ||
| 10k <br> <small>Followers</small> | ||
| </div> | ||
| </div> | ||
| <div class="btn-follow"> | ||
| <button class="btn btn-primary btn-round">Follow</button> | ||
| </div> | ||
| <hr> | ||
| <div> | ||
| <p> | ||
| (づ｡◕‿‿◕｡)づ | ||
| <br> | ||
| -Spits facts daily | ||
| <br> | ||
| -Best opinions all around | ||
| <br> | ||
| -Don't hate pls | ||
| @gledrian.dev_ | ||
| </p> | ||
| </div> | ||
| </div> | ||
| <div class="profile-info col-md-9 p-6"> | ||
|
|
||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
|
|
||
| </html> |
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,59 @@ | ||
| .btn-setting .btn-primary { | ||
| border: none; | ||
| background-color: black; | ||
| border: 1px solid white; | ||
| background-color: inherit; | ||
| color: white; | ||
| } | ||
|
|
||
| .btn-setting .btn-primary:hover { | ||
| background-color: black; | ||
| } | ||
|
|
||
| .row { | ||
| height: inherit; | ||
| width: 100%; | ||
| .prof-pic { | ||
| max-width: 100%; | ||
| height: auto; | ||
| margin-bottom: 20px; | ||
| } | ||
|
|
||
| .container-fluid { | ||
| height: 100vh; | ||
| background-color: black; | ||
| .btn-follow .btn-primary { | ||
| border: none; | ||
| background-color: #2d474f; | ||
| margin-top: 20px; | ||
| margin-bottom: 20px; | ||
| } | ||
|
|
||
| .prof-name { | ||
| margin-left: 15%; | ||
| .btn-follow .btn-primary:hover, | ||
| .btn-follow:active .btn-primary:focus { | ||
| background-color: #63b1b1; | ||
| } | ||
|
|
||
| img { | ||
| display: block; | ||
| max-width: 100%; | ||
| height: auto; | ||
| @media only screen and (max-width: 320px) { | ||
| main .row { | ||
| height: auto; | ||
| } | ||
| } | ||
| /*Nav bar*/ | ||
| .fa-regular { | ||
| color: white; | ||
| } | ||
|
|
||
| .bio { | ||
| .navbar .row { | ||
| width: 100vw; | ||
| } | ||
| nav { | ||
| border-bottom: 1px solid gray; | ||
| } | ||
|
|
||
| i { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| .vl { | ||
| border-left: 1px solid gray; | ||
| height: 100%; | ||
| width: 1px; | ||
| } | ||
|
|
||
| main { | ||
| height: 100vh; | ||
| padding: 0 1rem; | ||
| } |
This file contains 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