Merge branch 'hotfix/minor-fixes' into develop

This commit is contained in:
Michael Rose 2013-08-04 22:59:42 -04:00
commit b3d74b7487
4 changed files with 3458 additions and 695 deletions

View file

@ -30,8 +30,6 @@
<!-- For all browsers --> <!-- For all browsers -->
<link rel="stylesheet" href="{{ site.url }}/assets/css/main.css"> <link rel="stylesheet" href="{{ site.url }}/assets/css/main.css">
<!-- Animations -->
<link rel="stylesheet" href="{{ site.url }}/assets/css/animate.css">
<!-- Webfonts --> <!-- Webfonts -->
<script src="//use.edgefonts.net/source-sans-pro:n2,i2,n3,i3,n4,i4,n6,i6,n7,i7,n9,i9;source-code-pro:n4,n7;volkhov.js"></script> <script src="//use.edgefonts.net/source-sans-pro:n2,i2,n3,i3,n4,i4,n6,i6,n7,i7,n9,i9;source-code-pro:n4,n7;volkhov.js"></script>

View file

@ -4,7 +4,7 @@
{% for link in site.links %} {% for link in site.links %}
<li><a href="{{ site.url }}{{ link.url }}">{{ link.title }}</a></li> <li><a href="{{ site.url }}{{ link.url }}">{{ link.title }}</a></li>
{% endfor %} {% endfor %}
<li><a href="http://feeds.feedburner.com/MadeMistakes" title="Atom/RSS feed"><i class="icon-rss"></i> Feed</a> <li><a href="{{ site.url }}/feed.xml" title="Atom/RSS feed"><i class="icon-rss"></i> Feed</a>
</ul> </ul>
</nav> </nav>
</div><!-- /.navigation-wrapper --> </div><!-- /.navigation-wrapper -->

File diff suppressed because it is too large Load diff

View file

@ -7,7 +7,6 @@
margin: 0; margin: 0;
padding: 1em; padding: 1em;
} }
}
.hll { background-color: #ffffcc } .hll { background-color: #ffffcc }
.c { color: #999988; font-style: italic } /* Comment */ .c { color: #999988; font-style: italic } /* Comment */
.err { color: #a61717; background-color: #e3d2d2 } /* Error */ .err { color: #a61717; background-color: #e3d2d2 } /* Error */
@ -69,3 +68,4 @@
.vg { color: #008080 } /* Name.Variable.Global */ .vg { color: #008080 } /* Name.Variable.Global */
.vi { color: #008080 } /* Name.Variable.Instance */ .vi { color: #008080 } /* Name.Variable.Instance */
.il { color: #009999 } /* Literal.Number.Integer.Long */ .il { color: #009999 } /* Literal.Number.Integer.Long */
}