Merge branch 'develop'

This commit is contained in:
Michael Rose 2013-07-10 11:33:37 -04:00
commit e35eb08f7e
4 changed files with 54 additions and 1 deletions

15
404.md Normal file
View file

@ -0,0 +1,15 @@
---
layout: page
title: "Page Not Found"
description: "Page not found. Your pixels are in another canvas."
---
Sorry, but the page you were trying to view does not exist --- perhaps you can try searching for it below.
<script type="text/javascript">
var GOOG_FIXURL_LANG = 'en';
var GOOG_FIXURL_SITE = '{{ site.url }}'
</script>
<script type="text/javascript"
src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js">
</script>

View file

@ -2,7 +2,7 @@
layout: page
permalink: /about/index.html
title: About the Jekyll Theme
tags: [Jekyll, theme, themes, simple, minimal, minimalism, responsive]
tags: [Jekyll, theme, simple, minimal, minimalism, responsive]
image:
feature: so-simple-sample-image-4.jpg
---
@ -19,6 +19,7 @@ Looking for a simple, responsive, theme for your Jekyll powered blog? Well look
* Disqus comments if you choose to enable.
* Simple and clear permalink structure[^1].
* Tags for [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) for a better social sharing experience.
* Custom 404 page
<a markdown="0" href="{{ site.url }}/theme-setup" class="btn">Install Minimal Mistakes Theme</a>

View file

@ -615,3 +615,7 @@ span+.entry-title{margin-top:0;}
.footer-wrapper a{color:#666666;}
.social-icons{margin:1em 0 2em;}.social-icons a{padding:4px 8px;}.social-icons a:hover{color:#000000;}
.upgrade{padding:10px;text-align:center;}
#goog-fixurl ul{list-style:none;margin-left:0;padding-left:0;}#goog-fixurl ul li{list-style-type:none;}
#goog-wm-qt{width:auto;margin-right:10px;}
#goog-wm-sb{display:inline-block;padding:8px 20px;background-color:#000000;color:#ffffff;border:2px solid #000000 !important;-webkit-border-radius:20px;-moz-border-radius:20px;border-radius:20px;}#goog-wm-sb:visited{color:#ffffff;}
#goog-wm-sb:hover{background-color:#ffffff;color:#000000;}

View file

@ -395,4 +395,37 @@ span + .entry-title {
.upgrade {
padding: 10px;
text-align: center;
}
// Google Search
// --------------------------------------------------
#goog-fixurl {
ul {
list-style: none;
margin-left: 0;
padding-left: 0;
li {
list-style-type: none;
}
}
}
#goog-wm-qt {
width: auto;
margin-right: 10px;
}
#goog-wm-sb {
display: inline-block;
padding: 8px 20px;
background-color: @black;
color: @white;
border: 2px solid @black !important;
.rounded(20px);
&:visited {
color: @white;
}
&:hover {
background-color: @white;
color: @black;
}
}