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

User profile small styling #213

Merged
merged 3 commits into from
May 29, 2020
Merged

User profile small styling #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
111e336
remove global hover color
jennagoldman May 29, 2020
cfebdf0
add H3s to user profile
jennagoldman May 29, 2020
0c3c397
update search icon in header
jennagoldman May 29, 2020
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: 3 additions & 3 deletions src/components/Header/Header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@
}

button{
border: solid 1px navy;
background-color: rgb(212, 226, 255);
border: none;
background-color: #FD7553;
border-radius: 30%;
color: navy;
color: #FFF;
font-size: 15px;
margin-top: 0.2rem;
margin-bottom: 0.5rem;
Expand Down
23 changes: 17 additions & 6 deletions src/components/Profiles/UserProfile/UserProfile.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
a{
a {
cursor: pointer;
:hover{
color: orange;
}
}
a:hover{
a:hover {
color: #F97553;
text-decoration: none;
}


.UserProfile {
display: flex;
flex-direction: column;
Expand All @@ -24,6 +21,13 @@ a:hover{
text-transform: uppercase;
text-shadow: 2px 2px #58bdf3;
}

h3 {
text-transform: uppercase;
font-family: 'Cabin', sans-serif;
font-weight: 700;
font-size: 1.5rem;
}
}

.Orders {
Expand All @@ -43,6 +47,13 @@ a:hover{
text-shadow: 2px 2px #58bdf3;
}

h3 {
text-transform: uppercase;
font-family: 'Cabin', sans-serif;
font-weight: 700;
font-size: 1.5rem;
}

.OrdersList {
list-style: none;
margin-block-start: 0;
Expand Down
12 changes: 6 additions & 6 deletions src/components/Profiles/UserProfile/UserProfile.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,30 +90,30 @@ export default function UserProfile() {
<h2>{user ? `${user.firstName} ${user.lastName}'s Profile` : 'Loading'}</h2>
<div className={styles.Orders}>
<div>
<h2>Upcoming Orders</h2>
<h3>Upcoming Orders</h3>
<ul className={styles.OrdersList}>
{upcomingOrderNodes.length > 0 ? upcomingOrderNodes : 'No upcoming orders'}
</ul>
<h2>Previous Orders</h2>
<h3>Previous Orders</h3>
<ul className={styles.OrdersList}>
{previousOrderNodes.length > 0 ? previousOrderNodes : 'No previous orders'}
</ul>
</div>
<div>
<h2>Order Calendar</h2>
<h3>Order Calendar</h3>
<OrderCalendar orders={allOrders}/>
</div>
</div>
<div className={styles.Favorites}>
<h2>Favorite Restaurants</h2>
<h3>Favorite Restaurants</h3>
<RestaurantList restaurants={favoriteMunge}/>
</div>
<div className={styles.Polls}>
<h2>Upcoming Polls</h2>
<h3>Upcoming Polls</h3>
<ul className={styles.PollsList}>
{upcomingPollNodes}
</ul>
<h2>Previous Polls</h2>
<h3>Previous Polls</h3>
<ul className={styles.PollsList}>
{previousPollNodes}
</ul>
Expand Down
6 changes: 3 additions & 3 deletions src/components/Search/Search.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const Search = ({ type }) => {
value={name}
name="name"
onChange={handleChange}
placeholder="search by name" />
placeholder="Search by name" />
<input type="text"
value={category}
name="category"
onChange={handleChange}
placeholder="search by category" />
<button><RiSearchLine/></button>
placeholder="Search by category" />
<button><RiSearchLine /></button>
</form>
</>
);};
Expand Down