Skip to content

Commit 119ee97

Browse files
committed
Merge pull request #2 from cmr/master
merge master
2 parents 188991c + ce71d04 commit 119ee97

38 files changed

+1716
-141
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
bin
33
lib
44
include
5-
themes
65
output
76
*~

README.md

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@ for pr in $(xsel -ob); do firefox https://github.com/mozilla/rust/pull/$pr; slee
1313
# write TWIR
1414
```
1515

16-
## How I get new contributors:
16+
Alternately use GitHub search:
1717

18-
new_contribs.sh 6/21/2014 > ~/entropy/newbies.txt
18+
```
19+
https://github.com/rust-lang/rust/pulls?q=is%3Apr+is%3Amerged+updated%3A2014-11-03..2014-11-10
20+
```
21+
22+
## How I get new contributors:
23+
24+
Use the included `new_contribs.sh` script:
1925

20-
Where `new_contribs.sh` is:
26+
new_contribs.sh 6/21/2014
2127

22-
```sh
23-
#!/usr/bin/sh
28+
## Building
2429

25-
INITIAL_COMMIT=c01efc6
26-
START_COMMIT=`git log --before="$1" --author=bors --pretty=format:%H|head -n1`
27-
ALL_NAMES=`git log $INITIAL_COMMIT.. --pretty=format:%an|sort|uniq`
28-
OLD_NAMES=`git log $INITIAL_COMMIT..$START_COMMIT --pretty=format:%an|sort|uniq`
29-
echo "$OLD_NAMES">names_old.txt
30-
echo "$ALL_NAMES">names_all.txt
31-
diff names_old.txt names_all.txt
32-
rm names_old.txt names_all.txt
3330
```
31+
pelican content -s pelicanconf.py
32+
```

cache/ArticlesGenerator-Readers

8.22 KB
Binary file not shown.

cache/PagesGenerator-Readers

0 Bytes
Binary file not shown.

content/2014-11-10-this-week-in-rust.markdown

Lines changed: 123 additions & 126 deletions
Large diffs are not rendered by default.

new_contribs.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/sh
2+
3+
INITIAL_COMMIT=c01efc6
4+
START_COMMIT=`git log --before="$1" --author=bors --pretty=format:%H|head -n1`
5+
ALL_NAMES=`git log $INITIAL_COMMIT.. --pretty=format:%an|sort|uniq`
6+
OLD_NAMES=`git log $INITIAL_COMMIT..$START_COMMIT --pretty=format:%an|sort|uniq`
7+
echo "$OLD_NAMES">names_old.txt
8+
echo "$ALL_NAMES">names_all.txt
9+
names=`diff names_old.txt names_all.txt`
10+
rm names_old.txt names_all.txt
11+
names=`echo "$names" | grep \> | sed 's/^>/*/'`
12+
echo "$names"

run.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/sh
22
. ./bin/activate
33
./bin/pelican content -s pelicanconf.py -t themes/pelican-elegant-1.3
4-
rsync -razvP --delete-after output/ [email protected]:twir
4+
if [ "$REALLY_DEPLOY" = "1" ]; then
5+
rsync -razvP --delete-after output/ [email protected]:twir
6+
fi

themes/pelican-elegant-1.3/.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Generated by http://gitignore.io
2+
3+
### OSX ###
4+
.DS_Store
5+
.AppleDouble
6+
.LSOverride
7+
Icon
8+
9+
10+
# Thumbnails
11+
._*
12+
13+
# Files that might appear on external disk
14+
.Spotlight-V100
15+
.Trashes
16+
17+
### vim ###
18+
.*.s[a-w][a-z]
19+
*.un~
20+
Session.vim
21+
.netrwhist
22+
*~

