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.

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

add page for previous food logs #46

Merged
merged 2 commits into from
May 24, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion calendar.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<header class="calendar_header">

<div>
<a href="./landing.html"><img src="./images/back.png" alt="go back" class="header_home"></a>
<a href="./landing.html"><img src="./images/home.png" alt="go back" class="header_home"></a>
</div>

<div class="header_menu">
Expand Down
37 changes: 27 additions & 10 deletions css/day.css
Original file line number Diff line number Diff line change
@@ -1,17 +1,34 @@
* {
background: rgb(249, 188, 89);
font-family: 'Coming Soon', sans-serif;
color: white;
}

header {
text-align: center;
margin: 1em 0 1em 0;
font-size: 2em;
.day_header {
display: flex;
flex-direction: row;
justify-content: space-between;
padding: 1em 1em 0 1em;
}

.food-log {
margin-bottom: 0.5em;
border-style: solid;
padding: 0.5em;
}

.back_button {
height: 3em;
}

.container {
margin: 0 auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-align: center;
}

.header_menu {
margin-bottom: none;
}

.edit {
height: 3em;
width: auto;
}
18 changes: 14 additions & 4 deletions day.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,27 @@
<title>Day</title>
</head>
<body>

<header class="day_header">
<div><a href="./calendar.html"><img src="images/return.png" alt="go back" class="back_button"></a></div>
<div class="header_menu">
<img src="images/header_profile.svg" alt="your profile image" class="header_profile_pic"></br>
<div class="header_menu_items">
<a href="settings.html" class="header_menu_item">Settings</a></br>
<a href="./login.html" class="header_menu_item">Log out</a>
</div>
</header>

<div class="container">
<h1 class="day_heading">{Insert Date}</h1>
<p>There are no food logs for today.</p>
<p>Add an entry</p>
<a href="./calendar.html" class="">Back to Calendar</a>
<p>There are no entries for today.<br>Add one?</p>
<a href="./logameal.html"><img src="images/edit.png" alt="edit" class="edit"></a>
</div>

<!-- <div class="food-log">
<p>Time: 11:00</p>
<p>For lunch, I didn't eat anything.</p>
<p>I didn't eat anything because I didn't feel like I should eat after breakfast.</p>
</div> -->
<script src="js/header_menu.js" type="text/javascript"></script>
</body>
</html>
Binary file added images/edit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added images/return.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.