Skip to content

Commit

Permalink
Fix conflicts; cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
brylie committed Feb 15, 2016
2 parents 63eac72 + 2cccf95 commit cbbfb61
Show file tree
Hide file tree
Showing 49 changed files with 2,185 additions and 608 deletions.
2 changes: 2 additions & 0 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ cfs:standard-packages
cfs:gridfs
cfs:autoform
jeremy:selectize
zimme:active-route
yogiben:autoform-file
5 changes: 5 additions & 0 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
cfs:[email protected]
[email protected]
Expand Down Expand Up @@ -85,6 +86,8 @@ momentjs:[email protected]
[email protected]
[email protected]
[email protected]
mpowaga:[email protected]
mpowaga:[email protected]
[email protected]_2
[email protected]_1
[email protected]
Expand Down Expand Up @@ -127,3 +130,5 @@ useraccounts:[email protected]
useraccounts:[email protected]
[email protected]
[email protected]
yogiben:[email protected]
zimme:[email protected]
96 changes: 48 additions & 48 deletions landing/client/landing.html
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
<template name="landing">
<section id="landing-banner">
<div class="container">
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-8 col-md-offset-2 text-center">
<h2 id="landing-title" class="text-primary">Refugee Tech</h2>
<br>
<h2 class="text-faded">
Creative solutions to real world challenges powered by technology and collaboration.
</h2>
<a href=/projects class="btn btn-primary btn-xl">Add Project</a>
</div>
</div>
<section id="landing-banner">
<div class="container">
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-8 col-md-offset-2 text-center">
<h2 id="landing-title" class="text-primary">Refugee Tech</h2>
<br>
<h2 class="text-faded">
Creative solutions to real world challenges powered by technology and collaboration.
</h2>
<a href=/projects class="btn btn-primary btn-xl">Add Project</a>
</div>
</section>
</div>
</div>
</section>

<section id="two">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="text-primary">
Refugee Tech supports refugees in all phases of their transition.
</h2>
<hr class="primary">
</div>
</div>
<section id="two">
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="text-primary">
Refugee Tech supports refugees in all phases of their transition.
</h2>
<hr class="primary">
</div>
<div class="container">
<div class="row">
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-android-laptop wow fadeIn" data-wow-delay=".3s"></i>
<h3>Arrival</h3>
<p class="text-muted">Refugees flee unstable areas to escape ongoing humanitarian crises and seek safety in their new home, Sweden. The arrival is often fraught with trauma and stressful bureaucracy. Providing support to newly arrived refugees in this step is critical to their success.</p>
</div>
</div>
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-social-sass wow fadeInUp" data-wow-delay=".2s"></i>
<h3>Starting Anew</h3>
<p class="text-muted">Now physically safe, refugees must build an entirely new life in Sweden: seek employment, find a place to live, navigate the Swedish language and customs, and much more. We seek to offer resources and advice to refugees in this step to help refugees navigate the process of starting over in Sweden.</p>
</div>
</div>
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-ios-star-outline wow fadeIn" data-wow-delay=".3s"></i>
<h3>Fulfilling Potential</h3>
<p class="text-muted">Often, refugees are put in boxes that deny their talents and contributions, or limit their opportunities due to language and/or cultural barriers. The final step is about breaking down these barriers and allowing people to fulfill their potential as citizens and professionals.</p>
</div>
</div>
</div>
</div>
</div>
<div class="container">
<div class="row">
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-android-laptop wow fadeIn" data-wow-delay=".3s"></i>
<h3>Arrival</h3>
<p class="text-muted">Refugees flee unstable areas to escape ongoing humanitarian crises and seek safety in their new home, Sweden. The arrival is often fraught with trauma and stressful bureaucracy. Providing support to newly arrived refugees in this step is critical to their success.</p>
</div>
</div>
</section>
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-social-sass wow fadeInUp" data-wow-delay=".2s"></i>
<h3>Starting Anew</h3>
<p class="text-muted">Now physically safe, refugees must build an entirely new life in Sweden: seek employment, find a place to live, navigate the Swedish language and customs, and much more. We seek to offer resources and advice to refugees in this step to help refugees navigate the process of starting over in Sweden.</p>
</div>
</div>
<div class="col-lg-4 col-md-4 text-center">
<div class="feature">
<i class="icon-lg ion-ios-star-outline wow fadeIn" data-wow-delay=".3s"></i>
<h3>Fulfilling Potential</h3>
<p class="text-muted">Often, refugees are put in boxes that deny their talents and contributions, or limit their opportunities due to language and/or cultural barriers. The final step is about breaking down these barriers and allowing people to fulfill their potential as citizens and professionals.</p>
</div>
</div>
</div>
</div>
</section>
</template>
189 changes: 175 additions & 14 deletions landing/client/style/landing.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,180 @@
#landing-banner {
padding: 70px 0;
min-height: 70vh;
position: relative;
text-align: center;
color: #fff;
width: 100%;
background-image: url('images/background-header.jpg');
background-position: center;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
padding: 70px 0;
min-height: 70vh;
position: relative;
text-align: center;
color: #fff;
width: 100%;
background-image: url('images/background-header.jpg');
background-position: center;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
font-size: 5em;
}

