Skip to content

Commit

Permalink
* Fixing footer styles
Browse files Browse the repository at this point in the history
* Adding Bower
* Adding FontAwesome assets
* Compiling FontAwesome with gulp sass
* Adding bower_components to .gitignore
  • Loading branch information
Jesús Muriel committed Apr 4, 2017
1 parent 73075c0 commit c7ba809
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 15 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ _site
.sass-cache
.jekyll-metadata
node_modules
bower_components
.DS_Store
8 changes: 4 additions & 4 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<footer class="footer">
<div class="container">
<div class="">
<div class="row">
<!-- <div class="col-md-2"></div> -->
<div class="col-md-3">
Expand All @@ -10,7 +10,7 @@ <h1><b>scala</b>center</h1>
</div>
</a>
</div>
<div class="col-md-3">
<div class="col-md-2">
<h5>Scala Center</h5>
<ul>
<!-- <li><a href="{{ site.baseurl }}/become-a-member.html">Become a Member</a></li> -->
Expand All @@ -30,7 +30,7 @@ <h5>Scala</h5>
<li><a href="http://scala-lang.org/license.html">License</a></li>
</ul>
</div>
<div class="col-md-3">
<div class="col-md-2">
<h5>Find us <span class="entypo location"></span></h5>
<ul>
<li>
Expand All @@ -44,7 +44,7 @@ <h5>Find us <span class="entypo location"></span></h5>
</li>
</ul>
</div>
<div class="col-md-1">
<div class="col-md-3 text-center">
<a href="https://twitter.com/scala_lang"><i class="fa fa-twitter"></i></a>
<a href="https://github.com/scala/scala"><i class="fa fa-github"></i></a>
</div>
Expand Down
24 changes: 24 additions & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"name": "scala-center",
"description": "A starter project including full setup for Jekyll, GulpJS, SASS & BrowserSync",
"main": "index.md",
"authors": [
"Shane Osbourne"
],
"license": "ISC",
"keywords": [
"scala",
"scala-center"
],
"homepage": "https://github.com/47deg/scala.epfl.ch",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"dependencies": {
"font-awesome": "^4.7.0"
}
}
11 changes: 2 additions & 9 deletions resources/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,11 @@ $content-width: 800px;

$on-palm: 600px;
$on-laptop: 800px;

//
$top-bar-height: 106px;

// FontAwesome path
$fa-font-path: "./../../bower_components/font-awesome/fonts";

// Use media queries like this:
// @include media-query($on-palm) {
// .wrapper {
// padding-right: $spacing-unit / 2;
// padding-left: $spacing-unit / 2;
// }
// }
@mixin media-query($device) {
@media screen and (max-width: $device) {
@content;
Expand Down
5 changes: 3 additions & 2 deletions resources/css/sass/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import "_bootstrap-compass.scss";
@import "_bootstrap-mincer.scss";
@import "_bootstrap-sprockets.scss";
@import "../../../bower_components/font-awesome/scss/font-awesome";

/**
* Site footer
Expand All @@ -11,7 +12,7 @@ footer {
margin-top: -340px; /* negative value of footer height */
height: 340px;
clear:both;
padding-top: 70px;
padding: 70px 150px 0 150px;
color: $home-text-color;
background-color: $background-menu;
a, a:hover {
Expand All @@ -24,7 +25,7 @@ footer {
opacity: 0.8;
}

a.fa {
a i.fa {
font-size: 26px;
margin-right: 12px;
}
Expand Down

0 comments on commit c7ba809

Please sign in to comment.