Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: marcoamorales/pure
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pythonclub/pythonclub-pure-theme
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jan 4, 2014

  1. Copy the full SHA
    e83fe60 View commit details
  2. Copy the full SHA
    6cdefa1 View commit details
  3. gardening.

    danclaudiupop committed Jan 4, 2014
    Copy the full SHA
    05a7961 View commit details

Commits on Jan 5, 2014

  1. fixed avatar

    danclaudiupop committed Jan 5, 2014
    Copy the full SHA
    d438aed View commit details

Commits on Jan 6, 2014

  1. Copy the full SHA
    7a0e25b View commit details
  2. ups. typo

    danclaudiupop committed Jan 6, 2014
    Copy the full SHA
    f8a5750 View commit details
  3. increased font size

    danclaudiupop committed Jan 6, 2014
    Copy the full SHA
    96137a9 View commit details

Commits on Jan 7, 2014

  1. incresead max-width

    danclaudiupop committed Jan 7, 2014
    Copy the full SHA
    736687b View commit details
  2. update line-height

    danclaudiupop committed Jan 7, 2014
    Copy the full SHA
    fda7e35 View commit details

Commits on Jan 8, 2014

  1. some minor adjustments

    danclaudiupop committed Jan 8, 2014
    Copy the full SHA
    5b98aaa View commit details

Commits on Jan 12, 2014

  1. serve from cdnjs

    danclaudiupop committed Jan 12, 2014
    Copy the full SHA
    5f02f54 View commit details

Commits on Jan 20, 2014

  1. Update README.md

    mvmocanu committed Jan 20, 2014
    Copy the full SHA
    eb3839d View commit details
  2. Update README.md

    danclaudiupop committed Jan 20, 2014
    Copy the full SHA
    d4302b5 View commit details
  3. Delete preview3.png

    danclaudiupop committed Jan 20, 2014
    Copy the full SHA
    0e9592d View commit details
  4. Delete preview2.png

    danclaudiupop committed Jan 20, 2014
    Copy the full SHA
    79f924c View commit details
  5. Delete preview1.png

    danclaudiupop committed Jan 20, 2014
    Copy the full SHA
    4f9eeac View commit details

Commits on Jan 29, 2014

  1. Update index.html

    danclaudiupop committed Jan 29, 2014
    Copy the full SHA
    9d4f2a5 View commit details
  2. Update page.html

    danclaudiupop committed Jan 29, 2014
    Copy the full SHA
    a88aae6 View commit details
  3. Update README.md

    danclaudiupop committed Jan 29, 2014
    Copy the full SHA
    a96e8d8 View commit details
  4. Update README.md

    danclaudiupop committed Jan 29, 2014
    Copy the full SHA
    1ae56d8 View commit details
  5. Update README.md

    danclaudiupop committed Jan 29, 2014
    Copy the full SHA
    8d5b2e4 View commit details

Commits on Feb 9, 2014

  1. Copy the full SHA
    afddcf8 View commit details
  2. Formatted correctly

    barrysteyn committed Feb 9, 2014
    Copy the full SHA
    2167d4e View commit details

Commits on Feb 10, 2014

  1. Merge pull request #4 from barrysteyn/master

    added ability for this theme to render latex math
    mvmocanu committed Feb 10, 2014
    Copy the full SHA
    ec68cfc View commit details

Commits on Mar 2, 2014

  1. Copy the full SHA
    24bf7f1 View commit details

Commits on Mar 3, 2014

  1. Copy the full SHA
    582bdd4 View commit details
  2. Fixed README formatting

    barrysteyn committed Mar 3, 2014
    Copy the full SHA
    efd6d2e View commit details

Commits on Mar 4, 2014

  1. Merge pull request #6 from barrysteyn/master

    Altered templates to render math based on most recent version of plugin
    danclaudiupop committed Mar 4, 2014
    Copy the full SHA
    74385a4 View commit details

Commits on Apr 14, 2014

  1. Copy the full SHA
    9605490 View commit details

