Skip to content

Commit

Permalink
Merge pull request #8 from rpiambulance/dev
Browse files Browse the repository at this point in the history
Update master with dev
  • Loading branch information
ddbruce authored Nov 15, 2019
2 parents d7edf8e + e67e3eb commit fd3fee2
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "headsup",
"version": "0.0.1",
"version": "1.0.1",
"description": "RPIA's digital whiteboard system",
"main": "server.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion public/css/style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions public/css/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,21 @@ body {
font-size: 180px;
}
}

#chores li {
font-size: 36px;
}

#notes p {
font-size: 36px;
padding: 0;
padding-bottom: 15px;
padding-top: 5px;
border-bottom: 1px solid rgba(0,0,0,.1);

&:last-child {
border-bottom: 0;
margin-bottom: 0;
padding-bottom: 0;
}
}
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<div class="section-heading">Chores</div>
<div id="chores"></div>
</div>
<div class="col-md-4">
<div class="col-md-8">
<div class="section-heading">Notes</div>
<span id="notes"></span>
</div>
Expand Down
8 changes: 3 additions & 5 deletions public/js/whiteboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ function updateNotes(noteResponse) {
document.querySelector('#notes').innerHTML = '';
const notes = noteResponse.data;
for (const note of notes) {
const span = document.createElement('span');
const paragraph = document.createElement('p');
paragraph.textContent = note.note;
span.appendChild(paragraph);
document.querySelector('#notes').appendChild(span);
const p = document.createElement('p');
p.textContent = note.note;
document.querySelector('#notes').appendChild(p);
}
}

Expand Down

0 comments on commit fd3fee2

Please sign in to comment.