Skip to content

Commit 9a50628

Browse files
authored
Merge pull request #21 from Capstone-Projects-2022-Spring/BAZ-119-consistent-theming-for-shopping-lists
Baz 119 consistent theming for shopping lists
2 parents 7708488 + 4bef30a commit 9a50628

5 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/Components/Carousel.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ const CAROUSEL = () => {
3737
transitionDuration={500}
3838

3939
>
40-
<div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex items-center justify-center flex-col space-y-3 min-h-[400px]'>
40+
<div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex items-center justify-center flex-col space-y-3 '>
4141
<div className='text-lg uppercase'>Purpose</div>
4242
<div className='text-sm text-center'>Bringing your favorite stores in one place.</div>
4343
</div>
4444

45-
<div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex flex-col items-center justify-center space-y-3 min-h-[400px]'>
45+
<div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex flex-col items-center justify-center space-y-3'>
4646
<div className='text-lg uppercase'>3 Simple Steps</div>
4747
<div className='text-sm text-center'>1. Check Savings.</div>
4848
<div className='text-sm text-center'>2. Manage Lists.</div>
4949
<div className='text-sm text-center'>3. EZ Product Search.</div>
5050

5151

52-
</div><div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex flex-col items-center justify-center space-y-3 min-h-[400px]'>
52+
</div><div className='bg-purple-100 mx-2 max-w-sm h-[200px] rounded p-2 flex flex-col items-center justify-center space-y-3 '>
5353
<div className='text-lg uppercase'>Contact</div>
5454
<div className='text-sm text-center'>Email: bazaara@email.com</div>
5555
</div>

src/Components/Footer/Footer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Footer() {
55
const currentYear = new Date().getFullYear();
66

77
return (
8-
<footer className='flex flex-col bg-zinc-900 font-regular text-white text-center p-3 sticky bottom-0'>
8+
<footer className='flex flex-col bg-zinc-900 font-regular text-white text-center p-3 mt-4 sticky bottom-0'>
99

1010
<div>BAZAARA</div>
1111
<div className='text-xs'> SAVE time, money, and energy.</div>

src/Components/Pages/ShoppingLists/ShoppingListSelection.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ export class ShoppingListSelection extends React.Component {
2727
render() {
2828
return(
2929

30-
<section className="">
30+
<section className="flex flex-col items-start space-y-2 bg-purple-200 justify-start">
3131
<h1>Shopping Lists</h1>
32-
<button onClick={(e) => this.props.togglePop(e)}>+ Create New List</button>
32+
<button onClick={(e) => this.props.togglePop(e)} className="px-2 py-1 text-sm rounded-full text-white bg-purple-600">+ Create New List</button>
3333
{this.props.seen ?
3434
<div className="modal">
3535
<div className="modal_content">
3636
<span className="close"></span>
3737

38-
<input type="text" placeholder="New Shopping List Name" onChange={(e) => this.props.handleInput(e)}/>
38+
<input type="text" className='px-2 text-sm w-48 mr-0 py-1 rounded-full bg-gray-100 border-2 border-2 border-purple-300' placeholder="New Shopping List Name" onChange={(e) => this.props.handleInput(e)}/>
3939
<br />
4040
<button onClick={(e) => this.props.handleAddList(this.props.value, e)}>Add</button>
4141

src/Components/Pages/ShoppingLists/ShoppingListView.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ export class ShoppingListView extends React.Component {
156156
return(
157157
<>
158158
<Navbar />
159-
<section className='container'>
160-
<section className='viewer'>
159+
<section className="bg-purple-200 p-3">
160+
<section className='bg-purple-200 flex'>
161161
<div className='listnamescolumn'>
162162
<ShoppingListSelection changeListHandler={this.changeListHandler} handleAddList={this.handleAddList} lists={this.state.lists} handleInput={this.handleInput} value={this.state.value} togglePop={this.togglePop} seen={this.state.seen}/>
163163
</div>
164-
<div className='productlistcolumn'>
164+
<div className='productlistcolumn bg-purple-200'>
165165
<button onClick={this.handleAddProduct}>+ Add a Product</button>
166166
<ShoppingListDisplay displayIndex={this.state.listIndex} lists={this.state.lists} currentList={this.state.currentList} removeProduct={this.handleRemoveProduct} productIndex={this.state.productIndex}/>
167167

src/Components/Pages/ShoppingLists/styles.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
height: 90%;
1919

2020
margin: 20px auto;
21-
background-color: #dd7e7e;
21+
/* background-color: #dd7e7e; */
2222
border-radius: 30px;
2323
}
2424

@@ -29,7 +29,7 @@
2929

3030

3131
margin: 20px auto;
32-
background-color: #dd7e7e;
32+
/* background-color: #dd7e7e; */
3333
overflow-x: hidden;
3434
overflow-y: auto;
3535
}
@@ -41,7 +41,7 @@
4141

4242

4343
margin: 20px auto;
44-
background-color: #dd7e7e;
44+
/* background-color: #dd7e7e; */
4545
overflow-x: hidden;
4646
overflow: auto;
4747
}

0 commit comments

Comments
 (0)