Skip to content

Commit

Permalink
Remove trailing whitespace and clean up indentation of files
Browse files Browse the repository at this point in the history
  • Loading branch information
rohanchandra committed Mar 17, 2015
1 parent 077e43e commit 8438751
Show file tree
Hide file tree
Showing 26 changed files with 78 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
_site
.sass-cache
.sass-cache
2 changes: 1 addition & 1 deletion 404.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ title: "Page not found"
permalink: /404.html
hide: true
---
Sorry, the requested page wasn't found on the server.
Sorry, the requested page wasn't found on the server.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ A free and open-source [Jekyll](http://jekyllrb.com) theme. Great for blogs and
[Using Type](https://rohanchandra.github.io/project/type/)

## License
The MIT License (MIT)
The MIT License (MIT)
42 changes: 21 additions & 21 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,50 @@ theme:
avatar: avatar.png
gravatar: # Email MD5 hash
description: "A website with blog posts and pages" # used by search engines

# Header and footer text
header_text: >
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
<p>Remove all header text in <code>_config.yml</code> to disable this feature.</p>
footer_text: >
Powered by <a href="http://jekyllrb.com">Jekyll</a> with <a href="https://rohanchandra.github.io/project/type/">Type Theme</a>
# Icons
rss: false
email_address: # Full email address, e.g. "[email protected]"
behance:
bitbucket:
dribbble:
facebook:
flickr:
bitbucket:
dribbble:
facebook:
flickr:
github: "rohanchandra/type-theme"
google_plus:
instagram:
google_plus:
instagram:
linkedin: # Full URL
pinterest:
reddit:
soundcloud:
pinterest:
reddit:
soundcloud:
stack_exchange: # Full URL
steam:
tumblr:
steam:
tumblr:
twitter: "twitter"
wordpress:
youtube:
wordpress:
youtube:

# Scripts
google_analytics: # Tracking ID, e.g. "UA-000000-01"
disqus_shortname:
katex: true # Enable if using math markup
katex: true # Enable if using math markup

# Localization strings
str_follow_on: "Follow on"
str_rss_follow: "Follow RSS feed"
str_email: "Email"
str_next: "Next"
str_prev: "Prev"
str_continue_reading: "Continue reading"

# Colours, typography and padding
# Open the "_sass > base" folder, and open "_variables.scss"

Expand All @@ -65,4 +65,4 @@ markdown: kramdown
highlighter: pygments
sass:
sass_dir: _sass
style: :compressed
style: :compressed
4 changes: 2 additions & 2 deletions _includes/disqus.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div id="disqus_thread"></div>
<script type="text/javascript">
var disqus_shortname = '{{ site.theme.disqus_shortname }}';
var disqus_shortname = '{{ site.theme.disqus_shortname }}';
(function() {
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})();
</script>
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
2 changes: 1 addition & 1 deletion _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
<footer class="site-footer">
<p class="text">{{ site.theme.footer_text }}</p>
</footer>
{% endif %}
{% endif %}
14 changes: 7 additions & 7 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.theme.description }}{% endif %}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-Frame-Options" content="sameorigin">

<!-- CSS -->
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">

<!--Favicon-->
<link rel="shortcut icon" href="{{ "/favicon.ico" | prepend: site.baseurl }}" type="image/x-icon">

<!-- Canonical -->
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

<!-- RSS -->
<link rel="alternate" type="application/atom+xml" title="{{ site.theme.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />

<!-- Font Awesome -->
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">

<!-- Google Fonts -->
<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:400,700,700italic,400italic" rel="stylesheet" type="text/css">

<!-- KaTeX -->
{% if site.theme.katex %}
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.1.1/katex.min.css">
Expand Down
17 changes: 7 additions & 10 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<header class="site-header">

<div class="branding">
{% if site.theme.gravatar %}
<a href="{{ site.baseurl }}/">
Expand All @@ -10,25 +9,23 @@
<img class="avatar" src="/img/{{ site.theme.avatar }}" alt=""/>
</a>
{% endif %}

<h1 class="site-title">
<a href="{{ site.baseurl }}/">{{ site.theme.title }}</a>
</h1>
</div>

<nav class="site-nav">
<ul>
{% for page in site.pages %}
{% if page.title and page.hide != true %}
<li>
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
</li>
{% endif %}
{% if page.title and page.hide != true %}
<li>
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">
{{ page.title }}
</a>
</li>
{% endif %}
{% endfor %}

<!-- Social icons from Font Awesome, if enabled -->
{% include icons.html %}
</ul>
</nav>

</header>
5 changes: 0 additions & 5 deletions _layouts/default.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<!DOCTYPE html>
<html class="no-js">

{% include head.html %}

<body>
{% include header.html %}

<div class="content">
{{ content }}
</div>

{% include footer.html %}
</body>

</html>
9 changes: 2 additions & 7 deletions _layouts/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
layout: default
---
<article {% if page.feature-img %}class="feature-image"{% endif %}>

<header style="background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
<h1 class="title">{{ page.title }}</h1>
</header>

<section class="post-content">
{{ content }}
</section>

</article>
<section class="post-content">{{ content }}</section>
</article>
10 changes: 2 additions & 8 deletions _layouts/post.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,19 @@
layout: default
---
<article {% if page.feature-img %}class="feature-image"{% endif %}>

<header style="background-image: url('{{ site.baseurl }}/{{ page.feature-img }}')">
<h1 class="title">{{ page.title }}</h1>

