Skip to content

Finishing up #64

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

Open
Audi-ana wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Finishing up #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b6a641
finishing touches
Mar 22, 2019
d879265
finishing up
Mar 22, 2019
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
95 changes: 80 additions & 15 deletions index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
grid-column-end: end;
grid-row-start: row3;
grid-row-end: span 1;
padding-bottom: 10px;
}
#entirePageGrid .newsBlogWeatherGrid {
grid-column-start: first;
Expand Down Expand Up @@ -79,7 +80,7 @@
/* NEWS BLOG WEATHER GRID DISPLAY START */
#newsBlogWeatherGrid {
display: grid;
grid-template-columns: [first] 5% [second] 35% [third] 5% [fourth] 50% [fifth] 5% [end];
grid-template-columns: [first] 5% [second] 27% [third] 5% [fourth] 58% [fifth] 5% [end];
grid-template-rows: [row1-start] 100% [row1-end] auto;
}
#newsBlogWeatherGrid .containerForNews { /* =========================================================== */
Expand Down Expand Up @@ -157,10 +158,10 @@
}
@media (min-width: 577px){
cardScroll {

flex: 0 0 auto;
margin-bottom: 3px;
border: 2px solid gray;
border: 2px solid #B0B7BC;
width: 100%;
height: auto;
background: white;
Expand All @@ -177,7 +178,7 @@ cardScroll {
position: relative;
flex: 0 0 auto;
margin-bottom: 3px;
border: 2px solid gray;
border: 2px solid #B0B7BC;
width: 100%;
height: auto;
background: white;
Expand All @@ -197,9 +198,9 @@ cardScroll {

flex: 0 0 auto;
margin-bottom: 3px;
border: 2px solid gray;
border: 2px solid #B0B7BC;
width: 100%;
height: 300px;
height: 400px;
background: white;
color: black;
font-size:0.8em;
Expand Down Expand Up @@ -230,10 +231,12 @@ cardScroll {
float: none;
width: 60%;
display: flex;
background-color: blue;
background-color: #002244;
position:absolute;
bottom: 10px;
right:25%
right:25%;
border-radius: 15%;
color: #B0B7BC;

}
}
Expand All @@ -242,7 +245,9 @@ cardScroll {
float: right;
width: 30%;
display: inline-block;
background-color: blue;
background-color: #002244;
border-radius: 15%;
color: #B0B7BC
}
}
/* Local News Articles Display */
Expand All @@ -256,19 +261,24 @@ cardScroll {
float: right;
width: 30%;
display: inline-block;
background-color: blue;
background-color: #002244;
border-radius: 15%;
color: #B0B7BC;
}

}}
}

@media (max-width: 576px){
#articleSaveBtn {
float: none;
width: 50%;
display: flex;
background-color: blue;
background-color: #002244;
position:absolute;
bottom: 10px;
right:35%
right:35%;
border-radius: 15%;
color: #B0B7BC


}
Expand Down Expand Up @@ -325,6 +335,13 @@ input {

/* mobile for news and blog display ================================================================================== */
@media (max-width: 576px) {
#entirePageGrid {
display: grid;
grid-template-columns: [first] 100% [end];
grid-template-rows: [row1] 3.91187rem [row2] 3rem [row3] 8rem [row4] auto [end];
align-items: stretch;
}

#container{
display: grid;
grid-template-columns: [first] 50px [third] 126.15px [fourth] 90px [fifth] 73px [end];
Expand Down Expand Up @@ -353,7 +370,7 @@ input {
margin-right: 3px;
border: 2px solid gray;
width: 130px;
height: 300px;
height: 200px;
background: white;
color: white;
font-size:0.8em;
Expand All @@ -372,7 +389,7 @@ input {
#newsBlogWeatherGrid {
display: grid;
grid-template-columns: [first] 5% [second] 90% [third] 5% [end];
grid-template-rows: [first] 700px [second] auto [end];
grid-template-rows: [first] 524px [second] auto [end];
}
#newsBlogWeatherGrid .containerForNews {
grid-column-start: second;
Expand Down Expand Up @@ -406,4 +423,52 @@ input {
.row p{
border-right: none;
}
/*Make sure you delete floating curly brackets.... (see next line) :/*/
}
.btn-primary{
color:#B0B7BC;
background-color:#002244;
}

a {
color: #002244;
}
#table {
border :1px solid #B0B7BC;
border-radius: 5px;
background-color: #B0B7BC;
padding: 100px;
position: relative;
}
#titleEntry{
position: absolute;
top:10px;
left:10px;


}
#imageEntry{
position: absolute;
top:40px;

left:10px;
}

#contentEntry{
position: absolute;
bottom:10px;
right:10px;
}

#blogEntryBtn{
position: absolute;
bottom: 10px;
left: 10px;

}
#uploader {
position: relative;
bottom: 30px;
right: 90px;

}
13 changes: 10 additions & 3 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,16 +270,17 @@ function blogEntry () {
if (admin == "True") {
document.getElementById('blogEntry').style.display = "block";

let blogEntryForm = `<h3>Blog Entry</h3>
let blogEntryForm = `<h3>Blog Entry</h3><div id="table">
<form method="post">
<input type="text" id="titleEntry" placeholder="Title">
<input type="file" id="imageEntry" value="upload">
<progress value="0" max="100" id="uploader">0%</progress>
<textarea cols="35" rows="5" id="contentEntry"></textarea>
<button id="blogEntryBtn" type="button">Submit</button>
</form>`
</form></div>`

document.getElementById('blogEntry').innerHTML = blogEntryForm




Expand Down Expand Up @@ -315,8 +316,14 @@ let blogRef = blogsRef.push({
blogID: titleEntry,
blogTitle: titleEntry,
blogImg: imageURL,
blogContent: contentEntry
blogContent: contentEntry,



})
document.getElementById('titleEntry').value=""

document.getElementById('contentEntry').value=""
})
}}

Expand Down
11 changes: 0 additions & 11 deletions steve.css
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions steve.html
View file
Open in desktop

This file was deleted.

Loading