Various fixes and updates

- Updated CSS files with latest 2.0 release
- Removed shaded borders around content
- Added right margin to seperate content from sidebar
- Fixed disqus code
- Changed navbar color
- Many misc fixes
This commit is contained in:
Matts
2012-02-01 10:28:42 -05:00
parent 5ca71a7c77
commit 83f4323fa5
9 changed files with 422 additions and 355 deletions

View File

@@ -12,6 +12,6 @@
<h2>Comments</h2>
{% include "twitter.html" %}
{% if DISQUS_SITENAME %}<div id="disqus_thread"></div>{% endif %}
{% include 'disqus.html' %}
</div>
{% endblock %}

View File

@@ -13,7 +13,7 @@
<!-- Le styles -->
<link href="{{ SITEURL }}/theme/bootstrap.min.css" rel="stylesheet">
<link href="{{ SITEURL }}/theme/bootstrap-responsive.min.css" rel="stylesheet">
<link href="{{ SITEURL }}/theme/bootstrap.min.responsive.css" rel="stylesheet">
<link href="{{ SITEURL }}/theme/local.css" rel="stylesheet">
<link href="{{ SITEURL }}/theme/pygments.css" rel="stylesheet">
@@ -22,7 +22,7 @@
<body>
{% include "github.html" %}
<div class="navbar navbar-static">
<div class="navbar">
<div class="navbar-inner">
<div class="container">
@@ -42,7 +42,11 @@
{% endif %}
</ul>
<p class="pull-right"><a href="{{ SITEURL }}/archives.html">Archives</a> | <a href="{{ SITEURL }}/tags.html">Tags</a></p>
<ul class="nav pull-right">
<li><a href="{{ SITEURL }}/archives.html">Archives</a>
<li class="divider-vertical"></li>
<li><a href="{{ SITEURL }}/tags.html">Tags</a>
</ul>
</div>
</div>
@@ -60,7 +64,7 @@
{% if categories %}
<div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
<ul class="nav list">
<ul class="nav nav-list">
<li class="nav-header">
Categories
</li>
@@ -74,7 +78,7 @@
{% if LINKS %}
<div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
<ul class="nav list">
<ul class="nav nav-list">
<li class="nav-header">
Links
</li>
@@ -89,7 +93,7 @@
{% if SOCIAL %}
<div class="social">
<div class="well" style="padding: 8px 0; background-color: #FBFBFB;">
<ul class="nav list">
<ul class="nav nav-list">
<li class="nav-header">
Social
</li>
@@ -107,15 +111,6 @@
</div>
{% endif %}
{# <h3>Documentation</h3> #}
{# <ul> #}
{# {% for page in PAGES %} #}
{# {% if page.category|lower == "documentation" %} #}
{# <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li> #}
{# {% endif %} #}
{# {% endfor %} #}
{# </ul> #}
</div> {# End span3 #}
</div> {# End row #}
</div> {# End content #}
@@ -128,7 +123,6 @@
</div> <!-- /container -->
{% include "analytics.html" %}
{% include "disqus.html" %}
</body>
</html>

View File

@@ -1,10 +1,13 @@
{% if DISQUS_SITENAME and article %}
{% if DISQUS_SITENAME %}
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_identifier = "{{ article.url }}";
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
var disqus_shortname = '{{ DISQUS_SITENAME }}';
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
{% endif %}
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
{% endif %}

View File

@@ -13,7 +13,9 @@
<a href="{{ SITEURL }}/{{ article.url }}"><h2>{{ article.title }}</h2></a>
{% include "metadata.html" %}
</div>
<div>{{ article.content }}</div>
<hr />
</div>
{% if loop.length == 1 %}
@@ -21,8 +23,6 @@
{% endif %}
{% if loop.length > 1 %}
<hr />
<br />
<h2>Other Entries</h2>
{% endif %}
@@ -32,7 +32,7 @@
<div class='article'>
<a href="{{ SITEURL }}/{{ article.url }}"><h3>{{ article.title }}</h3></a>
<div class= "well small"> {% include "metadata.html" %} </div>
<div class="summary">{{ article.summary }} <a class="btn primary xsmall" href="{{ SITEURL }}/{{ article.url }}">read more</a></div>
<div class="summary">{{ article.summary }} <a class="btn btn-info xsmall" href="{{ SITEURL }}/{{ article.url }}">read more</a></div>
</div>
{% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %}