Skip to content

Commit

Permalink
Merge pull request #13 from TLI-Group-1/feature/basic-index-page#8
Browse files Browse the repository at this point in the history
Discovery page works except the ability to interact with loan offers
  • Loading branch information
Shalev-Lifshitz authored Dec 7, 2021
2 parents 2889499 + 07c62fc commit cd33ae4
Show file tree
Hide file tree
Showing 18 changed files with 1,888 additions and 36 deletions.
1 change: 1 addition & 0 deletions assets/icons/arrow-back-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/icons/arrow-back.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/heart-filled-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/heart-filled-red-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/heart-unfilled-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/search-icon-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/icons/sort-top-down-min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/car-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 43 additions & 7 deletions css/details.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,69 @@ main {
width: 60rem;
max-width: 90%;
max-height: 60rem;
margin: 5rem auto;
margin: 2rem auto 5rem auto;

display: flex;
flex-direction: column;
justify-content: space-between;
align-items: stretch;
}

/* header styles */

header {
flex-grow: 0;
padding: 1rem 2rem;

display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
align-items: stretch;
flex-wrap: wrap;
column-gap: 1em;
}

header div {
padding: 2rem 1rem 1rem 1rem;
}

header div.go-back {
padding-left: 2rem;
padding-top: 1rem;
min-width: 15rem;
max-width: 20rem;
border-radius: 1.1rem 0 0 0;
display: flex;
flex-direction: row;
flex-wrap: nowrap;
justify-content: center;
align-items: center;
column-gap: 1rem;
}

header div.go-back img {
transition: all 250ms ease;
}

header div.go-back:hover {
cursor: pointer;
}

header div.go-back:hover img {
transform: translateX(-0.5rem);
}

header h1 {
color: #36cf9b;
margin: 0 1rem;
}

header img {
height: 2.2em;
height: 1.5rem;
width: auto;
padding-left: 2px;
}

/* nav bar styles */

main > nav {
flex-grow: 0;
padding: 1rem 2rem;
Expand All @@ -62,12 +96,14 @@ main > div {

main > div aside {
flex-grow: 1;
/* overflow-y: auto; */
max-width: 20rem;
max-height: 60rem;
overflow-y: auto;
}

main > div section {
flex-grow: 2;
border-radius: 0 0 1.8rem 0;
border-radius: 0 0 1.1rem 0;
padding: 1rem;
max-width: 75%;
min-height: 30rem;
Expand Down
Loading

0 comments on commit cd33ae4

Please sign in to comment.