Permalink
Browse files

change theme

  • Loading branch information...
1 parent faadb4c commit 5cdbb836e106a5961abd9a002c59cb5a7f504f63 @carlallen committed Jun 15, 2012
Showing with 2,039 additions and 4,172 deletions.
  1. +1 −0 .themes/slash
  2. +4 −4 sass/_base.scss
  3. +0 −8 sass/_partials.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. +0 −46 sass/base/_solarized.scss
  10. +0 −86 sass/base/_theme.scss
  11. +1 −136 sass/base/_typography.scss
  12. +21 −25 sass/base/_utilities.scss
  13. +0 −43 sass/custom/_colors.scss
  14. +0 −10 sass/custom/_fonts.scss
  15. +0 −21 sass/custom/_layout.scss
  16. +0 −2 sass/custom/_styles.scss
  17. +0 −72 sass/partials/_archive.scss
  18. +0 −141 sass/partials/_blog.scss
  19. +0 −19 sass/partials/_footer.scss
  20. +0 −18 sass/partials/_header.scss
  21. +0 −137 sass/partials/_navigation.scss
  22. +0 −8 sass/partials/_sharing.scss
  23. +0 −5 sass/partials/_sidebar.scss
  24. +0 −253 sass/partials/_syntax.scss
  25. +0 −106 sass/partials/sidebar/_base.scss
  26. +0 −4 sass/partials/sidebar/_delicious.scss
  27. +0 −26 sass/partials/sidebar/_googleplus.scss
  28. +0 −12 sass/partials/sidebar/_pinboard.scss
  29. +0 −34 sass/partials/sidebar/_twitter.scss
  30. +73 −0 sass/parts/_archive.scss
  31. +140 −0 sass/parts/_article.scss
  32. +10 −0 sass/parts/_comment.scss
  33. +6 −0 sass/parts/_footer.scss
  34. +381 −0 sass/parts/_header.scss
  35. +43 −0 sass/parts/_index.scss
  36. +43 −0 sass/parts/_post.scss
  37. +387 −0 sass/parts/_syntax.scss
  38. +49 −0 sass/parts/_twitter.scss
  39. +228 −0 sass/plugins/_fancybox.scss
  40. +2 −7 sass/screen.scss
  41. +4 −4 source/_includes/after_footer.html
  42. +19 −8 source/_includes/archive_post.html
  43. +16 −25 source/_includes/article.html
  44. +0 −8 source/_includes/asides/delicious.html
  45. +0 −30 source/_includes/asides/github.html
  46. +0 −11 source/_includes/asides/googleplus.html
  47. +0 −19 source/_includes/asides/pinboard.html
  48. +0 −10 source/_includes/asides/recent_posts.html
  49. +0 −19 source/_includes/asides/twitter.html
  50. +15 −0 source/_includes/banner.html
  51. +0 −3 source/_includes/custom/after_footer.html
  52. +0 −4 source/_includes/custom/asides/about.html
  53. +6 −4 source/_includes/custom/footer.html
  54. +0 −3 source/_includes/custom/head.html
  55. +0 −6 source/_includes/custom/header.html
  56. +3 −3 source/_includes/custom/navigation.html
  57. +0 −10 source/_includes/facebook_like.html
  58. +6 −0 source/_includes/fancybox.html
  59. +1 −1 source/_includes/footer.html
  60. +10 −10 source/_includes/google_analytics.html
  61. +0 −9 source/_includes/google_plus_one.html
  62. +17 −26 source/_includes/head.html
  63. +49 −0 source/_includes/header.html
  64. +1 −15 source/_includes/navigation.html
  65. +5 −7 source/_includes/post/categories.html
  66. +14 −10 source/_includes/post/sharing.html
  67. +0 −11 source/_includes/twitter_sharing.html
  68. +4 −14 source/_layouts/category_index.html
  69. +8 −11 source/_layouts/default.html
  70. +12 −35 source/_layouts/page.html
  71. +6 −36 source/_layouts/post.html
  72. BIN source/assets/jwplayer/glow/controlbar/background.png
  73. BIN source/assets/jwplayer/glow/controlbar/blankButton.png
  74. BIN source/assets/jwplayer/glow/controlbar/divider.png
  75. BIN source/assets/jwplayer/glow/controlbar/fullscreenButton.png
  76. BIN source/assets/jwplayer/glow/controlbar/fullscreenButtonOver.png
  77. BIN source/assets/jwplayer/glow/controlbar/muteButton.png
  78. BIN source/assets/jwplayer/glow/controlbar/muteButtonOver.png
  79. BIN source/assets/jwplayer/glow/controlbar/normalscreenButton.png
  80. BIN source/assets/jwplayer/glow/controlbar/normalscreenButtonOver.png
  81. BIN source/assets/jwplayer/glow/controlbar/pauseButton.png
  82. BIN source/assets/jwplayer/glow/controlbar/pauseButtonOver.png
  83. BIN source/assets/jwplayer/glow/controlbar/playButton.png
  84. BIN source/assets/jwplayer/glow/controlbar/playButtonOver.png
  85. BIN source/assets/jwplayer/glow/controlbar/timeSliderBuffer.png
  86. BIN source/assets/jwplayer/glow/controlbar/timeSliderCapLeft.png
  87. BIN source/assets/jwplayer/glow/controlbar/timeSliderCapRight.png
  88. BIN source/assets/jwplayer/glow/controlbar/timeSliderProgress.png
  89. BIN source/assets/jwplayer/glow/controlbar/timeSliderRail.png
  90. BIN source/assets/jwplayer/glow/controlbar/unmuteButton.png
  91. BIN source/assets/jwplayer/glow/controlbar/unmuteButtonOver.png
  92. BIN source/assets/jwplayer/glow/display/background.png
  93. BIN source/assets/jwplayer/glow/display/bufferIcon.png
  94. BIN source/assets/jwplayer/glow/display/muteIcon.png
  95. BIN source/assets/jwplayer/glow/display/playIcon.png
  96. BIN source/assets/jwplayer/glow/dock/button.png
  97. +0 −115 source/assets/jwplayer/glow/glow.xml
  98. BIN source/assets/jwplayer/glow/playlist/item.png
  99. BIN source/assets/jwplayer/glow/playlist/itemOver.png
  100. BIN source/assets/jwplayer/glow/playlist/sliderCapBottom.png
  101. BIN source/assets/jwplayer/glow/playlist/sliderCapTop.png
  102. BIN source/assets/jwplayer/glow/playlist/sliderRail.png
  103. BIN source/assets/jwplayer/glow/playlist/sliderThumb.png
  104. BIN source/assets/jwplayer/glow/sharing/embedIcon.png
  105. BIN source/assets/jwplayer/glow/sharing/embedScreen.png
  106. BIN source/assets/jwplayer/glow/sharing/shareIcon.png
  107. BIN source/assets/jwplayer/glow/sharing/shareScreen.png
  108. BIN source/assets/jwplayer/player.swf
  109. +4 −14 source/blog/archives/index.html
  110. BIN source/favicon.png
  111. BIN source/font/fontawesome-webfont.eot
  112. +175 −0 source/font/fontawesome-webfont.svg
  113. BIN source/font/fontawesome-webfont.svgz
  114. BIN source/font/fontawesome-webfont.ttf
  115. BIN source/font/fontawesome-webfont.woff
  116. BIN source/images/bird_32_gray.png
  117. BIN source/images/bird_32_gray_fail.png
  118. BIN source/images/code_bg.png
  119. BIN source/images/dotted-border.png
  120. BIN source/images/email.png
  121. BIN source/images/fancybox/blank.gif
  122. BIN source/images/fancybox/fancybox_loading.gif
  123. BIN source/images/fancybox/fancybox_sprite.png
  124. BIN source/images/line-tile.png
  125. BIN source/images/loading_gray.gif
  126. BIN source/images/loading_pacman.gif
  127. BIN source/images/noise.png
  128. BIN source/images/rss.png
  129. BIN source/images/search.png
  130. BIN source/images/social/delicious.png
  131. BIN source/images/social/facebook.png
  132. BIN source/images/social/github.png
  133. BIN source/images/social/google.png
  134. BIN source/images/social/linkedin.png
  135. BIN source/images/social/pinterest.png
  136. BIN source/images/social/rss.png
  137. BIN source/images/social/twitter.png
  138. +12 −23 source/index.html
  139. +0 −45 source/javascripts/ender.js
  140. +0 −37 source/javascripts/github.js
  141. +35 −0 source/javascripts/jquery.fancybox.pack.js
  142. +0 −1,497 source/javascripts/libs/ender.js
  143. +0 −85 source/javascripts/libs/jXHR.js
  144. +0 −298 source/javascripts/libs/swfobject-dynamic.js
  145. +0 −5 source/javascripts/modernizr-2.0.js
  146. +0 −161 source/javascripts/octopress.js
  147. +0 −56 source/javascripts/pinboard.js
  148. +62 −0 source/javascripts/slash.js
  149. +83 −69 source/javascripts/twitter.js
