diff options
| author | Justin Mayer <entroP@gmail.com> | 2013-04-26 19:28:29 -0700 |
|---|---|---|
| committer | Justin Mayer <entroP@gmail.com> | 2013-04-26 19:28:29 -0700 |
| commit | 323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0 (patch) | |
| tree | b22a655eb89d5fbfe989c5ec8eed43bcde33ea2f | |
| parent | 7112483f5385f54672d22a76a221b914b193ddf4 (diff) | |
| parent | 23fc82116999a1bb83260e9a0355974984ce39b0 (diff) | |
| download | pelican-themes-323bfbf38468c69e81a9bb6d6a5a0e7d6544ffe0.tar.gz | |
Merge pull request #79 from gregseth/master
| -rw-r--r-- | .gitmodules | 4 | ||||
| m--------- | bluegrasshopper | 0 | ||||
| -rw-r--r-- | bootstrap/static/images/icons/careers.stackoverflow.png | bin | 0 -> 1150 bytes | |||
| -rw-r--r-- | bootstrap/static/local.css | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index c63feb6..fe8d3ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,6 +16,7 @@ [submodule "pelican-mockingbird"] path = pelican-mockingbird url = git://github.com/wrl/pelican-mockingbird.git +<<<<<<< HEAD [submodule "bold"] path = bold url = git://github.com/demianbrecht/pelican-bold.git @@ -34,3 +35,6 @@ [submodule "whispers"] path = whispersTheme url = git://github.com/deBorn/whispersTheme.git +[submodule "bluegrasshopper"] + path = bluegrasshopper + url = git@github.com:gregseth/pelican-bgh.git diff --git a/bluegrasshopper b/bluegrasshopper new file mode 160000 +Subproject a4bbcadcd14279a9d4b3b3f919442767b7c42e3 diff --git a/bootstrap/static/images/icons/careers.stackoverflow.png b/bootstrap/static/images/icons/careers.stackoverflow.png Binary files differnew file mode 100644 index 0000000..e1bbf0f --- /dev/null +++ b/bootstrap/static/images/icons/careers.stackoverflow.png diff --git a/bootstrap/static/local.css b/bootstrap/static/local.css index c933851..0657af7 100644 --- a/bootstrap/static/local.css +++ b/bootstrap/static/local.css @@ -33,5 +33,6 @@ div.highlight pre { .social a[href*='linkedin.com']:before {content: url('./images/icons/linkedin.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='rss.xml']:before {content: url('./images/icons/rss.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png'); margin-right: 2px; vertical-align: -3px;} +.social a[href*='careers.stackoverflow.com']:before {content: url('./images/icons/careers.stackoverflow.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='twitter.com']:before {content: url('./images/icons/twitter.png'); margin-right: 2px; vertical-align: -3px;} .social a[href*='weibo.com']:before {content: url('./images/icons/weibo.png'); margin-right: 2px; vertical-align: -3px;} |
