Merge pull request #23 from BubuDavid/sm-icons

Closes #14

Author: ricardomiron

Gemfile

@@ -4,6 +4,7 @@ gem "jekyll", ">= 3.7.4"
 gem "ffi", ">= 1.9.24"
 gem 'jekyll-admin', group: :jekyll_plugins
 gem 'rouge', '~> 3.5', '>= 3.5.1'
+gem 'tzinfo-data'
 
 group :jekyll_plugins do
   gem 'jekyll-archives', '2.1.1'

Gemfile.lock

@@ -10,7 +10,9 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     ffi (1.10.0)
+    ffi (1.10.0-x64-mingw32)
     forwardable-extended (2.6.0)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
@@ -85,9 +87,14 @@ GEM
       sinatra (~> 1.4.0)
       tilt (>= 1.3, < 3)
     tilt (2.0.9)
+    tzinfo (2.0.0)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   ffi (>= 1.9.24)
@@ -99,6 +106,7 @@ DEPENDENCIES
   jekyll-seo-tag (= 2.4.0)
   jekyll-sitemap (= 1.2.0)
   rouge (~> 3.5, >= 3.5.1)
+  tzinfo-data
 
 BUNDLED WITH
    2.0.2

_config.yml

@@ -108,6 +108,7 @@ social_icons:
   - Twitter
   - YouTube
   - RSS
+  - GitHub
 
 _comments:
   map: Update the map location and display settings.

_data/footer.yml

@@ -20,20 +20,20 @@
 #   - name: Status
 #     link: /
 #     new_window: true
-# - links:
-#   - name: Facebook
-#     link: https://www.facebook.com/f.lab.mx/
-#     new_window: true
-#     social_icon: Facebook
-#   - name: Twitter
-#     link: https://twitter.com
-#     social_icon: Twitter
-#     new_window: true
-#   - name: YouTube
-#     link: https://youtube.com
-#     social_icon: YouTube
-#     new_window: true
-#   - name: RSS
-#     link: /feed.xml
-#     social_icon: RSS
-#     new_window: false
+ - links:
+   - name: Facebook
+     link: https://www.facebook.com/f.lab.mx/
+     new_window: true
+     social_icon: Facebook
+   - name: Twitter
+     link: https://twitter.com/futurelabmx
+     social_icon: Twitter
+     new_window: true
+   - name: Instagram
+     link: https://www.instagram.com/futurelabmx/
+     social_icon: Instagram
+     new_window: true
+   - name: GitHub
+     link: https://github.com/futurelabmx
+     social_icon: GitHub
+     new_window: true

_includes/social-icon.html

@@ -17,4 +17,8 @@
 		<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M10,16.5V7.5L16,12M20,4.4C19.4,4.2 15.7,4 12,4C8.3,4 4.6,4.19 4,4.38C2.44,4.9 2,8.4 2,12C2,15.59 2.44,19.1 4,19.61C4.6,19.81 8.3,20 12,20C15.7,20 19.4,19.81 20,19.61C21.56,19.1 22,15.59 22,12C22,8.4 21.56,4.91 20,4.4Z" /></svg>
 	{% when "RSS" %}
 		<svg fill="#000000" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z" fill="none"/><circle cx="6.18" cy="17.82" r="2.18"/><path d="M4 4.44v2.83c7.03 0 12.73 5.7 12.73 12.73h2.83c0-8.59-6.97-15.56-15.56-15.56zm0 5.66v2.83c3.9 0 7.07 3.17 7.07 7.07h2.83c0-5.47-4.43-9.9-9.9-9.9z"/></svg>
-{% endcase %}
+
+	{% when "GitHub" %}
+		<svg fill="#000000" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" width="24"><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg>
+
+{% endcase %}

_layouts/default.html

@@ -23,18 +23,19 @@
 			</div>
 		</header>
 		{{ content }}
+
+
 		<footer>
 			<div class="container">
 				<p class="editor-link"><a href="cloudcannon:collections/_data/footer.yml" class="btn"><strong>&#9998;</strong> Edit footer</a></p>
 				<div class="footer-columns">
 					{% for column in site.data.footer %}
 					<ul class="footer-links">
 						{% for link in column.links %}
-							<li><a {% if link.new_window %}target="_blank"{% endif %} href="{% include relative-src.html src=link.link %}" {% if link.social_icon %}class="{{ link.social_icon }}-icon"{% endif %}>
+							<li class="bubu_style_li"><a {% if link.new_window %}target="_blank"{% endif %} href="{% include relative-src.html src=link.link %}" {% if link.social_icon %}class="{{ link.social_icon }}-icon"{% endif %}>
 								{% if link.social_icon %}
 									{% include social-icon.html icon=link.social_icon %}
-								{% endif %}
-								{{ link.name }}</a></li>
+								{% endif %}</a></li>
 						{% endfor %}
 					</ul>
 					{% endfor %}
@@ -46,6 +47,8 @@
 				</center>
 			</div>
 		</footer>
+
+
 		<!-- Chatfuel plugin-->
 		<script>
 		  var div = document.createElement('div');

_sass/footer.scss

@@ -2,6 +2,7 @@
 	width: 100%;
 	margin: 10px;
 	padding: 0;
+	text-align: center;
 
 	@media #{$tablet} {
 		-webkit-flex: 1 0 180px;
@@ -11,6 +12,7 @@
 	li {
 		list-style: none;
 		margin: 15px auto;
+		display: inline;
 
 		@media #{$tablet} {
 			max-width: 150px;