Commits on Apr 15, 2014

  1. Merge pull request #7 from barrysteyn/master

    Fixed error where exception would be thrown if MATH was undefined
    danclaudiupop committed Apr 15, 2014
    Copy the full SHA
    ec38040 View commit details

Commits on May 8, 2014

  1. Copy the full SHA
    cecb113 View commit details

Commits on May 9, 2014

  1. Merge pull request #8 from jkrshw/master

    Remove gravatar icon from posts if not set
    danclaudiupop committed May 9, 2014
    Copy the full SHA
    b24c5a5 View commit details

Commits on Jun 17, 2014

  1. Copy the full SHA
    4125584 View commit details

Commits on Jun 18, 2014

  1. Merge pull request #10 from Railslide/master

    update Font Awesome to 4.1.0
    danclaudiupop committed Jun 18, 2014
    Copy the full SHA
    5fc3b83 View commit details

Commits on Jul 29, 2014

  1. add favicon

    konstantints committed Jul 29, 2014
    Copy the full SHA
    11c5605 View commit details

Commits on Jul 30, 2014

  1. Merge pull request #13 from konstantints/master

    add favicon
    danclaudiupop committed Jul 30, 2014
    Copy the full SHA
    545a5dc View commit details

Commits on Aug 4, 2014

  1. Update README.md

    danclaudiupop committed Aug 4, 2014
    Copy the full SHA
    6d8f9be View commit details

Commits on Oct 7, 2014

  1. Merge pull request #1 from PurePelicanTheme/master

    update from upstream
    luzfcb committed Oct 7, 2014
    Copy the full SHA
    e4e5cb5 View commit details
43 changes: 28 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,41 @@
pure
Pure
====

