Skip to content

Commit

Permalink
August UX Updates (1.2.9)
Browse files Browse the repository at this point in the history
* Changes to Home Page (Resolves #74)
* Our Story Changes (Resolves #75)
* Giving Changes (Resolves #76)
* Bump version to 1.2.9
* Update Service Times (resolves #79)
* Bring up code coverage
  • Loading branch information
clarkmalmgren committed Sep 1, 2017
1 parent 1786962 commit 59591a3
Show file tree
Hide file tree
Showing 14 changed files with 290 additions and 100 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
@@ -1,6 +1,6 @@
{
"name": "bolingbrook-church",
"version": "1.2.8",
"version": "1.2.9",
"license": "MIT",
"angular-cli": {},
"scripts": {
Expand Down
40 changes: 17 additions & 23 deletions src/app/components/atoms/_typography.scss
Expand Up @@ -21,46 +21,40 @@ a[href], button, .mat-button, .mat-raised-button, .mat-icon-button {
h1, h2, h3, h4, h5, h6 {
font-family: 'Khand', sans-serif;
font-weight: 400;
margin: .5em 0;
}

h1 {
font-size: 65px;
margin: 1em 0 .5em;

@include break(medium) { font-size: 55px; }
@include break(small) { font-size: 45px; }
@include break(tiny) { font-size: 38px; }
@include break(micro) { font-size: 36px; }
@include break(small) { font-size: 46px; }
@include break(tiny) { font-size: 44px; }
@include break(micro) { font-size: 40px; }
}

h2 {
font-size: 41px;
margin: 1em 0 .5em;

@include break(small) { font-size: 37px; }
@include break(tiny) { font-size: 29px; }
@include break(micro) { font-size: 27px; }
font-size: 48px;
@include break(small) { font-size: 42px; }
@include break(tiny) { font-size: 36px; }
@include break(micro) { font-size: 32px; }
}

h3 {
font-size: 27px;
margin: 1em 0 .5em;

@include break(small) { font-size: 23px; }
@include break(tiny) { font-size: 23px; }
@include break(micro) { font-size: 21px; }
font-size: 32px;
@include break(small) { font-size: 30px; }
@include break(tiny) { font-size: 28px; }
@include break(micro) { font-size: 26px; }
}

h4 {
font-size: 19px;
margin: 1em 0 .5em;

@include break(small) { font-size: 17px; }
@include break(tiny) { font-size: 17px; }
@include break(micro) { font-size: 16px; }
font-size: 29px;
@include break(small) { font-size: 26px; }
@include break(tiny) { font-size: 24px; }
@include break(micro) { font-size: 22px; }
}

h5 {
font-size: 16px;
margin: 1em 0 .5em;
font-size: 22px;
}
6 changes: 3 additions & 3 deletions src/app/components/organisms/footer.html
@@ -1,6 +1,6 @@
<div class="footer">
<div class="notice">
Our live stream begins at 12pm Central Time on Saturday’s.
Our live stream begins at 12pm Central Time on Saturdays.
</div>
<div class="content">

Expand All @@ -12,7 +12,7 @@
</section>

<section class="links">
<h3>About</h3>
<h4>About</h4>

<ul>
<li><a md-button routerLink="/about">Our Story</a></li>
Expand All @@ -23,7 +23,7 @@ <h3>About</h3>
</section>

<section class="links">
<h3>Get Involved</h3>
<h4>Get Involved</h4>

<ul>
<li><a md-button routerLink="/giving">Giving</a></li>
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/organisms/footer.scss
Expand Up @@ -41,7 +41,7 @@ div.footer {
color: $color-grey-100;


h3 {
h4 {
padding: 0 16px;
}

Expand Down
135 changes: 110 additions & 25 deletions src/app/components/pages/about.html
@@ -1,47 +1,132 @@
<bc-header image="/assets/about/lightvision.png" shade="0.4" relativeHeight="0.4">
<h1>Our Story</h1>
<bc-header image="/assets/giving/giving2-e1443270113333.jpg" shade="0.4" relativeHeight="0.4">
<h1>OUR STORY</h1>
</bc-header>
<main>
<section>
<div class="content">
<p>
Bolingbrook Church is passionate about helping those far from God to become fully committed Christ-centered disciples. This
is more than just lip-service. We center every- thing we do around helping people understand exactly who Jesus was,
what he was talking about nearly two thousand years ago, and what that means for their lives today. Our hope is that
as they begin to understand his words, they begin to live it out in the everyday. We want them to be inspired to
connect to other people who are trying to do the same, to grow in their passion for Jesus and the people He’s called
them to serve, and then to invite those around them on that same journey.
</p>
</div>
</section>

<section class="white">
<div class="content">
<h2>MISSION</h2>
<h4>Developing Christ-like disciples of all ages and peoples.</h4>

<p>
We exist to help people become fully committed Christ-like disciples. This is more than just lip-service. We are passionate
about helping people understand exactly who Jesus was, what he was talking about nearly two thousand years ago, and
what that means for their lives today.
Bolingbrook Church is founded on the belief that the church exists to continue the work of Jesus Christ in our world. While
Jesus was on earth, He preached the good news to the poor, freed the oppressed, confronted the evils in our world,
and removed any obstacle that would keep people from living fully as God intended. Jesus demonstrated a passionate
love for outsiders; He gave them unlimited access to God’s transforming love. In the same manner, we believe that
the church ought to be a living, loving, growing community that brings healing to our world. This conviction drives
our purpose. Simply put:
</p>

<p>
Our hope is that as they begin to understand his words, they begin to live it out in the everyday. We want them to be inspired
to connect to other people who are trying to do the same, to serve others based on their passion, and to invite others
to do the same by coming into their relationship with Jesus Christ.
<b>WE EXIST TO DEVELOP CHRIST-LIKE DISCIPLES OF ALL AGES &amp; PEOPLES</b>
</p>
</div>
</section>

<section>
<div class="content">
<h2>VISION</h2>
<h4>Creating spaces for the people God misses the most</h4>

<p class="center">
Creating Spaces for the people God misses the most.
</p>

<p>
The church we see goes far beyond the confines of church walls, but one that utilizes a multitude of spaces to create genuine
relationships and facilitate growth. When we say spaces, we mean just that: houses of worship, schools, community centers,
concert halls, art &amp; music centers you name it. We desire to create a multiplicity of spaces all over the world
that make it possible for us to reach the ones God misses the most! For us, the people God misses the most are those
who are far from having their own personal relationship with God.
When you are finally at the point where you are trying to understand God and what He has planned for your life — it should
be easy, not hard. At Bolingbrook Church we are hyper-focused on the people God misses the most, those who are far
from God yet wanting to come near. For their sake, we have done our best to keep church simple. We seek to serve
those who are looking to begin exploring who God is and what Jesus has done for them. Our goal is that as they draw
towards Christ, they catch the vision and begin inviting others to embark on the same journey they are partaking
in. In order to facilitate this process, we’ve had to be incredibly intentional. This means rather than provide people
a plethora of programs to choose from, we have three disciple-making spaces that serve as intentional Jesus-Centered
communities that facilitate genuine relationships and foster authentic spiritual growth. This is not a one-size-fits-all
approach, rather we are seeking to engage each person on their journey right where they are to move them along in
a fluid disciple-making process.
</p>
</div>
</section>

<section class="white">
<div class="content">
<h2>INVITE. CONNECT. GROW.</h2>
<p>
Whether that means they gave up on church, or have never really explored God for themselves, we believe that those are the
people God misses so deeply. So, we seek to provide an embracing multicultural community where the people God misses
the most can freely inquire of God, and explore what Jesus teaches as they walk at their own pace nearer to Him. We
believe that once people feel they belong, they can become inspired to believe Jesus’ plan for their life and begin
engaging the world as Jesus sees it.
<b>Invite</b> - Our Invite spaces are corporate worship gatherings geared at helping people encounter a loving God
who has been yearning for relationship with them.
</p>
<p>
<b>Connect</b> - Our Connect spaces are intimate Jesus Communities that facilitate genuine relationships.
</p>
<p>
<b>Grow</b> - Our Grow Spaces are more intimate, even smaller groups who are committed to fostering in one another
authentic spiritual growth.
</p>
<p>
When we talk of these disciple-making spaces, we are stating that as a result of participating in our spaces, people will
come to entrust their lives to Jesus and his teachings, connect through intentional Jesus communities, serve the
neighborhood/world around them, give their time and resources to the church, and continually invite others into relationship
with Jesus Christ.
</p>
<p>
As a result, people will become freer beings, liberated to live life in abundance as God intended humanity to live it. Enabled
by the Holy Spirit, we wholeheartedly believe that those who venture in the path of discipleship will become more
loving, more joyful, more peaceable, more kind, having more patience, having more goodness, being more gentle, and
becoming more self-controlled. Thereby, fulfilling, the mission of the church to develop Christ-like disciples of
all ages and peoples.
</p>

<a md-raised-button class="center" href="http://www.adventist.org/beliefs/" (click)="believe()">Our Beliefs</a>
</div>
</section>

<section>
<div class="content values">
<h2>VALUES</h2>
<p>
Every community has some inherent values that serve as core behavioral traits for those
who choose to join in. At Bolingbrook Church, we have identified five core values that
we call all those who commit to our community to embrace and eventually live by.
</p>

<h4>Prayerful</h4>
<p class="value">
We include prayer in everything we do, knowing that it is our most powerful vehicle through which we can directly connect
to God. Through prayer, we give God unlimited access to our lives in order to accomplish His sovereign will through
us.
</p>

<h4>Gracious Flexibility</h4>
<p class="value">
We are willing to change or modify established human traditions and embrace biblical truths and practices in order to fully
demonstrate God’s eternal love.
</p>

<h4>Church of One</h4>
<p class="value">
We embrace, celebrate, and invite a multiplicity of cultures, ethnicities, generations, and various social economic classes
to come together as one family, unified to fulfill a grander God-given vision to create spaces for those who find
themselves far from God.
</p>

<h4>Authentic</h4>
<p class="value">
We foster authenticity by modeling vulnerability in leadership, creating a culture of acceptance, cultivating genuine compassion
and empathy to those around us, in order to display the depths of God’s love.
</p>

<h4>Intentional Excellence</h4>
<p class="value">
We are committed to using our strengths, talents, and thoughtful planning to create a culture that reflects the wonder of
God.
</p>

<a md-raised-button class="center" href="http://www.adventist.org/beliefs/" (click)="believe()">Our Beliefs</a>
</div>
</section>
</main>
26 changes: 26 additions & 0 deletions src/app/components/pages/about.scss
@@ -0,0 +1,26 @@
@import '../atoms/colors';

main section div.content {
h2 {
color: black;
}

p {
color: $color-grey-000;
}

&.values {
h4 {
margin-bottom: 0;
}
p.value {
margin-top: 0;
}

a {
margin-top: 20px;
color: black;
background-color: white;
}
}
}
3 changes: 2 additions & 1 deletion src/app/components/pages/about.ts
Expand Up @@ -2,7 +2,8 @@ import { Component } from '@angular/core';
import { Analytics } from '../../services';

@Component({
templateUrl: './about.html'
templateUrl: './about.html',
styleUrls: [ './about.scss' ]
})
export class AboutComponent {

Expand Down

0 comments on commit 59591a3

Please sign in to comment.