<p class="meta">
{{ page.date | date: "%B %-d, %Y" }}
{% if page.author %} - {{ page.author }}{% endif %}
</p>
</header>

<section class="post-content">
{{ content }}
</section>

<section class="post-content">{{ content }}</section>
</article>

<!-- Disqus -->
{% if site.theme.disqus_shortname %}
<div class="comments">
{% include disqus.html %}
</div>
{% endif %}
{% endif %}
2 changes: 1 addition & 1 deletion _posts/2014-11-28-markdown-and-html.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Type Theme uses KaTeX to display maths. Equations such as $$S_n = a \times \frac

Alternatively, they can be shown on a new line:

$$ f(x) = \int \frac{2x^2+4x+6}{x-2} $$
$$ f(x) = \int \frac{2x^2+4x+6}{x-2} $$
1 change: 0 additions & 1 deletion _posts/2014-11-29-feature-images.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ title: Feature images
feature-img: "img/sample_feature_img.png"
---
This is an example of a post which includes a feature image specified in the front matter of the post. The feature image spans the full-width of the page, and is shown with the title on permalink pages.

2 changes: 1 addition & 1 deletion _posts/2014-11-30-sample-post.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ Ut dolor diam, elementum et vestibulum eu, porttitor vel elit. Curabitur venenat
Etiam luctus porttitor lorem, sed suscipit est rutrum non. Curabitur lobortis nisl a enim congue semper. Aenean commodo ultrices imperdiet. Vestibulum ut justo vel sapien venenatis tincidunt.

Phasellus eget dolor sit amet ipsum dapibus condimentum vitae quis lectus. Aliquam ut massa in turpis dapibus convallis. Praesent elit lacus, vestibulum at malesuada et, ornare et est. Ut augue nunc, sodales ut euismod non, adipiscing vitae orci. Mauris ut placerat justo. Mauris in ultricies enim. Quisque nec est eleifend nulla ultrices egestas quis ut quam. Donec sollicitudin lectus a mauris pulvinar id aliquam urna cursus. Cras quis ligula sem, vel elementum mi. Phasellus non ullamcorper urna.
Phasellus eget dolor sit amet ipsum dapibus condimentum vitae quis lectus. Aliquam ut massa in turpis dapibus convallis. Praesent elit lacus, vestibulum at malesuada et, ornare et est. Ut augue nunc, sodales ut euismod non, adipiscing vitae orci. Mauris ut placerat justo. Mauris in ultricies enim. Quisque nec est eleifend nulla ultrices egestas quis ut quam. Donec sollicitudin lectus a mauris pulvinar id aliquam urna cursus. Cras quis ligula sem, vel elementum mi. Phasellus non ullamcorper urna.
2 changes: 1 addition & 1 deletion _sass/base/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,4 @@ img[align=left] {
}
img[align=right] {
margin-left: 3%;
}
}
6 changes: 3 additions & 3 deletions _sass/base/_utility.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Mix-ins
%padding-small {
padding: $padding-x-small $padding-x-small * 2;
@media (max-width: 1000px) {
@media (max-width: 1000px) {
padding: $padding-x-small $padding-x-small;
}
}
%padding-regular {
padding: $padding-small $padding-large;
@media (max-width: 1000px) {
@media (max-width: 1000px) {
padding: $padding-small * 1.5 $padding-large / 1.6;
}
}
Expand All @@ -32,4 +32,4 @@ a.button:hover {
// States
.disabled {
opacity: 0.7;
}
}
4 changes: 2 additions & 2 deletions _sass/base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ $feature-image-text-color: #fff;
$feature-image-size: cover; // options include "cover", "contain", "auto"

// Header description box
$header-desc-background-color: #F98752;
$header-desc-text-color: #FFF;
$header-desc-background-color: #F98752;
$header-desc-text-color: #FFF;
2 changes: 1 addition & 1 deletion _sass/includes/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
width: 100%;
color: lighten($text-color, 30%);
font-size: 0.9em;
}
}
10 changes: 5 additions & 5 deletions _sass/includes/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
display: inline-block;
float: left;
width: 100%;

a {
color: $header-link-color;
}

.avatar {
height: 2em;
width: 2em;
Expand All @@ -18,7 +18,7 @@
border-radius: 0.2em;
margin-right: 1em;
}

.site-title {
float: left;
font-weight: bold;
Expand Down Expand Up @@ -47,7 +47,7 @@
padding-top: $padding-small;
text-align: left;
width: 100%;
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion _sass/layouts/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
.pagination {
padding: $padding-small $padding-large 0 $padding-large;
text-align: center;
}
}
2 changes: 1 addition & 1 deletion _sass/layouts/_posts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ header {
.post-content {
@extend %padding-regular;
}
}
}
2 changes: 1 addition & 1 deletion about.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ Type Theme is a free and open-source theme for [Jekyll](http://jekyllrb.com/), l

Head over to the [theme's documentation](https://rohanchandra.github.io/project/type/) for much more information about Type Theme or to install this theme on your own Jekyll site.

This file is an example of a page in Jekyll, that automatically shows up in the header navigation, you can delete or modify this file freely.
This file is an example of a page in Jekyll, that automatically shows up in the header navigation, you can delete or modify this file freely.
2 changes: 1 addition & 1 deletion css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

// Partials
@import 'includes/header';
@import 'includes/footer';
@import 'includes/footer';
Loading

0 comments on commit 8438751

Please sign in to comment.