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

Kayla Ecker - Caret #36

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
Next Next commit
attempt to deploy heroku
Kayla Ecker authored and Kayla Ecker committed Nov 6, 2017
commit c9163b773c28df705a9c2a57c68f5f0365c7c1ec
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -68,7 +68,6 @@ p a {
height: 10vh;
font-weight: bold;
min-height: 100%;
position: bottom: 0;
}

.footer {
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"files":{"application-31b799e2be6bfb6134c521b0af612b3a62d40509aefdf2530cc2ba057cfa01be.js":{"logical_path":"application.js","mtime":"2017-10-31T16:37:05-07:00","size":82876,"digest":"31b799e2be6bfb6134c521b0af612b3a62d40509aefdf2530cc2ba057cfa01be","integrity":"sha256-MbeZ4r5r+2E0xSGwr2ErOmLUBQmu/fJTDMK6BXz6Ab4="},"application-5910fde7e70d1ea5412225adc60da4a613a893084bf1d965637bccad4f4f436e.css":{"logical_path":"application.css","mtime":"2017-11-05T17:10:23-08:00","size":1375,"digest":"5910fde7e70d1ea5412225adc60da4a613a893084bf1d965637bccad4f4f436e","integrity":"sha256-WRD95+cNHqVBIiWtxg2kphOokwhL8dllY3vMrU9PQ24="}},"assets":{"application.js":"application-31b799e2be6bfb6134c521b0af612b3a62d40509aefdf2530cc2ba057cfa01be.js","application.css":"application-5910fde7e70d1ea5412225adc60da4a613a893084bf1d965637bccad4f4f436e.css"}}

Large diffs are not rendered by default.

Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
body.main {
background: url("http://awesomewallpaper.files.wordpress.com/2013/01/apple_wallpaper_2_by_maxwood.jpg") no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}

body {
color: white;
text-align: center;
background-color: darkgreen;
text-shadow: 2px 2px 4px #000000;
}
body {
background: url("https://cdn.wallpapersafari.com/72/24/UBTF1M.jpg") no-repeat center center fixed;
-webkit-background-size: cover;
-moz-background-size: cover;
-o-background-size: cover;
background-size: cover;
}

body a{
color: ghostwhite
}

ul {
list-style-type: none;
}


.green {
left: 0px;
width: 300px;
padding: 10px;
background: rgba(76, 175, 80, 0.3);
box-shadow:0px 0px 7px #000000;
}

.ingredients, .dietary {
border-style: none;
padding: 2%;
list-style: none;
}

.article {
text-align: center;
}

.dietary ul, .ingredients ul{
list-style: none;
}

h4 {
color: pink;
text-decoration: underline;
}

p a {
color: lightgreen;
}

.footer2{
text-align: center;
max-width: 100%;
padding: 5px;
font-size: 1.5em;
height: 10vh;
font-weight: bold;
min-height: 100%;
position: bottom: 0;
}

.footer {
position: absolute;
right: 0;
bottom: 0;
left: 0;
padding: 1rem;
text-align: center;
}

.name a {
color: pink;
font-size: 1.5em;
}
Binary file not shown.