Skip to content

Commit 9801354

Browse files
committed
Removed Twitter and Ender.js. Added jQuery and updated Modernizr
1 parent cf5e909 commit 9801354

File tree

13 files changed

+22
-3370
lines changed

13 files changed

+22
-3370
lines changed

Diff for: .themes/classic/sass/base/_theme.scss

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ $sidebar-border: desaturate(darken($sidebar-bg, 7), 10) !default;
4444
$sidebar-border-hover: darken($sidebar-bg, 7) !default;
4545
$sidebar-link-color-subdued: lighten($sidebar-color, 20) !default;
4646
$sidebar-link-color-subdued-hover: $sidebar-link-color-hover !default;
47-
$twitter-status-link: lighten($sidebar-link-color-subdued, 15) !default;
4847

4948
$footer-color: #888 !default;
5049
$footer-bg: #ccc !default;

Diff for: .themes/classic/sass/base/_typography.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ h5, section h4, section section h3 {
6262
h6, section h5, section section h4, section section section h3 {
6363
font-size: .8em;
6464
}
65-
p, blockquote, ul, ol { margin-bottom: 1.5em; }
65+
66+
p, article blockquote, ul, ol { margin-bottom: 1.5em; }
6667

6768
ul { list-style-type: disc;
6869
ul { list-style-type: circle; margin-bottom: 0px;
@@ -106,7 +107,7 @@ small { font-size: .8em; }
106107

107108
big { font-size: 1.2em; }
108109

109-
blockquote {
110+
article blockquote {
110111
$bq-margin: 1.2em;
111112
font-style: italic;
112113
position: relative;

Diff for: .themes/classic/sass/partials/_sidebar.scss

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
@import "sidebar/base";
2-
@import "sidebar/twitter";
32
@import "sidebar/googleplus";
43
@import "sidebar/pinboard";
54
@import "sidebar/delicious";

Diff for: .themes/classic/sass/partials/sidebar/_twitter.scss

-34
This file was deleted.

Diff for: .themes/classic/source/_includes/asides/github.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ <h1>GitHub Repos</h1>
88
<a href="https://github.com/{{site.github_user}}">@{{site.github_user}}</a> on GitHub
99
{% endif %}
1010
<script type="text/javascript">
11-
$.domReady(function(){
11+
$(document).ready(function(){
1212
if (!window.jXHR){
1313
var jxhr = document.createElement('script');
1414
jxhr.type = 'text/javascript';

Diff for: .themes/classic/source/_includes/asides/twitter.html

-19
This file was deleted.

Diff for: .themes/classic/source/_includes/head.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<meta name="MobileOptimized" content="320">
1717
<meta name="viewport" content="width=device-width, initial-scale=1">
1818

19-
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{% if page.url contains site.category_dir %}/{% endif %}{{ page.url | remove:'index.html' }}{% endif %}{% endcapture %}
19+
{% capture canonical %}{{ site.url }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %}
2020
<link rel="canonical" href="{{ canonical }}">
2121
<link href="{{ root_url }}/favicon.png" rel="icon">
2222
<link href="{{ root_url }}/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
2323
<link href="{{ site.subscribe_rss }}" rel="alternate" title="{{site.title}}" type="application/atom+xml">
24-
{% include custom/head.html %}
2524
<script src="{{ root_url }}/javascripts/modernizr-2.0.js"></script>
26-
<script src="{{ root_url }}/javascripts/ender.js"></script>
25+
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
26+
<script>!window.jQuery && document.write(unescape('%3Cscript src="./javascripts/lib/jquery.min.js"%3E%3C/script%3E'))</script>
2727
<script src="{{ root_url }}/javascripts/octopress.js" type="text/javascript"></script>
28+
{% include custom/head.html %}
2829
{% include google_analytics.html %}
2930
</head>

Diff for: .themes/classic/source/javascripts/ender.js

-45
This file was deleted.

0 commit comments

Comments
 (0)