#landing-title {
font-size: 3em;
text-shadow: 0 1px 0 #21235c; /* Match the color overlay hue of banner image*/
font-size: 5rem;
text-shadow: 0 1px 0 #20245C; /* Match the color overlay hue of banner image*/
}

.landing-page-slogan {
margin-left: 45%;
width: 80%;
text-align: left;
}

.landing-slogan {
font-size: 0.7em;
}

.btn-red-on-white-rounded {
background: #FFFFFF;
color: #D92D6F;
border-radius: 24px;
font-size: 2.5rem;
}

.btn-white-on-red-rounded {
background: #D92D6F;
color: #FFFFFF;
border-radius: 24px;
font-size: 2.5rem;
}

.btn-red-on-blue-rounded {
background: #20245C;
color: #D92D6F;
border-radius: 24px;
font-size: 2.5rem;
}

#landing-get-involved {
margin-top: -10%;
}

.small-landing-page-sector-header {
margin-top: 5%;
display: block;
text-align: center;
font-weight: 700;
}

.second-sector {
background-color: #FFFFFF;
min-height:400px;
}

.second-sector img {
height: 200px;
width: 200px;
}

.second-header-landing-page {
text-align: center;
font-size: 4.5rem;
font-weight: 700;
letter-spacing: 0.3rem;
}

.landing-pages-images ul {
display: inline;
list-style-type: none;
}

/* SECTION #volunteer */

.section-heading {
text-align: center;
font-size: 4.5rem;
font-weight: 700;
letter-spacing: 0.3rem;
}
.column-heading {
font-size: 4.5rem;
font-weight: 700;
letter-spacing: 0.3rem;
}
.column-paragraph {
font-size: 3rem;
font-weight: 300;
}
.top-text-box {
align-items:center;
text-align: center;
}

.top-text-box h1 {
font-size: 4em;
}

.context-header {
font-size: 1.5em;
}

.target-groups-text {
font-size: 1.5em;
}

.bgimg-refugee {
background-image: url('images/gfx_5.jpg');

min-height: 70vh;
text-align: left;
color: #fff;
background-position: center;
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
-o-background-size: cover;
}

.bgimg-banner {
position: relative;
text-align: center;
color: #fff;
background-image: url('images/background-header.jpg');
font-size: 1em;
}

.bgclr-blue {
background-color: #20245C;
color: white;
}

.bgclr-white {
background-color: white;
color:#20245C;
}


/* General Button Stuff */
.btn:focus, .btn:active:focus, .btn.active:focus {
outline: 0 none;
background-color: #20245C;
color:#D92D6F;
}

.btn:hover {
background-color: #20245C;
}

.bgclr-white.btn {
box-shadow: white;
}

.transition-column {
align-items: center;
text-align: center;
padding: 70px 0;
}

#peak1-blog {
text-align: center;
}

.section-padding {
padding-top: 3em;
padding-bottom: 3em;
}
45 changes: 44 additions & 1 deletion main/client/footer/footer.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,48 @@
#main-footer {
margin-top: 1em;
padding-top: 1em;
border-top: 1px solid #ccc;
}

.footer-contact-colab {
padding-bottom: 3rem;

}

.footer-bottom {
border-top:1px solid black;
padding-top: 3%;
padding-bottom: 3%;
}

#footer-logo-img {
width:250px;
}

.footer-top a {
color: #e92e71;
text-decoration: none;
font-size: 2rem;
}

.footer-contact-header {
font-size: 2.25rem;
margin-bottom: 1em;
font-family: "Lab Grotesque Medium", Helvetica, sans-serif;
font-weight: 500;
font-style: normal;
}

.footer-links {
float: right;
font-size: 1.8rem;
}

.footer-links a {
color: #e92e71;
text-decoration: none;
font-size: 2rem;
}

.footer-links {
margin-top: 1.3rem;
}
Loading

0 comments on commit cbbfb61

Please sign in to comment.