Permalink
Browse files

Updated theme, About page, added social sharing links

  • Loading branch information...
adamsp committed Nov 4, 2013
1 parent 857d92b commit 7b87a9597e0505c668bd65a4114b3009452fc2d9
Showing with 2,199 additions and 696 deletions.
  1. +1 −0 .themes/slash
  2. +7 −5 _config.yml
  3. +4 −4 sass/_base.scss
  4. +9 −0 sass/_parts.scss
  5. +1 −0 sass/_plugins.scss
  6. +7 −0 sass/base/_color.scss
  7. +17 −0 sass/base/_font.scss
  8. +49 −192 sass/base/_layout.scss
  9. +1 −136 sass/base/_typography.scss
  10. +21 −25 sass/base/_utilities.scss
  11. +7 −0 sass/custom/_color.scss
  12. +76 −0 sass/parts/_archive.scss
  13. +141 −0 sass/parts/_article.scss
  14. +10 −0 sass/parts/_comment.scss
  15. +6 −0 sass/parts/_footer.scss
  16. +402 −0 sass/parts/_header.scss
  17. +43 −0 sass/parts/_index.scss
  18. +43 −0 sass/parts/_post.scss
  19. +388 −0 sass/parts/_syntax.scss
  20. +49 −0 sass/parts/_twitter.scss
  21. +228 −0 sass/plugins/_fancybox.scss
  22. +5 −6 sass/screen.scss
  23. +4 −4 source/_includes/after_footer.html
  24. +22 −8 source/_includes/archive_post.html
  25. +23 −25 source/_includes/article.html
  26. +15 −0 source/_includes/banner.html
  27. +0 −3 source/_includes/custom/after_footer.html
  28. +6 −4 source/_includes/custom/footer.html
  29. +0 −4 source/_includes/custom/head.html
  30. +0 −6 source/_includes/custom/header.html
  31. +4 −5 source/_includes/custom/navigation.html
  32. +1 −1 source/_includes/disqus.html
  33. +21 −0 source/_includes/external/disqus.html
  34. +10 −0 source/_includes/external/facebook_like.html
  35. +13 −0 source/_includes/external/google_analytics.html
  36. +9 −0 source/_includes/external/google_plus_one.html
  37. +11 −0 source/_includes/external/twitter_sharing.html
  38. +6 −0 source/_includes/fancybox.html
  39. +1 −1 source/_includes/footer.html
  40. +10 −10 source/_includes/google_analytics.html
  41. +16 −25 source/_includes/head.html
  42. +58 −0 source/_includes/header.html
  43. +1 −15 source/_includes/navigation.html
  44. +5 −7 source/_includes/post/categories.html
  45. +15 −10 source/_includes/post/sharing.html
  46. +2 −12 source/_layouts/category_index.html
  47. +10 −11 source/_layouts/default.html
  48. +11 −34 source/_layouts/page.html
  49. +8 −36 source/_layouts/post.html
  50. +4 −1 source/about/index.markdown
  51. +4 −14 source/blog/archives/index.html
  52. +27 −0 source/feed/index.xml
  53. BIN source/font/fontawesome-webfont.eot
  54. +175 −0 source/font/fontawesome-webfont.svg
  55. BIN source/font/fontawesome-webfont.svgz
  56. BIN source/font/fontawesome-webfont.ttf
  57. BIN source/font/fontawesome-webfont.woff
  58. BIN source/images/fancybox/blank.gif
  59. BIN source/images/fancybox/fancybox_loading.gif
  60. BIN source/images/fancybox/fancybox_sprite.png
  61. BIN source/images/loading_gray.gif
  62. BIN source/images/loading_pacman.gif
  63. BIN source/images/social/coderwall.png
  64. BIN source/images/social/delicious.png
  65. BIN source/images/social/facebook.png
  66. BIN source/images/social/github.png
  67. BIN source/images/social/google.png
  68. BIN source/images/social/instagram.png
  69. BIN source/images/social/linkedin.png
  70. BIN source/images/social/pinboard.png
  71. BIN source/images/social/pinterest.png
  72. BIN source/images/social/rss.png
  73. BIN source/images/social/twitter.png
  74. +12 −23 source/index.html
  75. +35 −0 source/javascripts/jquery.fancybox.pack.js
  76. +62 −0 source/javascripts/slash.js
  77. +83 −69 source/javascripts/twitter.js
