Permalink
Browse files

Merge remote-tracking branch 'upstream/master' (https://github.com/Tr…

…yGhost/Casper.git) into sync-upstream
  • Loading branch information...
2 parents df4ccfa + 36fe40b commit 9f0131620c847a856f63b2b5ca38ce884ab71e98 @tmack8001 committed Jan 8, 2014
Showing with 16 additions and 15 deletions.
  1. +3 −3 assets/css/normalize.css
  2. +2 −0 assets/css/screen.css
  3. +7 −7 default.hbs
  4. +1 −2 index.hbs
  5. +1 −1 page.hbs
  6. +2 −2 post.hbs
View
6 assets/css/normalize.css
@@ -1,4 +1,4 @@
-/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
/* ==========================================================================
HTML5 display definitions
@@ -339,8 +339,8 @@ html input[disabled] {
}
/**
- * 1. Address box sizing set to `content-box` in IE 8/9.
- * 2. Remove excess padding in IE 8/9.
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
*/
input[type="checkbox"],
View
2 assets/css/screen.css
@@ -397,6 +397,7 @@ margin on the iframe, cause it breaks stuff. */
letter-spacing: -1px;
font-weight: bold;
font-family: 'Open Sans', sans-serif;
+ text-shadow: 0 1px 6px rgba(0,0,0,0.1);
}
.blog-description {
@@ -406,6 +407,7 @@ margin on the iframe, cause it breaks stuff. */
font-weight: 300;
font-family: 'Noto Serif', serif;
letter-spacing: 0;
+ text-shadow: 0 1px 3px rgba(0,0,0,0.15);
}
/* Every post, on every page, gets this style on its <article> tag */
View
14 default.hbs
@@ -2,8 +2,8 @@
<html>
<head>
{{! Document Settings }}
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+ <meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
{{! Page Meta }}
<title>{{meta_title}}</title>
@@ -14,7 +14,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
{{! Styles'n'Scripts }}
- <link rel="stylesheet" type="text/css" href="/assets/css/screen.css" />
+ <link rel="stylesheet" type="text/css" href="{{asset "css/screen.css"}}" />
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Noto+Serif:400,700,400italic|Open+Sans:700,400" />
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
@@ -29,7 +29,7 @@
<footer class="site-footer">
<a class="subscribe icon-feed" href="{{@blog.url}}/rss/"><span class="tooltip">Subscribe!</span></a>
<div class="inner">
- <section class="copyright">All content copyright <a href="/">{{@blog.title}}</a> &copy; {{date format="YYYY"}} &bull; All rights reserved.</section>
+ <section class="copyright">All content copyright <a href="{{@blog.url}}/">{{@blog.title}}</a> &copy; {{date format="YYYY"}} &bull; All rights reserved.</section>
<section class="poweredby">Proudly published with <a class="icon-ghost" href="http://ghost.org">Ghost</a></section>
<section class="theme">Using <a href="https://github.com/tmack8001/skeletor-casper">Skeletor Casper</a> (opinionated Casper theme, available on <a href="http://github.com/tmack8001/skeletor-casper"><i class="fa fa-github"></i> Github</a>).</section>
</div>
@@ -39,8 +39,8 @@
{{ghost_foot}}
{{! The main JavaScript file for Casper }}
- <script type="text/javascript" src="/assets/js/jquery.fitvids.js"></script>
- <script type="text/javascript" src="/assets/js/index.js"></script>
+ <script type="text/javascript" src="{{asset "js/jquery.fitvids.js"}}"></script>
+ <script type="text/javascript" src="{{asset "js/index.js"}}"></script>
{{! Google Analytics Support - change 'UA-#######-#' to your code before deploying }}
<script>
@@ -55,4 +55,4 @@
ga('send', 'pageview');
</script>
</body>
-</html>
+</html>
View
3 index.hbs
@@ -6,8 +6,7 @@
{{! The big featured header on the homepage, with the site logo and description }}
<header class="site-head" {{#if @blog.cover}}style="background-image: url({{@blog.cover}})"{{/if}}>
<div class="vertical">
- <div class="site-head-content" class="inner">
-
+ <div class="site-head-content inner">
{{#if @blog.logo}}<a class="blog-logo" href="{{@blog.url}}"><img src="{{@blog.logo}}" alt="Blog Logo" /></a>{{/if}}
<h1 class="blog-title">{{@blog.title}}</h1>
<h2 class="blog-description">{{@blog.description}}</h2>
View
2 page.hbs
@@ -9,7 +9,7 @@
{{! Each post has the blog logo at the top, with a link back to the home page }}
<header class="post-header">
- <a id="blog-logo" href="{{@blog.url}}">
+ <a class="blog-logo" href="{{@blog.url}}">
{{#if @blog.logo}}
<img src="{{@blog.logo}}" alt="Blog Logo" />
{{else}}
View
4 post.hbs
@@ -9,7 +9,7 @@
{{! Each post has the blog logo at the top, with a link back to the home page }}
<header class="post-header">
- <a id="blog-logo" href="{{@blog.url}}">
+ <a class="blog-logo" href="{{@blog.url}}">
{{#if @blog.logo}}
<img src="{{@blog.logo}}" alt="Blog Logo" />
{{else}}
@@ -41,7 +41,7 @@
<section class="share">
<h4>Share this post</h4>
- <a class="icon-twitter" href="http://twitter.com/share?text={{title}}&url={{url absolute="true"}}"
+ <a class="icon-twitter" href="http://twitter.com/share?text={{encode title}}&url={{url absolute="true"}}"
onclick="window.open(this.href, 'twitter-share', 'width=550,height=235');return false;">
<span class="hidden">Twitter</span>
</a>

0 comments on commit 9f01316

Please sign in to comment.