Submodule slash added at a8b459
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
@@ -1,8 +0,0 @@
-@import "partials/header";
-@import "partials/navigation";
-@import "partials/blog";
-@import "partials/sharing";
-@import "partials/syntax";
-@import "partials/archive";
-@import "partials/sidebar";
-@import "partials/footer";
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;
+$color-main: #258fb8;
+$color-gray01: #666;
+$color-gray02: #999;
+$color-gray03: #ccc;
+$color-gray04: #ddd;
+$color-gray05: #fff;
View
@@ -0,0 +1,17 @@
+$font-default: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-mono: Menlo, Monaco, "Andale Mono", "lucida console", "Courier New", monospace;
+
+$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%;
+ }
+}
View
@@ -1,46 +0,0 @@
-$base03: #002b36 !default; //darkest blue
-$base02: #073642 !default; //dark blue
-$base01: #586e75 !default; //darkest gray
-$base00: #657b83 !default; //dark gray
-$base0: #839496 !default; //medium gray
-$base1: #93a1a1 !default; //medium light gray
-$base2: #eee8d5 !default; //cream
-$base3: #fdf6e3 !default; //white
-$solar-yellow: #b58900 !default;
-$solar-orange: #cb4b16 !default;
-$solar-red: #dc322f !default;
-$solar-magenta: #d33682 !default;
-$solar-violet: #6c71c4 !default;
-$solar-blue: #268bd2 !default;
-$solar-cyan: #2aa198 !default;
-$solar-green: #859900 !default;
-
-$solarized: dark !default;
-
-@if $solarized == light {
-
- $_base03: $base03;
- $_base02: $base02;
- $_base01: $base01;
- $_base00: $base00;
- $_base0: $base0;
- $_base1: $base1;
- $_base2: $base2;
- $_base3: $base3;
-
- $base03: $_base3;
- $base02: $_base2;
- $base01: $_base1;
- $base00: $_base0;
- $base0: $_base00;
- $base1: $_base01;
- $base2: $_base02;
- $base3: $_base03;
-}
-
-/* non highlighted code colors */
-$pre-bg: $base03 !default;
-$pre-border: darken($base02, 5) !default;
-$pre-color: $base1 !default;
-
-
Oops, something went wrong.

0 comments on commit 5cdbb83

Please sign in to comment.