Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: robertwijas/Octopress-Theme-Slash
base: c0f1e2c2f7
...
head fork: robertwijas/Octopress-Theme-Slash
compare: 9a9de06af8
Checking mergeability… Don't worry, you can still create the pull request.
  • 8 commits
  • 10 files changed
  • 0 commit comments
  • 4 contributors
View
3  sass/parts/_article.scss
@@ -9,7 +9,8 @@ article{
@media screen and (max-width: 600px){
padding: 15px 0;
}
- h1.title{
+ h2.title{
+ font-size: 1.8em;
font-weight: 300;
line-height: 35px;
margin-bottom: 20px;
View
2  sass/parts/_comment.scss
@@ -1,7 +1,7 @@
#comment{
padding: 30px 0;
@include border-shadow();
- h1.title{
+ h2.title{
font-size: 25px;
font-weight: 300;
line-height: 35px;
View
14 sass/parts/_header.scss
@@ -348,6 +348,20 @@ $header-height: 30px;
border: 1px solid darken(rgb(175,182,202), 10%);
}
}
+ &.coderwall{
+ background: image-url('social/coderwall.png') center no-repeat rgb(58,114,159);
+ border: 1px solid rgb(58,114,159);
+ &:hover{
+ border: 1px solid darken(rgb(58,114,159), 10%);
+ }
+ }
+ &.pinboard{
+ background: image-url('social/pinboard.png') center no-repeat rgb(0,102,200);
+ border: 1px solid rgb(58,114,159);
+ &:hover{
+ border: 1px solid darken(rgb(0,102,255), 10%);
+ }
+ }
&.linkedin{
background: image-url('social/linkedin.png') center no-repeat #005A87;
border: 1px solid #005A87;
View
2  sass/parts/_post.scss
@@ -1,5 +1,5 @@
.post{
- h1.title, .entry-content{
+ h2.title, .entry-content{
margin-left: 200px;
@media screen and (max-width: 800px){
margin-left: 0;
View
2  source/_includes/archive_post.html
@@ -8,7 +8,7 @@
<section class="archives"><h1 class="year">{{ date | date: "%Y" }}</h1>
{% endunless %}
<article>
- <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h1>
+ <h2 class="title"><a href="{{ root_url }}{{ post.url }}">{{post.title}}</a></h2>
<div class="meta">
<span class="date">{{ date | date: "%b %e" }}</span>
<span class="tags">{% include post/categories.html %}</span>
View
11 source/_includes/article.html
@@ -1,12 +1,19 @@
{% if index %}
- <h1 class="title"><a href="{{ root_url }}{{ post.url }}">{% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a></h1>
+ <h2 class="title">
+ {% if post.external-url %}
+ <a href="{{ post.external-url }}">
+ {% else %}
+ <a href="{{ root_url }}{{ post.url }}">
+ {% endif %}
+ {% if site.titlecase %}{{ post.title | titlecase }}{% else %}{{ post.title }}{% endif %}</a>
+ </h2>
<div class="entry-content">
{{ content | excerpt }}
{% capture excerpted %}{{ content | has_excerpt }}{% endcapture %}
{% if excerpted == 'true' %}<a href="{{ root_url }}{{ post.url }}" class="more-link">{{ site.excerpt_link }}</a>{% endif %}
</div>
{% else %}
- <h1 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h1>
+ <h2 class="title">{% if site.titlecase %}{{ page.title | titlecase }}{% else %}{{ page.title }}{% endif %}</h2>
<div class="entry-content">{{ content }}</div>
{% endif %}
View
6 source/_includes/header.html
@@ -29,6 +29,12 @@
{% if site.github_user %}
<a class="github" href="https://github.com/{{ site.github_user }}" title="GitHub">GitHub</a>
{% endif %}
+ {% if site.pinboard_user %}
+ <a class="pinboard" href="https://pinboard.in/u:{{ site.pinboard_user }}" title="Pinboard">Pinboard</a>
+ {% endif %}
+ {% if site.coderwall_user %}
+ <a class="coderwall" href="https://coderwall.com/{{ site.coderwall_user }}" title="Coderwall">Coderwall</a>
+ {% endif %}
{% if site.linkedin_user %}
<a class="linkedin" href="http://www.linkedin.com/in/{{ site.linkedin_user }}">LinkedIn</a>
{% endif %}
View
2  source/_layouts/post.html
@@ -9,7 +9,7 @@
{% endunless %}
{% if site.disqus_short_name and page.comments == true %}
<section id="comment">
- <h1 class="title">Comments</h1>
+ <h2 class="title">Comments</h2>
<div id="disqus_thread" aria-live="polite">{% include post/disqus_thread.html %}</div>
</section>
{% endif %}
View
BIN  source/images/social/coderwall.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  source/images/social/pinboard.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

No commit comments for this range

Something went wrong with that request. Please try again.