Skip to content

Commit

Permalink
Finished make-list webpage!
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathannnty committed Sep 16, 2024
1 parent e51611c commit 81b0a68
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 54 deletions.
2 changes: 1 addition & 1 deletion source/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
background-color: #fe9920cc;
padding: 1em;
font-size: 200%;
padding-left: 30px;
padding-left: 1em;
}

.header-container p {
Expand Down
5 changes: 4 additions & 1 deletion source/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@ body {
background-size: cover;
}


/* Padding for the body has been removed, make note of this */
body {
background-color: #f8f2e1;
padding: 100px 0px 50px;
padding: 5em 0 0 0;
/* padding: 100px 0px 50px; */
/* 100px top to give space for sticky header can be adjusted as needed, 0px on side to allow header to occupy full screen 50px on bottom because I felt like it */
margin: 0px;
/* There's a margin between html and body? */
Expand Down
105 changes: 55 additions & 50 deletions source/css/make-list.css
Original file line number Diff line number Diff line change
@@ -1,31 +1,10 @@

/*Formatting for the text area*/
/*#grocery-header{
background: #FC9E5F;
border-radius: 10px;
padding: 9px;
color:rgb(128, 57, 9);
margin: 10px;
}
/*Changing the color of the text inside the text area
::placeholder{
color:rgb(128, 57, 9);
font-size: 110%;
font-weight: bold;
}*/

.title{
display: flex;
justify-content: space-between; /* Aligns text left and buttons right */
align-items: center; /* Aligns text and buttons vertically at the same level */
padding: 10px; /* Optional: Adds padding around the title */
padding: 0 2em;
}


.list-name{
margin:0;
}
Expand All @@ -34,23 +13,20 @@
.next-page-buttons{
background: #7C9E57;
border-radius: 30px;

padding:10px;
margin:10px;

font-size: 110%;
/* font-size: 5em; */
font-weight: bold;

display:flex;
gap:10px;

}

/* Proposed change: Removing the opacity animation */
/*Changing cursor visuals + opacity of 'add item' and 'finished with your list' buttons */
.next-page-buttons:hover{
/* .next-page-buttons:hover{
cursor:pointer;
opacity: 80%;
}
} */

#editListBtn {
background-color: transparent; /* Dark Blue */
Expand All @@ -68,47 +44,75 @@
text-align: center;
text-decoration: none;
/* display: inline-block; */
font-size: 15px;
font-size: 1.5em;
border-radius: 12px;
font-weight: bold;
cursor: pointer;
/* float: right; */
}

.menuBTN:hover {
background-color: #4f6834; /* Darker Green */
}
background-color: #719150;
opacity: 70%;
}

.menuBTN:focus:not(:focus-visible):not(.focus-visible) {
box-shadow: none;
outline: none;
}

.menuBTN:focus {
box-shadow: #668448 0 0 3px;
outline: none;
}

.menuBTN:disabled {
border-color: #1b1f231a;
color: #ffffffcc;
cursor: default;
}

.menuBTN:active {
background-color: #668448;
box-shadow: #14462033 0 1px 0 inset;
}

/*formatting for the entirety of the 3-column display*/
.information-holder{
display:grid;
grid-template-columns: 1fr 1fr 1fr;

background-color: rgb(225, 228, 207);

border-radius: 10px;

margin: 10px;
background-color: #EFF0E5;
border-radius: 2em;
border: none;
margin: 0em 2em;
}

/*Including border between each column to determine placement - can take out if wanted*/
.column1, .column2, .column3{
border-style: solid;
border-color: rgb(213, 215, 200);
border-radius: 10px;
border: 0.4em solid #d5d7c8;
}

/*Adjusting font weight/size of the list of items within 1st column*/
.column1{
border-top-left-radius: 2em;
border-bottom-left-radius: 2em;
#item-list{
font-weight: bold;
font-size: 150%
}

.groceryItem {
width: auto;
padding: 0;
margin: 1.25em;
padding: 0.15em;
}
}

/*Overall formatting for 2nd column*/
.column2{

border-left: none;
border-right: none;
/*Aligning the Name and Main Image to be in the center of the column*/
.align-images-center{
display: grid;
Expand All @@ -126,15 +130,16 @@
}

h2{
margin: 10px;
margin: 10px 0 10px 10px;
font-size: 175%;
}

}

/*Formatting for the 3rd Column*/
.column3{

border-top-right-radius: 2em;
border-bottom-right-radius: 2em;
/*Adjusting display of 'description' and 'nutrition facts' buttons*/
.fact-buttons{
display: flex;
Expand All @@ -157,7 +162,6 @@
#description-button{
border-top-left-radius: 20px;
border-bottom-left-radius: 20px;

background-color: rgb(173, 175, 161); /*keep this way so that when page loads, it looks like description button is automatically selected.*/
}

Expand Down Expand Up @@ -185,18 +189,14 @@
/*Formatting for the image slider in 2nd column*/
.image-holder{
display: flex;

overflow:scroll;
width:auto;
height:auto;
border:1px solid rgb(241, 243, 227);
margin:10px;
margin:10px 0 10px 10px;
background-color: rgb(241, 243, 227);

border-radius: 10px;

scroll-snap-type: x mandatory;

/*Makes sure all images inside slider have rounded border + equal space between each item*/
img{
border-radius: 10px;
Expand Down Expand Up @@ -258,4 +258,9 @@

background: transparent;
color: #69563b;
}

.extra-images {
padding: 0 0.5em;
border: 0.2em solid #00000033;
}
2 changes: 1 addition & 1 deletion source/js/make-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function init(){
document.getElementById('listHeading').addEventListener('keydown', (event) => {
if(event.key === 'Enter'){
document.getElementById('listHeading').contentEditable = false;
document.getElementById('listHeading').style.backgroundColor = '#f8f2e1';
document.getElementById('listHeading').style.backgroundColor = '#FFFFFF';
}
});

Expand Down
3 changes: 2 additions & 1 deletion source/make-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ <h1>Go Go Grocery</h1>
</div>
</div>
</header>

<br>
<br>
<!--CODE FOR THE PRODUCT LIST (wireframe page 6) - item | item image | description/nutrition fact-->

<!--Add Item Button - on click, sends to item-price.html page-->
Expand Down
2 changes: 2 additions & 0 deletions source/user-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ <h1>Go Go Grocery</h1>
</div>
</div>
</header>
<br>
<br>
<main>
<div id="user-details-emoji">
<div id="user-details">
Expand Down

0 comments on commit 81b0a68

Please sign in to comment.