Permalink
Browse files

modify theme slash

  • Loading branch information...
1 parent f82a058 commit f693d22d4cb168c945dd74a7efccf966dead3978 @mikegao committed Jan 28, 2013
Showing with 2,077 additions and 688 deletions.
  1. +1 −0 .themes/slash
  2. +4 −4 sass/_base.scss
  3. +9 −0 sass/_parts.scss
  4. +1 −0 sass/_plugins.scss
  5. +7 −0 sass/base/_color.scss
  6. +17 −0 sass/base/_font.scss
  7. +49 −192 sass/base/_layout.scss
  8. +1 −136 sass/base/_typography.scss
  9. +21 −25 sass/base/_utilities.scss
  10. +7 −0 sass/custom/_color.scss
  11. +73 −0 sass/parts/_archive.scss
  12. +141 −0 sass/parts/_article.scss
  13. +10 −0 sass/parts/_comment.scss
  14. +6 −0 sass/parts/_footer.scss
  15. +395 −0 sass/parts/_header.scss
  16. +43 −0 sass/parts/_index.scss
  17. +43 −0 sass/parts/_post.scss
  18. +387 −0 sass/parts/_syntax.scss
  19. +49 −0 sass/parts/_twitter.scss
  20. +228 −0 sass/plugins/_fancybox.scss
  21. +4 −7 sass/screen.scss
  22. +4 −4 source/_includes/after_footer.html
  23. +19 −8 source/_includes/archive_post.html
  24. +23 −25 source/_includes/article.html
  25. +15 −0 source/_includes/banner.html
  26. +0 −3 source/_includes/custom/after_footer.html
  27. +6 −4 source/_includes/custom/footer.html
  28. +0 −3 source/_includes/custom/head.html
  29. +0 −6 source/_includes/custom/header.html
  30. +3 −3 source/_includes/custom/navigation.html
  31. +6 −0 source/_includes/fancybox.html
  32. +1 −1 source/_includes/footer.html
  33. +10 −10 source/_includes/google_analytics.html
  34. +17 −26 source/_includes/head.html
  35. +55 −0 source/_includes/header.html
  36. +1 −15 source/_includes/navigation.html
  37. +5 −7 source/_includes/post/categories.html
  38. +14 −10 source/_includes/post/sharing.html
  39. +2 −12 source/_layouts/category_index.html
  40. +10 −11 source/_layouts/default.html
  41. +11 −34 source/_layouts/page.html
  42. +8 −36 source/_layouts/post.html
  43. +4 −14 source/blog/archives/index.html
  44. BIN source/font/fontawesome-webfont.eot
  45. +175 −0 source/font/fontawesome-webfont.svg
  46. BIN source/font/fontawesome-webfont.svgz
  47. BIN source/font/fontawesome-webfont.ttf
  48. BIN source/font/fontawesome-webfont.woff
  49. BIN source/images/fancybox/blank.gif
  50. BIN source/images/fancybox/fancybox_loading.gif
  51. BIN source/images/fancybox/fancybox_sprite.png
  52. BIN source/images/loading_gray.gif
  53. BIN source/images/loading_pacman.gif
  54. BIN source/images/social/coderwall.png
  55. BIN source/images/social/delicious.png
  56. BIN source/images/social/facebook.png
  57. BIN source/images/social/github.png
  58. BIN source/images/social/google.png
  59. BIN source/images/social/linkedin.png
  60. BIN source/images/social/pinboard.png
  61. BIN source/images/social/pinterest.png
  62. BIN source/images/social/rss.png
  63. BIN source/images/social/twitter.png
  64. +12 −23 source/index.html
  65. +35 −0 source/javascripts/jquery.fancybox.pack.js
  66. +62 −0 source/javascripts/slash.js
  67. +83 −69 source/javascripts/twitter.js
Submodule slash added at 2cc927
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";
@@ -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;
+$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%;
+ }
+}
Oops, something went wrong. Retry.

0 comments on commit f693d22

Please sign in to comment.