Merge branch 'hotfix/updates' into develop

mmistakes · Jul 16, 2013 · 21082cd · 21082cd
2 parents 38dcf25 + ef43b21
commit 21082cd
Show file tree

Hide file tree

Showing 10 changed files with 713 additions and 4,945 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Your Google Analytics ID goes here along with meta tags for [Google Webmaster To
 
 #### Top Navigation Links
 
-Edit page/post titles and URLs to include in the site's navigation. If you want to add links to other sites you can hardcode them into `navigation.html`.
+Edit page/post titles and URLs to include in the site's navigation. For external links add `external: true`.
 
 ``` yaml
 # sample top navigation links
@@ -79,6 +79,9 @@ links:
     url: /articles
   - title: Other Page
     url: /other-page
+  - title: External Page
+    url: http://mademistakes.com
+    external: true
 ```
 
 #### Other Stuff

diff --git a/_config.yml b/_config.yml
@@ -1,40 +1,44 @@
-title:            Minimal Mistakes
-tagline:          Jekyll Theme
-description:      A responsive Jekyll theme large featured images and solid typography.
+title:            Site Title
+tagline:          A short tagline
+description:      Describe your website.
 #Comment out url when working locally to resolve base urls correctly
-url:              http://mmistakes.github.io/minimal-mistakes
+url:              http://your-site.com
 
 # Owner/author information
 owner:
-  name:           Michael Rose
+  name:           Your Name
   avatar:         bio-photo.jpg
-  bio:            "Just another boring, time traveling, tattooed, designer from Buffalo New York."
-  email:          michael@mademistakes.com
+  bio:            "Describe your self."
+  email:          your@email.com
   # Social networking links are used in author-bio sidebar. Update and remove as you like.
-  twitter:        "mmistakes"
+  twitter:        
   facebook:       
-  github:         "mmistakes"
+  github:         
   linkedin:       
-  instagram:      "mmistakes"
+  instagram:      
   lastfm:         
   tumblr:         
   # For Google Authorship https://plus.google.com/authorship
-  google_plus:    "http://plus.google.com/118238196859537351707"
+  google_plus:    
 
 # Analytics and webmaster tools stuff goes here
-google_analytics:   UA-2011187-3
-google_verify:      UQj93ERU9zgECodaaXgVpkjrFn9UrDMEzVamacSoQ8Y
+google_analytics:   
+google_verify:      
 # https://ssl.bing.com/webmaster/configure/verify/ownership Option 2 content= goes here
-bing_verify:        D81F4C18A6CB3018F64D7C827D953DFD
+bing_verify:        
 
-# Internal pages/posts to include in top navigation
+# Links to include in top navigation
+# For external links add external: true
 links:
   - title: About
     url: /about
   - title: Articles
     url: /articles
   - title: Theme Setup
     url: /theme-setup
+  - title: Made Mistakes
+    url: http://mademistakes.com
+    external: true
 
 # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 timezone:    America/New_York

diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -6,7 +6,7 @@
 		<nav role="navigation" itemscope itemtype="http://schema.org/SiteNavigationElement">
 		    <ul>
 		        {% for link in site.links %}
-				<li><a href="{{ site.url }}{{ link.url }}">{{ link.title }}</a></li>
+				<li><a href="{% if link.external %}{{ link.url }}{% else %}{{ site.url }}{{ link.url }}{% endif %}" {% if link.external %}target="_blank"{% endif %}>{{ link.title }}</a></li>
 		        {% endfor %}
 		        <li><i class="icon-feed"></i> <a href="{{ site.url }}/feed.xml" title="Atom/RSS feed">Feed</a>
 		    </ul>