Simple collaborative blogging theme based on [Purecss](http:purecss.io) for [Pelican](http://docs.getpelican.com/) blogs.
[Collaborative blogging theme](http://purepelican.com) based on [Purecss](http:purecss.io) for [Pelican](http://docs.getpelican.com/) blogs.
Theme is responsive.

See it live at [testpy.org](http://testpy.org/)
## PELICANCONF.PY

## PREVIEW
* `COVER_IMG_URL` - Set the sidebar image for homepage.
* `PROFILE_IMAGE_URL` - Set the image/logo for the top circle cutout on sidebar.
* `TAGLINE` - Used for the page titles and some meta tags.
* `DISQUS_SITENAME` - Set this to enable disqus comments in articles.
* `GOOGLE_ANALYTICS` - Set the Google Analytics code (eg. "UA-000000-00")
* `SOCIAL` - Set some social links in the sidebar. The format should be like this:

![Pure preview](https://raw.github.com/danclaudiupop/pure/master/preview1.png)
![Pure preview](https://raw.github.com/danclaudiupop/pure/master/preview3.png)
![Pure preview](https://raw.github.com/danclaudiupop/pure/master/preview2.png)
```python
SOCIAL = (
('github', 'https://github.com/example/'),
('twitter-square', 'https://twitter.com/example'),
)
```
where the first value of the tuple is the icon name from http://fontawesome.io/icons/ after stripping `fa-` (eg. `fa-github` will be `github`)


## PELICANCONF.PY
## Article metadata:
* `about_author` - short summary about author displayed under gravatar
* `email` - display author's gravar on article. See [gravatar pelican plugin](https://github.com/getpelican/pelican-plugins/tree/master/gravatar)

* `COVER_IMG_URL` - Set the sidebar image. (Has no default yet). Width and height for image should be 1000px. Image, ideally should be served from a CDN.
* `TAGLINE` - Used for the page titles and some meta tags.
* `DISQUS_SITENAME` - Set this to enable disqus comments in articles.
* `GRAVATAR` - See pelican-plugins for configuration.
* `GOOGLE_ANALYTICS`
## PREVIEW

![Pure preview](http://i.imgur.com/lqCJVrF.png)

## Custom metadata:
* `about_author` - displayed on article page
![Pure preview](http://i.imgur.com/eCUsyGk.png)

![Pure preview](http://i.imgur.com/RkYxMIl.png)

See it live at [testpy.org](http://testpy.org/)

## Aditional features
* [FitVids](https://github.com/davatron5000/FitVids.js) jQuery plugin for fluid width video embeds.
* [Math Render Ability](https://github.com/getpelican/pelican-plugins/tree/master/render_math) *render_math* plugin for using MathJax to render both MathML and LaTex.
Binary file removed preview1.png
Binary file not shown.
Binary file removed preview2.png
Binary file not shown.
Binary file removed preview3.png
Binary file not shown.
65 changes: 52 additions & 13 deletions static/css/pure.css
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ pre {
position: absolute;
bottom: 0;
max-width: 100%;
padding-bottom: 100px;
padding-bottom: 0;
padding-top: 100px;
background-image: linear-gradient(to top,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.3) 70%,rgba(0,0,0,0) 100%);
}
@@ -81,9 +81,23 @@ pre {
word-wrap: break-word;
}

.article-avatar {
width: 120px;
height: 120px;
border-radius: 60px;
float: right;
margin-left: 1em;
border: 3px solid #fff;
z-index: 500;
background-color: #fff;
-webkit-box-shadow: 0 1px 1px rgba(0,0,0,0.3);
-moz-box-shadow: 0 1px 1px rgba(0,0,0,0.3);
box-shadow: 0 1px 1px rgba(0,0,0,0.3);
}

.about-author {
display: block;
width: 65%;
width: 85%;
padding: 0 0px;
float: right;
margin-bottom: 35px;
@@ -126,12 +140,22 @@ pre {
.tagline {
margin-left: 15px;
margin-top: -15px;
line-height: 0.8em;
line-height: 15px;
font-size: 80%;
text-shadow: 0 1px 3px rgba(0,0,0,0.3);
color: #fff;
}

.social {
display: inline-block;
}
.social a {
text-decoration: none;
margin-left: 15px;
text-shadow: 0 1px 3px rgba(0,0,0,0.3);
color: #fff;
}

.links a {
font-size: 15px;
padding-left: 15px;
@@ -154,6 +178,7 @@ pre {

.content {
padding: 2em 3em 0;
max-width: 1000px;
font-size: 110%;
line-height: 1.45;
color: #333332;
@@ -168,11 +193,6 @@ pre {
color: #333332;
letter-spacing: -1px;
}
.post-avatar {
border-radius: 50px;
float: right;
margin-left: 1em;
}
.post-meta {
color: #999;
font-size: 90%;
@@ -200,9 +220,13 @@ pre {
line-height: 130%;
}

.archive-avatar {
.avatar {
float: right;
border-radius: 50px;
margin-left: 16px;
margin-top: 7px;
width: 70px;
height: 70px;
}

.archive-meta {
@@ -273,21 +297,36 @@ pre {
width: 100%;
position: relative;
margin: 0;
height: 425px;
height: 325px;
}
.sidebar.sidebar-article {
height: auto;
border-bottom: 1px #dededc solid;
padding-bottom: 35px;
}

.content {
padding: 1em 1.5em 0;
font-size: 85%;
}

.cover-img {
background-position: 0;
background-size: cover;
}

.post-avatar {
margin-top: 15px;
float: none;
.avatar {
width: 45px;
height: 45px;
}

.article-avatar {
float: none
}

.about-author {
width: 100%;
padding: 0 100px;
}

.cover-body {
74 changes: 0 additions & 74 deletions static/js/jquery.fitvids.js

This file was deleted.

22 changes: 11 additions & 11 deletions templates/archives.html
Original file line number Diff line number Diff line change
@@ -6,20 +6,20 @@
{% block content %}
<div class="pure-g-r" id="layout">
{% include 'sidebar.html' %}
<div class="pure-u-3-4">
<div class="pure-u-1">
<div class="content">
<h1 class="content-subhead">All posts</h1>
{% for article in dates %}
<div class="pure-g-r archive-item">
<div class="pure-u-1">
<h5 class="archive-date">{{ article.date|strftime('%Y') }}</h5>
<a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
<img class="archive-avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}" height="64" width="64">
</a>
<h4 class="archive-date">{{ article.date|strftime('%d %B') }}</h4>
<div class="archive-post"><a href="{{ article.url }}">{{ article.title }}</a></div>
<p class="archive-meta">{{ article.author }} in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
</div>
<div class="archive-item">
<a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
{% if article.author_gravatar %}
<img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
{% endif %}
</a>
<h5 class="archive-date">{{ article.date|strftime('%Y') }}</h5>
<h4 class="archive-date">{{ article.date|strftime('%d %B') }}</h4>
<div class="archive-post"><a href="{{ article.url }}">{{ article.title }}</a></div>
<p class="archive-meta">{{ article.author }} in <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a></p>
</div>
{% endfor %}
</div>
11 changes: 6 additions & 5 deletions templates/article.html
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
{% endblock %}

{% block head_js %}
<script src="{{ SITEURL }}/theme/js/jquery.fitvids.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/fitvids/1.0.1/jquery.fitvids.min.js"></script>
<script>
$(document).ready(function(){
$(".content").fitVids();
@@ -16,22 +16,23 @@

{% block content %}
<div class="pure-g-r" id="layout">
<div class="sidebar pure-u">
<div class="sidebar sidebar-article pure-u">
<header class="header-article">
<hgroup>
<a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
<img class="post-avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}" height="100" width="100">
{% if article.author_gravatar %}
<img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
{% endif %}
</a>
<h2 class="article-info">{{ article.author }}</h2>
<small class="about-author">{{ article.about_author }}</small>
<h5>Published</h5>
<p>{{ article.locale_date }}</p>
<a href="/">&larr;Home</a>
<hr>
</hgroup>
</header>
</div>
<div class="pure-u-3-4">
<div class="pure-u">
<div class="content">
<section class="post">
<header class="post-header">
9 changes: 7 additions & 2 deletions templates/base.html
Original file line number Diff line number Diff line change
@@ -22,11 +22,16 @@
<title>{% block title %}{{ SITENAME }} // {{ TAGLINE }}{% endblock title %}</title>
{% endblock head %}

<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.3.0/pure-min.css">
{% if FAVICON %}
<link href="{{ SITEURL }}/{{ FAVICON }}" rel="icon">
{% endif %}

<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.3.0/pure-min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.1.0/css/font-awesome.min.css">
<link rel="stylesheet" href="{{ SITEURL }}/theme/css/pure.css">
{% block head_css %}{% endblock %}

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
{% block head_js %}{% endblock %}
</head>

10 changes: 9 additions & 1 deletion templates/index.html
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
{% block content %}
<div class="pure-g-r" id="layout">
{% include 'sidebar.html' %}
<div class="pure-u-3-4">
<div class="pure-u-1">
<div class="content">
<!-- A wrapper for all the blog posts -->
<div class="posts">
@@ -21,6 +21,14 @@ <h1 class="content-subhead">
</h1>
{% for article in articles_page.object_list %}
{% include 'post.html' %}
{% if MATH is defined and not MATH['auto_insert'] %}
{% if page and page.mathjax or article and article.mathjax %}
{% set mathjax = True %}
{% endif %}
{% endif %}
{% if loop.last and mathjax is defined %}
{{ MATHJAXSCRIPT }}
{% endif %}
{% endfor %}
{% include 'pagination.html' %}
{% include 'footer.html' %}
2 changes: 1 addition & 1 deletion templates/page.html
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
{% block content %}
<div class="pure-g-r" id="layout">
{% include 'sidebar.html' %}
<div class="pure-u-3-4">
<div class="pure-u-1">
<div class="content">
<h1 class="content-subhead">{{ page.title }}</h1>
<p>{{ page.content }}</p>
4 changes: 3 additions & 1 deletion templates/post.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<section class="post">
<header class="post-header">
<a href="{{ SITEURL }}/{{ article.author.url }}" title="See posts by {{ article.author }}">
<img class="post-avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}" height="72" width="72">
{% if article.author_gravatar %}
<img class="avatar" alt="{{ article.author }}" src="{{ article.author_gravatar }}">
{% endif %}
</a>
<h3><a class="post-title" href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h3>
<p class="post-meta">{{ article.summary }}</p>
Loading