themes/pelican-elegant-1.3/LICENSE.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
The license requires that you give credit to me, Talha Mansoor, as the author of the Elegant theme on every site that uses this theme. I have placed the attribution in the footer of every page. Do not remove it. If you need to remove or change the style of the attribution, please get in [touch with me](http://oncrashreboot.com/#about-me) first.
2+
3+
Along with this attribution clause, Elegant theme is licensed under The MIT License.
4+
5+
If you use my theme, I would love to hear from you. [Get in touch](http://oncrashreboot.com/#about-me) and let me know about it. I may link to your site too.
6+
7+
Please visit License section of [Elegant - a theme for Pelican](http://oncrashreboot.com/pelican-elegant) at my blog for updated licensing details.

themes/pelican-elegant-1.3/README.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Please visit [Elegant - a theme for Pelican](http://oncrashreboot.com/pelican-elegant) at my blog for detailed features and documentation.
2+
3+
Elegant offers several unique features including search, live filter, collapsible comments, Mailchimp, custom 404 page, etc. It is a minimal, and stylish theme that looks amazing across all screen resolutions and devices.
4+
5+
Here is an example search result
6+
7+
![Search result screenshot](https://raw.github.com/talha131/pelican-elegant/master/search-result-screenshot.png)
8+
9+
Here is how the home page looks like
10+
11+
![Home page screenshot](https://raw.github.com/talha131/pelican-elegant/master/home-page-screenshot.png)
12+
13+
This is how a generated article looks like
14+
15+
![Article screenshot](https://raw.github.com/talha131/pelican-elegant/master/article-screenshot.png)
16+
17+
[![githalytics.com alpha](https://cruel-carlota.pagodabox.com/c71132a529c1c5d7eb8dc5ea4825a851 "githalytics.com")](http://githalytics.com/talha131/pelican-elegant)
18+
19+
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/talha131/pelican-elegant/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
Version 1.3
2+
===========
3+
4+
* Next and previous article navigation is placed below comments section so that article's content and comments appear together
5+
* Article title and site name in `<title>` tag is separated by ` · ` which is cleaner and more subtle than ` - `
6+
* Subtitle of articles and pages is added in `<title>` tag along with main title
7+
* Description meta tag on Home Page uses `SITE_DESCRIPTION`
8+
* Bug fix: Expand comments section if URL points to a comment
9+
* Bug fix: CSS style of links in an unordered list inside article content is different from article links
10+
11+
Version 1.2
12+
===========
13+
14+
* RSS and Atom feed links
15+
* CSS style for permanent links added. It is visible only user hovers over the heading
16+
* Block quote is indented towards left
17+
* Bug fix: Hyperlink dashed underline is not visible on Chrome
18+
* Bug fix: Text in list goes beyond list marker when text is long and overflows to next line
19+
* Bug fix: Disqus comment count is always 0
20+
21+
Version 1.1
22+
===========
23+
24+
* Add template for pages. Pages do not have tags, category and Disqus comments
25+
* Keep style of a hyperlink in `modified` meta data consisted with the theme
26+
* Add `keywords` meta tag that uses keywords, tags and category attribute of articles and pages
27+
* Validate search form for empty strings
28+
* If `RECENT_ARTICLES_COUNT` is undefined, set it to 10. So that Pelican does not throw critical error
29+
* Bug fix: Path of search.html in search form action should always be absolute
30+
* Bug fix: Copyright meta tag should be set to the author, instead of the license
31+
* Bug fix: Close meta tags
32+
* Bug fix: ID of search form in 404 page should be different from the ID of search form in main navigation
33+
* Bug fix: Links in ordered list in an article do not conform to the link style in rest of the article
34+
35+
Version 1.0
36+
===========
37+
38+
* Initial release

themes/pelican-elegant-1.3/THANKS.md

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
Thanks to
2+
=========
3+
4+
[tshepang](https://github.com/tshepang)
5+
---------------------------------------
6+
7+
### Oct 4, 2013
8+
9+
1. He [reported](https://github.com/talha131/pelican-elegant/issues/10) an issue with CSS style of links in an unordered lists.
10+
11+
### Oct 1, 2013
12+
13+
1. He [reported](https://github.com/talha131/pelican-elegant/issues/6) that it is not possible to link to a Disqus comment.
14+
15+
### Sep 29, 2013
16+
17+
1. He [reported](https://github.com/talha131/pelican-elegant/issues/5) hyperlink style compatibility issue on Chrome.
18+
1. He [reported](https://github.com/talha131/pelican-elegant/issues/3) an issue with link style.
19+
1. He [reported](https://github.com/talha131/pelican-elegant/issues/4) the bug that Disqus comment count is always zero.
20+
21+
[yuex](https://github.com/yuex)
22+
-------------------------------
23+
24+
### Sep 15, 2013
25+
26+
1. He submitted a [patch](https://github.com/talha131/pelican-elegant/pull/2) to the project.
27+
28+
[Melissa](https://github.com/meli-lewis)
29+
----------------------------------------
30+
### Sep 3, 2013
31+
32+
1. She reported a [critical bug](https://github.com/talha131/pelican-elegant/issues/1).
33+
34+
[John](http://twitter.com/BostonEnginerd)
35+
-----------------------------------------
36+
37+
### Sep 2, 2013
38+
39+
1. He suggested [an improvement](https://twitter.com/BostonEnginerd/status/374555593589002241) to the [Elegant project description](http://oncrashreboot.com/elegant-a-clean-theme-for-pelican-with-search-feature).
40+
41+
[if1live](https://github.com/if1live)
42+
-------------------------------------
43+
44+
### Aug 31, 2013
45+
46+
1. His [pull request](https://github.com/getpelican/pelican-plugins/pull/68) reminded me that I have forgotten to add template for Pages
47+
1. His [commit](https://github.com/if1live/pelican-elegant/commit/3da52903e94051fa771212149a10a271adc78264#commitcomment-3988674) in the fork brought bug in the path of search.html to my notice
48+
49+
[Jérémie Astori](https://github.com/astorije)
50+
---------------------------------------------
51+
52+
### Aug 30, 2013
53+
54+
1. He reported a [bug](https://botbot.me/freenode/pelican/msg/5577967/) in search form.
Loading
Loading
Loading
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
.hll { background-color: #ffffcc }
2+
.c { color: #93a1a1; font-style: italic } /* Comment */
3+
.err { color: #dc322f } /* Error */
4+
.g { color: #657b83 } /* Generic */
5+
.k { color: #859900 } /* Keyword */
6+
.l { color: #657b83 } /* Literal */
7+
.n { color: #586e75 } /* Name */
8+
.o { color: #657b83 } /* Operator */
9+
.x { color: #657b83 } /* Other */
10+
.p { color: #657b83 } /* Punctuation */
11+
.cm { color: #93a1a1; font-style: italic } /* Comment.Multiline */
12+
.cp { color: #93a1a1; font-style: italic } /* Comment.Preproc */
13+
.c1 { color: #93a1a1; font-style: italic } /* Comment.Single */
14+
.cs { color: #93a1a1; font-style: italic } /* Comment.Special */
15+
.gd { color: #657b83 } /* Generic.Deleted */
16+
.ge { color: #657b83 } /* Generic.Emph */
17+
.gr { color: #657b83 } /* Generic.Error */
18+
.gh { color: #657b83 } /* Generic.Heading */
19+
.gi { color: #657b83 } /* Generic.Inserted */
20+
.go { color: #657b83 } /* Generic.Output */
21+
.gp { color: #657b83 } /* Generic.Prompt */
22+
.gs { color: #657b83 } /* Generic.Strong */
23+
.gu { color: #657b83 } /* Generic.Subheading */
24+
.gt { color: #657b83 } /* Generic.Traceback */
25+
.kc { color: #859900 } /* Keyword.Constant */
26+
.kd { color: #859900 } /* Keyword.Declaration */
27+
.kn { color: #cb4b16 } /* Keyword.Namespace */
28+
.kp { color: #cb4b16 } /* Keyword.Pseudo */
29+
.kr { color: #859900 } /* Keyword.Reserved */
30+
.kt { color: #859900 } /* Keyword.Type */
31+
.ld { color: #657b83 } /* Literal.Date */
32+
.m { color: #2aa198 } /* Literal.Number */
33+
.s { color: #2aa198 } /* Literal.String */
34+
.na { color: #657b83 } /* Name.Attribute */
35+
.nb { color: #268bd2 } /* Name.Builtin */
36+
.nc { color: #268bd2 } /* Name.Class */
37+
.no { color: #b58900 } /* Name.Constant */
38+
.nd { color: #cb4b16 } /* Name.Decorator */
39+
.ni { color: #cb4b16 } /* Name.Entity */
40+
.ne { color: #cb4b16 } /* Name.Exception */
41+
.nf { color: #268bd2 } /* Name.Function */
42+
.nl { color: #657b83 } /* Name.Label */
43+
.nn { color: #b58900 } /* Name.Namespace */
44+
.nx { color: #657b83 } /* Name.Other */
45+
.py { color: #268bd2 } /* Name.Property */
46+
.nt { color: #859900 } /* Name.Tag */
47+
.nv { color: #cd4b16 } /* Name.Variable */
48+
.ow { color: #859900 } /* Operator.Word */
49+
.w { color: #fdf6e3 } /* Text.Whitespace */
50+
.mf { color: #2aa198 } /* Literal.Number.Float */
51+
.mh { color: #2aa198 } /* Literal.Number.Hex */
52+
.mi { color: #2aa198 } /* Literal.Number.Integer */
53+
.mo { color: #2aa198 } /* Literal.Number.Oct */
54+
.sb { color: #2aa198 } /* Literal.String.Backtick */
55+
.sc { color: #2aa198 } /* Literal.String.Char */
56+
.sd { color: #2aa198 } /* Literal.String.Doc */
57+
.s2 { color: #2aa198 } /* Literal.String.Double */
58+
.se { color: #cb4b16 } /* Literal.String.Escape */
59+
.sh { color: #2aa198 } /* Literal.String.Heredoc */
60+
.si { color: #cb4b16 } /* Literal.String.Interpol */
61+
.sx { color: #2aa198 } /* Literal.String.Other */
62+
.sr { color: #2aa198 } /* Literal.String.Regex */
63+
.s1 { color: #2aa198 } /* Literal.String.Single */
64+
.ss { color: #2aa198 } /* Literal.String.Symbol */
65+
.bp { color: #268bd2; font-weight: bold } /* Name.Builtin.Pseudo */
66+
.vc { color: #268bd2 } /* Name.Variable.Class */
67+
.vg { color: #268bd2 } /* Name.Variable.Global */
68+
.vi { color: #268bd2 } /* Name.Variable.Instance */
69+
.il { color: #2aa198 } /* Literal.Number.Integer.Long */

0 commit comments

Comments
 (0)