Submodule slash added at f49f94
View
@@ -60,25 +60,25 @@ default_asides: [asides/recent_posts.html, asides/twitter.html, asides/delicious
# Github repositories
github_user: adamsp
github_repo_count: 4
github_repo_count: 0
github_show_profile_link: true
github_skip_forks: true
# Twitter
twitter_user: adamsnz
twitter_tweet_count: 4
twitter_tweet_count: 0
twitter_show_replies: false
twitter_follow_button: true
twitter_show_follower_count: false
twitter_tweet_button: true
# Google +1
google_plus_one: false
google_plus_one: true
google_plus_one_size: medium
# Google Plus Profile
# Hidden: No visible button, just add author information to search results
googleplus_user:
googleplus_user: +AdamSpeakman
googleplus_hidden: false
# Pinboard
@@ -96,4 +96,6 @@ disqus_show_comment_count: false
# Google Analytics
google_analytics_tracking_id: UA-34453006-1
# Facebook Like
facebook_like: false
facebook_like: true
addthis_button: true
View
@@ -1,5 +1,5 @@
@import "base/utilities";
@import "base/solarized";
@import "base/theme";
@import "base/typography";
@import "base/color";
@import "base/font";
@import "base/layout";
@import "base/typography";
@import "base/utilities";
View
@@ -0,0 +1,9 @@
@import "parts/header";
@import "parts/index";
@import "parts/article";
@import "parts/post";
@import "parts/archive";
@import "parts/comment";
@import "parts/footer";
@import "parts/syntax";
@import "parts/twitter";
View
@@ -0,0 +1 @@
@import "plugins/fancybox";
View
@@ -0,0 +1,7 @@
$color-background: #eee !default;
$color-main: #258fb8 !default;
$color-gray01: #666 !default;
$color-gray02: #999 !default;
$color-gray03: #ccc !default;
$color-gray04: #ddd !default;
$color-gray05: #fff !default;
View
@@ -0,0 +1,17 @@
$font-default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace !default;
$font-icon: FontAwesome;
$font-icon-path: "/font/fontawesome-webfont";
@font-face {
font-family: 'FontAwesome';
src: url('#{$font-icon-path}.eot');
src: url('#{$font-icon-path}.eot?#iefix') format('embedded-opentype'),
url('#{$font-icon-path}.woff') format('woff'),
url('#{$font-icon-path}.ttf') format('truetype'),
url('#{$font-icon-path}.svgz#FontAwesomeRegular') format('svg'),
url('#{$font-icon-path}.svg#FontAwesomeRegular') format('svg');
font-weight: normal;
font-style: normal;
}
View
@@ -1,192 +1,49 @@
$max-width: 1200px !default;
// Padding used for layout margins
$pad-min: 18px !default;
$pad-narrow: 25px !default;
$pad-medium: 35px !default;
$pad-wide: 55px !default;
// Sidebar widths used in media queries
$sidebar-width-medium: 240px !default;
$sidebar-pad-medium: 15px !default;
$sidebar-pad-wide: 20px !default;
$sidebar-width-wide: 300px !default;
$indented-lists: false !default;
$header-font-size: 1em !default;
$header-padding-top: 1.5em !default;
$header-padding-bottom: 1.5em !default;
.group { @include pie-clearfix; }
@mixin collapse-sidebar {
float: none;
width: auto;
clear: left;
margin: 0;
padding: 0 $pad-medium 1px;
background-color: lighten($sidebar-bg, 2);
border-top: 1px solid lighten($sidebar-border, 4);
section {
&.odd, &.even { float: left; width: 48%; }
&.odd { margin-left: 0; }
&.even { margin-left: 4%; }
}
&.thirds section {
width: 30%;
margin-left: 5%;
&.first {
margin-left: 0;
clear: both;
}
}
}
body {
-webkit-text-size-adjust: none;
max-width: $max-width;
position: relative;
margin: 0 auto;
> header, > nav, > footer, #content > article, #content > div > article, #content > div > section {
@extend .group;
padding-left: $pad-min;
padding-right: $pad-min;
@media only screen and (min-width: 480px) {
padding-left: $pad-narrow;
padding-right: $pad-narrow;
}
@media only screen and (min-width: 768px) {
padding-left: $pad-medium;
padding-right: $pad-medium;
}
@media only screen and (min-width: 992px) {
padding-left: $pad-wide;
padding-right: $pad-wide;
}
}
div.pagination {
@extend .group;
margin-left: $pad-min;
margin-right: $pad-min;
@media only screen and (min-width: 480px) {
margin-left: $pad-narrow;
margin-right: $pad-narrow;
}
@media only screen and (min-width: 768px) {
margin-left: $pad-medium;
margin-right: $pad-medium;
}
@media only screen and (min-width: 992px) {
margin-left: $pad-wide;
margin-right: $pad-wide;
}
}
> header {
font-size: $header-font-size;
padding-top: $header-padding-top;
padding-bottom: $header-padding-bottom;
}
}
#content {
overflow: hidden;
> div, > article { width: 100%; }
}
aside.sidebar {
float: none;
padding: 0 $pad-min 1px;
background-color: lighten($sidebar-bg, 2);
border-top: 1px solid $sidebar-border;
@extend .group;
}
.flex-content { max-width: 100%; height: auto; }
.basic-alignment {
&.left { float: left; margin-right: 1.5em; }
&.right { float: right; margin-left: 1.5em; }
&.center { display:block; margin: 0 auto 1.5em; }
&.left, &.right { margin-bottom: .8em; }
}
.toggle-sidebar { &, .no-sidebar & { display: none; }}
body.sidebar-footer {
@media only screen and (min-width: 750px) {
aside.sidebar{ @include collapse-sidebar; }
}
#content { margin-right: 0px; }
.toggle-sidebar { display: none; }
}
@media only screen and (min-width: 550px) {
body > header { font-size: $header-font-size; }
}
@media only screen and (min-width: 750px) {
aside.sidebar { @include collapse-sidebar; }
}
#main, #content, .sidebar {
@extend .group;
}
@media only screen and (min-width: 768px) {
body { -webkit-text-size-adjust: auto; }
body > header { font-size: $header-font-size * 1.2; }
#main {
padding: 0;
margin: 0 auto;
}
#content {
overflow: visible;
margin-right: $sidebar-width-medium;
position: relative;
.no-sidebar & { margin-right: 0; border-right: 0; }
.collapse-sidebar & { margin-right: 20px; }
> div, > article {
padding-top: $pad-medium/2;
padding-bottom: $pad-medium/2;
float: left;
}
}
aside.sidebar {
width: $sidebar-width-medium - $sidebar-pad-medium*2;
padding: 0 $sidebar-pad-medium $sidebar-pad-medium;
background: none;
clear: none;
float: left;
margin: 0 -100% 0 0;
section {
width: auto; margin-left: 0;
&.odd, &.even { float: none; width: auto; margin-left: 0; }
}
.collapse-sidebar & {
@include collapse-sidebar;
}
}
}
@media only screen and (min-width: 992px) {
body > header { font-size: $header-font-size * 1.3; }
#content { margin-right: $sidebar-width-wide; }
#content {
> div, > article {
padding-top: $pad-wide/2;
padding-bottom: $pad-wide/2;
}
}
aside.sidebar {
width: $sidebar-width-wide - $sidebar-pad-wide*2;
padding: 1.2em $sidebar-pad-wide $sidebar-pad-wide;
.collapse-sidebar & {
padding: { left: $pad-wide; right: $pad-wide; }
}
}
}
@if $indented-lists == false {
@media only screen and (min-width: 768px) {
ul, ol { margin-left: 0; }
}
}
$max-width: 1000px;
*{
margin: 0;
padding: 0;
}
body{
font-family: $font-default;
font-weight: 300;
font-size: 14px;
background: $color-background;
color: $color-gray01;
@media screen and (max-width: 1040px){
margin: 0 20px;
}
@media screen and (max-width: 600px){
font-size: 13px;
}
}
h1{
font-size: 1.8em;
}
h2{
font-size: 1.5em;
}
h3{
font-size: 1.3em;
}
a{
text-decoration: none;
outline-width: 0;
color: $color-main;
}
.alignleft{
float: left;
}
.alignright{
float: right;
}
.clearfix{
@include pie-clearfix;
}
.inner{
width: $max-width;
margin: 0 auto;
@media screen and (max-width: 1040px){
width: 100%;
}
}
Oops, something went wrong.

0 comments on commit 7b87a95

Please sign in to comment.