Skip to content

Commit

Permalink
Update to reflect move
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkmalmgren committed Mar 3, 2018
1 parent 1dbec16 commit a86466b
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 32 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bolingbrook-church",
"version": "1.3.12",
"version": "1.3.13",
"license": "MIT",
"angular-cli": {},
"scripts": {
Expand Down
7 changes: 1 addition & 6 deletions src/app/components/molecules/popup.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
<aside class="popup" [@popupState]="popupState">
<section>
<h2>We are Moving</h2>
<h2>We Have Moved!</h2>
<div>New Location</div>
<div class="location">301 E Boughton Rd, Bolingbrook, IL 60440</div>
<ul>
<li>February 17th - Noon Service @ 1251 Windham Pkwy, Romeoville, IL 60446</li>
<li>February 24th - Friends and Family Sabbath</li>
<li>March 3rd - New Location</li>
</ul>
</section>
</aside>
10 changes: 0 additions & 10 deletions src/app/components/molecules/popup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,4 @@ aside.popup {
section {
padding: 20px;
}

ul {
list-style: none;
border-left: solid 2px #6d6b6b;
padding-left: 20px;

li {
padding: 9px 0;
}
}
}
2 changes: 1 addition & 1 deletion src/app/components/molecules/popup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class PopupComponent implements OnInit {

ngOnInit() {
if (this.aperture.browser) {
setTimeout(() => this.popupState = 'hidden', 10000);
setTimeout(() => this.popupState = 'hidden', 6000);
}
}
}
13 changes: 1 addition & 12 deletions src/app/components/pages/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,9 @@ <h2 *ngIf="!live && !!sermon">Latest Sermon</h2>
<main>
<section class="join">
<div class="content">
<h3>We're Moving</h3>
<div class="time">March 3, 2018</div>
<h3>We Have Moved!</h3>
<div class="location">301 E Boughton Rd, Bolingbrook, IL 60440</div>

<h4>Transition Schedule</h4>
<ul>
<li>February 17th - Noon Service @ 1251 Windham Pkwy, Romeoville, IL 60446</li>
<li>February 24th - Friends and Family Sabbath</li>
<li>March 3rd - New Location</li>
</ul>

<h3>New Schedule</h3>
<h4>Worship With Us</h4>
<div class="time">Every Saturday</div>
Expand All @@ -35,20 +27,17 @@ <h4>Worship With Us</h4>
<li>10:00 AM &amp; 1:45 PM - Sabath Café</li>
<li>10:30 AM &amp; 12:30 PM - Discipletown Kids (ages 0-11)</li>
</ul>
<div class="location">301 E Boughton Rd, Bolingbrook, IL 60440</div>

<h4>Mid-week Experience</h4>
<div class="time">Every Wednesday</div>
<ul>
<li>6:00 PM - Prayer</li>
<li>7:00 PM - Bible Study</li>
</ul>
<div class="location">301 E Boughton Rd, Bolingbrook, IL 60440</div>

<h4>Student Connections (ages 12 - 18)</h4>
<div class="time">Every Friday</div>
<div class="time">7:00 PM - 9:00 PM</div>
<div class="location">301 E Boughton Rd, Bolingbrook, IL 60440</div>
</div>
</section>

Expand Down
2 changes: 1 addition & 1 deletion src/app/components/pages/home.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class HomeComponent implements OnInit {
.liveToday()
.subscribe((liveToday) => {
const now = moment.tz('America/Chicago');
this.live = (liveToday && now.day() === 6 && now.hour() >= 11 && now.hour() < 14);
this.live = (liveToday && now.day() === 6 && now.hour() >= 10 && now.hour() < 13);
});
}

Expand Down

0 comments on commit a86466b

Please sign in to comment.