Reformat footer content

nazmulidris · Aug 1, 2018 · c003926 · c003926
1 parent a750521
commit c003926
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 59 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -6,20 +6,6 @@
 
             <!-- Col 1 -->
             <div class="footer-col footer-col-3">
-                <ul class="contact-list">
-                    <li class="p-name">
-                        {%- if site.description -%}
-                        {{ site.description | escape }}
-                        {%- else if site.author -%}
-                        {{ site.author | escape }}
-                        {%- else -%}
-                        {{ site.title | escape }}
-                        {%- endif -%}
-                    </li>
-                    {%- if site.email -%}
-                    <li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
-                    {%- endif -%}
-                </ul>
                 {%- include social.html -%}
             </div>
 

diff --git a/_includes/site-description.html b/_includes/site-description.html
@@ -1,11 +1,5 @@
-<p>
-    Hi, I'm Nazmul Idris. I am a Googler, entrepreneur, leader, coder, designer, dancer, TaiChi’er,
-    Yogi, racer, healer, storyteller. I’m about leadership, authenticity, and empowerment.
-</p>
 <p>
     I started this website in Nov 1998 when I couldn’t find a decent tutorial on XML and Java
     to build web based apps, so I decided to write one myself, and this site was born. Today I cover
     Android, Web, Cloud technologies, and UX engineering and design topics.
-</p>
-
-
+</p>
diff --git a/_includes/social.html b/_includes/social.html
@@ -1,29 +1,16 @@
-<!-- Place this tag where you want the GitHub Follow button to render -->
-<p>
-    {%- if site.github_username -%}
-        <a class="github-button"
-           href="https://github.com/nazmulidris"
-           data-size="large"
-           data-show-count="true"
-           aria-label="Follow @nazmulidris on GitHub">
-            Follow @nazmulidris
-        </a>
+<ul class="contact-list">
+    <li class="p-name">
+        Hi, I'm Nazmul Idris. I am a Googler, entrepreneur, leader, coder, designer, dancer,
+        TaiChi’er, Yogi, racer, healer, storyteller. I’m about leadership, authenticity, and
+        empowerment.
+    </li>
+    {%- if site.email -%}
+    <li><a class="u-email" href="mailto:{{ site.email }}">{{ site.email }}</a></li>
     {%- endif -%}
-</p>
+</ul>
 
 <div class="social-media-container">
 
-    {%- if site.github_username -%}
-    <p class="social-media-item"><a
-            href="https://github.com/{{ site.github_username| cgi_escape | escape }}"
-            target="_blank">
-        <svg
-                class="svg-icon">
-            <use xlink:href="{{ '/assets/minima-social-icons.svg#github' | relative_url }}"></use>
-        </svg>
-    </a></p>
-    {%- endif -%}
-
     {%- if site.linkedin_username -%}
     <p class="social-media-item"><a
             href="https://www.linkedin.com/in/{{ site.linkedin_username| cgi_escape | escape }}"
@@ -67,69 +54,89 @@
     {%- endif -%}
 
     {%- if site.show_rss_feed -%}
-        {%- if site.rss -%}
-        <p class="social-media-item"><a href="{{ 'feed.xml' | relative_url }}">
-            <svg class="svg-icon">
-                <use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use>
-            </svg>
-        </a></p>
-        {%- endif -%}
+    {%- if site.rss -%}
+    <p class="social-media-item"><a href="{{ 'feed.xml' | relative_url }}">
+        <svg class="svg-icon">
+            <use xlink:href="{{ '/assets/minima-social-icons.svg#rss' | relative_url }}"></use>
+        </svg>
+    </a></p>
+    {%- endif -%}
     {%- endif -%}
 
     {%- if site.dribbble_username -%}
-    <p class="social-media-item"><a href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}">
+    <p class="social-media-item"><a
+            href="https://dribbble.com/{{ site.dribbble_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#dribbble' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
     {%- if site.facebook_username -%}
-    <p class="social-media-item"><a href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}">
+    <p class="social-media-item"><a
+            href="https://www.facebook.com/{{ site.facebook_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#facebook' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
     {%- if site.flickr_username -%}
-    <p class="social-media-item"><a href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}">
+    <p class="social-media-item"><a
+            href="https://www.flickr.com/photos/{{ site.flickr_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#flickr' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
     {%- if site.instagram_username -%}
-    <p class="social-media-item"><a href="https://instagram.com/{{ site.instagram_username| cgi_escape | escape }}">
+    <p class="social-media-item"><a
+            href="https://instagram.com/{{ site.instagram_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#instagram' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
     {%- if site.pinterest_username -%}
-    <p class="social-media-item"><a href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}">
+    <p class="social-media-item"><a
+            href="https://www.pinterest.com/{{ site.pinterest_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#pinterest' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
     {%- for mst in site.mastodon -%}{%- if mst.username and mst.instance -%}
-    <p class="social-media-item"><a href="https://{{ mst.instance| cgi_escape | escape}}/@{{mst.username}}">
+    <p class="social-media-item"><a
+            href="https://{{ mst.instance| cgi_escape | escape}}/@{{mst.username}}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#mastodon' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}{%- endfor -%}
 
     {%- if site.twitter_username -%}
-    <<p class="social-media-item">><a href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}">
+    <p class="social-media-item">
+        <a href="https://www.twitter.com/{{ site.twitter_username| cgi_escape | escape }}">
         <svg class="svg-icon">
             <use xlink:href="{{ '/assets/minima-social-icons.svg#twitter' | relative_url }}"></use>
         </svg>
     </a></p>
     {%- endif -%}
 
-</div>
+    <!-- Place this tag where you want the GitHub Follow button to render -->
+    {%- if site.github_username -%}
+    <p>
+        <a class="github-button"
+           href="https://github.com/nazmulidris"
+           data-size="large"
+           data-show-count="true"
+           aria-label="Follow @nazmulidris on GitHub">
+            Follow @nazmulidris
+        </a>
+    </p>
+    {%- endif -%}
+
+</div>
diff --git a/_sass/site.scss b/_sass/site.scss
@@ -52,8 +52,10 @@ $related-post-border: 4pt;
 .social-media-container {
   display: flex;
   flex-direction: row;
+  margin-top: 8pt;
+  justify-content: flex-start;
 }
 
 .social-media-item {
-  margin: 4px;
+  margin: 3pt;
 }