Skip to content

Commit

Permalink
Merge pull request #32 from SheSharpGr/hero
Browse files Browse the repository at this point in the history
Replaced the welcome section
  • Loading branch information
ptrgast committed Dec 11, 2015
2 parents 11b91af + c795486 commit 3f5d381
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 28 deletions.
2 changes: 1 addition & 1 deletion _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
<link href='https://fonts.googleapis.com/css?family=Patua+One|Noto+Sans' rel='stylesheet' type='text/css'>
<link href='https://fonts.googleapis.com/css?family=Patua+One|Noto+Sans|Noto+Serif:700&subset=greek,latin' rel='stylesheet' type='text/css'>

<link rel="apple-touch-icon-precomposed" sizes="57x57" href="/assets/favicon/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="/assets/favicon/apple-touch-icon-114x114.png" />
Expand Down
6 changes: 5 additions & 1 deletion _sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,16 @@ header {
}

body>.container>.main{
/*padding: 70px 70px;*/
}

.main .content {
padding: 70px 70px;
}

h1, h2, h3{
color: $color-lightbrown;
font-family: $title-font-family;
font-family: $headers-font-family;
}

h1{
Expand Down
27 changes: 27 additions & 0 deletions _sass/_places.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
.main .hero {
width: 100%;
/*max-height: 400px;*/
background: url('/assets/img/hero.png') no-repeat top left;
padding: 70px;
color: $color-lightbrown;
}

.main .hero h1 {
color: $color-lightbrown;
font-family: $base-font-family;
font-size: 18px;
}

.main .hero p {
color: $color-darkbrown;
font-family: $headers-font-family;
font-size: 30px;
}

.main .hero .row {
margin-bottom: 0px;
}

.main .hero .share ul {
margin-left: 0px;
}
Binary file added assets/img/hero.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $color-white: #fff;
$color-black: #000;

$title-font-family: "Patua One", "Times New Roman", serif;
$headers-font-family: "Noto Serif", "Times New Roman", serif;
$base-font-family: "Noto Sans", Arial, sans-serif;
$base-font-size: 14px;
$small-font-size: $base-font-size * 0.875;
Expand Down Expand Up @@ -56,5 +57,6 @@ $on-laptop: 800px;
// Import partials from `sass_dir` (defaults to `_sass`)
@import
"boot",
"layout"
"layout",
"places"
;
60 changes: 35 additions & 25 deletions ngtpl/places.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,48 @@
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>

<div class="home" ng-controller="PlacesCtrl as placesCtrl">
<div class="row">
<div class="hero">
<h1>Θες να βοηθήσεις τους πρόσφυγες;</h1>
<p>
Όλα τα σημεία<br/>
συγκέντρωσης &amp; διανομής αγαθών<br/>
σε ένα μέρος!
</p>
<div class="row">
<div class="col-lg-8"></div>
<div class="col-lg-4 share">
Share the love
<ul class="nav">
<li>
<a href="https://twitter.com/share" data-url="http://bordershare.gr/" data-text="Share resources; Show solidarity with refugees " data-size="medium" via="BorderShare" related="BorderShare" class="twitter-share-button">Tweet</a>
</li>
<li>
<a href="https://twitter.com/BorderShare" class="twitter-follow-button" data-show-count="false" data-lang="en">Follow @BorderShare</a>
</li>
<li>
<div data-action="share" data-annotation="bubble", data-href="http://bordershare.gr" class="g-plus"></div>
</li>
<li>
<div class="fb-like" data-href="https://www.facebook.com/bordershare" data-layout="button_count" data-action="like" data-show-faces="false" data-share="false" data-width="200"></div>
</li>
</ul>
</div>
</div>
</div>

<div class="home content" ng-controller="PlacesCtrl as placesCtrl">
<!-- <div class="row">
<img class="hero" src="/assets/img/hero.png" alt="Logo">
<h1>Welcome / Καλώς Ήρθατε</h1>
<p>BorderShare is an information distributor for anything you can do to help the refugee problem. We collect all the refugee drop-in points for food, clothes and everything they might need.</p>
<p>Το BorderShare διακινεί την πληροφορία σχετικά με το πως μπορείς να βοηθήσεις το πρόβλημα με τους πρόσφυγες. Συγκεντρώνουμε όλα τα σημεία δωρεάς αγαθών προς διανομή σε προσφυγικούς καταυλισμούς. Μπορείς να βοηθήσεις;</p>
</div>
<h3>Share the love</h3>
<div class="row">
<div class="col-lg-8 share">
<ul class="nav">
<li>
<a href="https://twitter.com/share" data-url="http://bordershare.gr/" data-text="Share resources; Show solidarity with refugees " data-size="medium" via="BorderShare" related="BorderShare" class="twitter-share-button">Tweet</a>
</li>
<li>
<a href="https://twitter.com/BorderShare" class="twitter-follow-button" data-show-count="false" data-lang="en">Follow @BorderShare</a>
</li>
<li>
<div data-action="share" data-annotation="bubble", data-href="http://bordershare.gr" class="g-plus"></div>
</li>
<li>
<div class="fb-like" data-href="https://www.facebook.com/bordershare" data-layout="button_count" data-action="like" data-show-faces="false" data-share="false" data-width="200"></div>
</li>
</ul>

</div>
</div>
<h1 class="no-margin-bottom">Places</h1>
</div> -->
<h1 class="no-margin-bottom">Περιοχές</h1>
<div class="loader rotating" ng-show="placesCtrl.isLoading"></div>
<div class="filters" ng-show="!placesCtrl.isLoading">
<ul class="area-filter-items">
<li>Περιοχές:&nbsp;</li>
<li><!--Περιοχές:&nbsp;--></li>
<li ng-repeat="areaFilter in placesCtrl.filterAreaItems">
<a ng-href="/" title="Αφαιρέστε τα φίλτρα" ng-bind="placesCtrl.filterAreaItemLabels[$index]" ng-show="areaFilter == 'all'" ng-class="{selectedfilter: placesCtrl.activeAreaFilter === ''}"></a>
<a ng-href="/?area={[{areaFilter}]}" title="Φιλτράρετε ανά περιοχή" ng-bind="placesCtrl.filterAreaItemLabels[$index]" ng-show="areaFilter != 'all'" ng-class="{selectedfilter: areaFilter === placesCtrl.activeAreaFilter}"></a>
Expand Down

0 comments on commit 3f5d381

Please sign in to comment.