Skip to content

Commit

Permalink
add package.json, style logged html and change button layout
Browse files Browse the repository at this point in the history
  • Loading branch information
yvonne-liu committed May 24, 2017
1 parent 3cb8248 commit 6cb7c4e
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 19 deletions.
7 changes: 4 additions & 3 deletions css/logameal.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
}

.logameal_submit {
background: silver;
padding: .3em;
line-height: 1.5em;
padding: .1em .3em;
border-radius: .2em;
background: #6dd2a6;
box-shadow: .1em .1em .05em #369081;
}

#food_input {
Expand Down
36 changes: 36 additions & 0 deletions css/logged.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#top, #bottom, #left, #right {
background: #a5ebff;
position: fixed;
}
#left, #right {
top: 0; bottom: 0;
width: 30px;
}
#left { left: 0; }
#right { right: 0; }

#top, #bottom {
left: 0; right: 0;
height: 30px;
}
#top { top: 0; }
#bottom { bottom: 0; }

p {
text-align: center;
font-size: 1.5em;
}
.container {
padding: 1em;
}

.success-svg {
padding: 2em;
}

.home {
padding: .1em .3em;
border-radius: .2em;
background: #6dd2a6;
box-shadow: .1em .1em .05em #369081;
}
1 change: 1 addition & 0 deletions images/success.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 17 additions & 16 deletions logged.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,30 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<link rel="stylesheet" href="./css/main.css" type="text/css">
<link rel="stylesheet" href="./css/sent.css" type="text/css">
<link rel="stylesheet" href="./css/logged.css" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Coming+Soon" rel="stylesheet">
<title>Document</title>
</head>
<body>
<header class="landing_header">
<!-- <header class="landing_header"> -->
<div id="left"></div>
<div id="right"></div>
<div id="top"></div>
<div id="bottom"></div>

<div class="header_menu">
<img src="images/header_profile.png" alt="your profile image" class="header_profile_pic"></br>
<div class="header_menu_items">
<!-- <div class="header_menu"> -->
<!-- <img src="images/header_profile.svg" alt="your profile image" class="header_profile_pic"></br> -->
<!-- <div class="header_menu_items">
<img src="./images/success.svg" alt="success">
<a href="settings.html" class="header_menu_item">Settings</a></br>
<a href="./login.html" class="header_menu_item">Log out</a>
</div>
</div>
</header>
</div> -->
<!-- </div> -->
<!-- </header> -->
<div class="container">
<p>Meal successfully logged</p>

<form action="./logameal.html">
<input type="submit" value="Go back and edit" />
</form>

<form action="./landing.html">
<input type="submit" value="Back to home" />
</form>
<p>Thank you,<br>meal successfully logged!</p>
<img class="success-svg" src="./images/success.svg" alt="success">
<a href="./landing.html" class="home">Go back home</a>
</div>
<script src="js/header_menu.js"></script>
</body>
Expand Down
19 changes: 19 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "herewithyou",
"version": "1.0.0",
"description": "a friendly food diary",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/yvonne-liu/annafreud-app.git"
},
"author": "yvonne lucy and maja",
"license": "ISC",
"bugs": {
"url": "https://github.com/yvonne-liu/annafreud-app/issues"
},
"homepage": "https://github.com/yvonne-liu/annafreud-app#readme"
}

0 comments on commit 6cb7c4e

Please sign in to comment.