diff --git a/Gemfile.lock b/Gemfile.lock index b7b6c72..f262dae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,7 +7,7 @@ GIT GIT remote: https://github.com/ruby-x/rubyx - revision: db459fcd3d9c90a882871a0f5b3832d65bdfc3f7 + revision: 9687d6611f2d03612774bb4539a430ad898161d2 specs: rubyx (0.6.0) parser (~> 2.3.0) diff --git a/app/assets/stylesheets/hacker.sass b/app/assets/stylesheets/hacker.sass index db1e1ac..cf4c35d 100644 --- a/app/assets/stylesheets/hacker.sass +++ b/app/assets/stylesheets/hacker.sass @@ -11,31 +11,17 @@ $blockquote-border: $dove-grey !default body margin: 0 padding: 0 - background: $body-background url("bkg.png") 0 0 + background: $body-background 0 0 color: $body-foreground font-size: 16px line-height: 1.4 font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace -/* General & 'Reset' Stuff */ - - -section - display: block - margin: 0 0 20px 0 - - - -li - line-height: 1.4 - - - -// Header,
-// header - container -// h1 - project name -// h2 - project description + // Header,
+ // header - container + // h1 - project name + // h2 - project description header @@ -64,154 +50,167 @@ header color: #666 -#downloads .btn - display: inline-block - text-align: center - margin: 0 +/* General & 'Reset' Stuff */ + +main , header , footer + + section + display: block + margin: 0 0 20px 0 -section img - max-width: 100% + + li + line-height: 1.4 + + #downloads .btn + display: inline-block + text-align: center + margin: 0 -h1, h2, h3, h4, h5, h6 - font-weight: normal - font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace - color: $header - letter-spacing: -0.03em - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(181, 232, 83, 0.1), 0 0 10px rgba(181, 232, 83, 0.1) - -h1 - font-size: 30px -h2 - font-size: 24px -h3 - font-size: 18px -h4 - font-size: 14px -h5 - font-size: 12px - text-transform: uppercase - margin: 0 0 5px 0 -h6 - font-size: 12px - text-transform: uppercase - color: #999 - margin: 0 0 5px 0 + section img + max-width: 100% -dt - font-style: italic - font-weight: bold + h1, h2, h3, h4, h5, h6 + font-weight: normal + font-family: Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal, monospace + color: $header + letter-spacing: -0.03em + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), 0 0 5px rgba(181, 232, 83, 0.1), 0 0 10px rgba(181, 232, 83, 0.1) -ul li - list-style: none - margin-left: -30px - &:before + h1 + font-size: 30px + h2 + font-size: 24px + h3 + font-size: 18px + h4 + font-size: 14px + h5 + font-size: 12px + text-transform: uppercase + margin: 0 0 5px 0 + h6 + font-size: 12px + text-transform: uppercase + color: #999 + margin: 0 0 5px 0 + + + dt + font-style: italic + font-weight: bold + + ul li + list-style: none + margin-left: -30px + &:before + color: #b5e853 + content: ">> " + + blockquote + color: $blockquote-color + padding-left: 10px + border-left: 1px dotted $blockquote-border + + + pre + background: rgba(0, 0, 0, 0.9) + border: 1px solid rgba(255, 255, 255, 0.15) + padding: 10px + font-size: 16px color: #b5e853 - content: ">> " - -blockquote - color: $blockquote-color - padding-left: 10px - border-left: 1px dotted $blockquote-border + border-radius: 2px + word-wrap: normal + overflow: auto + overflow-y: hidden -pre - background: rgba(0, 0, 0, 0.9) - border: 1px solid rgba(255, 255, 255, 0.15) - padding: 10px - font-size: 16px - color: #b5e853 - border-radius: 2px - word-wrap: normal - overflow: auto - overflow-y: hidden + code.highlighter-rouge + background: rgba(0,0,0,0.9) + border: 1px solid rgba(255, 255, 255, 0.15) + padding: 0px 3px + margin: 0px -3px + color: #aa759f + border-radius: 2px -code.highlighter-rouge - background: rgba(0,0,0,0.9) - border: 1px solid rgba(255, 255, 255, 0.15) - padding: 0px 3px - margin: 0px -3px - color: #aa759f - border-radius: 2px + table + width: 100% + margin: 0 0 20px 0 -table - width: 100% - margin: 0 0 20px 0 + th + text-align: left + border-bottom: 1px dashed #b5e853 + padding: 5px 10px -th - text-align: left - border-bottom: 1px dashed #b5e853 - padding: 5px 10px + td + padding: 5px 10px -td - padding: 5px 10px + hr + height: 0 + border: 0 + border-bottom: 1px dashed #b5e853 + color: #b5e853 -hr - height: 0 - border: 0 - border-bottom: 1px dashed #b5e853 - color: #b5e853 + /* Buttons*/ + + .btn + display: inline-block + background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3)) + padding: 8px 18px + border-radius: 50px + border: 2px solid rgba(0, 0, 0, 0.7) + border-bottom: 2px solid rgba(0, 0, 0, 0.7) + border-top: 2px solid rgba(0, 0, 0, 1) + color: rgba(255, 255, 255, 0.8) + font-family: Helvetica, Arial, sans-serif + font-weight: bold + font-size: 13px + text-decoration: none + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75) + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05) + + .btn:hover + background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.6), rgba(35, 35, 35, 0.6) 50%, rgba(10, 10, 10, 0.8) 50%, rgba(0, 0, 0, 0.8)) -/* Buttons*/ - -.btn - display: inline-block - background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.3), rgba(35, 35, 35, 0.3) 50%, rgba(10, 10, 10, 0.3) 50%, rgba(0, 0, 0, 0.3)) - padding: 8px 18px - border-radius: 50px - border: 2px solid rgba(0, 0, 0, 0.7) - border-bottom: 2px solid rgba(0, 0, 0, 0.7) - border-top: 2px solid rgba(0, 0, 0, 1) - color: rgba(255, 255, 255, 0.8) - font-family: Helvetica, Arial, sans-serif - font-weight: bold - font-size: 13px - text-decoration: none - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.75) - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.05) - -.btn:hover - background: -webkit-linear-gradient(top, rgba(40, 40, 40, 0.6), rgba(35, 35, 35, 0.6) 50%, rgba(10, 10, 10, 0.8) 50%, rgba(0, 0, 0, 0.8)) + .btn .icon + display: inline-block + width: 16px + height: 16px + margin: 1px 8px 0 0 + float: left -.btn .icon - display: inline-block - width: 16px - height: 16px - margin: 1px 8px 0 0 - float: left + .btn-github .icon + opacity: 0.6 + background: url("../images/blacktocat.png") 0 0 no-repeat -.btn-github .icon - opacity: 0.6 - background: url("../images/blacktocat.png") 0 0 no-repeat + /* Links a, a:hover, a:visited */ + + a + color: #63c0f5 + text-shadow: 0 0 5px rgba(104, 182, 255, 0.5) -/* Links a, a:hover, a:visited */ + /* Clearfix */ -a - color: #63c0f5 - text-shadow: 0 0 5px rgba(104, 182, 255, 0.5) + .cf:before, .cf:after + content: "" + display: table -/* Clearfix */ - -.cf:before, .cf:after - content: "" - display: table + .cf:after + clear: both -.cf:after - clear: both - - -.cf - zoom: 1 + .cf + zoom: 1 diff --git a/app/assets/stylesheets/rouge.sass b/app/assets/stylesheets/rouge.sass index 1e46615..c4b5470 100644 --- a/app/assets/stylesheets/rouge.sass +++ b/app/assets/stylesheets/rouge.sass @@ -4,82 +4,83 @@ // @import "colors" -.highlight - $plaintext: $alto !default - $string: $chelsea-cucumber !default - $literal: $chelsea-cucumber !default - $keyword: $bouquet !default - $error-foreground: $cod-grey !default - $error-background: $apple-blossom !default - $comment: $grey !default - $preprocessor: $rajah !default - $name-space: $rajah !default - $name-attribute: $hippie-blue !default - $operator: $rajah !default - $keyword-type: $raw-sienna !default - $regex: $gulf-stream !default - $string-escape: $potters-clay !default - $deleted: $apple-blossom !default - $header: $hippie-blue !default +main , header , footer + .highlight + $plaintext: $alto !default + $string: $chelsea-cucumber !default + $literal: $chelsea-cucumber !default + $keyword: $bouquet !default + $error-foreground: $cod-grey !default + $error-background: $apple-blossom !default + $comment: $grey !default + $preprocessor: $rajah !default + $name-space: $rajah !default + $name-attribute: $hippie-blue !default + $operator: $rajah !default + $keyword-type: $raw-sienna !default + $regex: $gulf-stream !default + $string-escape: $potters-clay !default + $deleted: $apple-blossom !default + $header: $hippie-blue !default - color: $plaintext - - table td - padding: 5px - table pre - margin: 0 - .w color: $plaintext - .err - color: $error-foreground - background-color: $error-background + table td + padding: 5px + table pre + margin: 0 + .w + color: $plaintext - .c, .cd, .cm, .c1, .cs - color: $comment + .err + color: $error-foreground + background-color: $error-background - .cp - color: $preprocessor + .c, .cd, .cm, .c1, .cs + color: $comment - .o, .ow - color: $operator + .cp + color: $preprocessor - .p, .pi - color: $plaintext + .o, .ow + color: $operator - .gi - color: $string + .p, .pi + color: $plaintext - .gd - color: $deleted + .gi + color: $string - .gh - color: $header - font-weight: bold + .gd + color: $deleted - .k, .kn, .kp, .kr, .kv - color: $keyword + .gh + color: $header + font-weight: bold - .kc, .kt, .kd - color: $keyword-type + .k, .kn, .kp, .kr, .kv + color: $keyword - .s, .sb, .sc, .sd, .s2, .sh, .sx, .s1 - color: $string + .kc, .kt, .kd + color: $keyword-type - .sr - color: $regex + .s, .sb, .sc, .sd, .s2, .sh, .sx, .s1 + color: $string - .si, .se - color: $string-escape + .sr + color: $regex - .nt, .nn, .nc, .no - color: $name-space + .si, .se + color: $string-escape - .na - color: $name-attribute + .nt, .nn, .nc, .no + color: $name-space - .m, .mf, .mh, .mi, .il, .mo, .mb, .mx - color: $literal + .na + color: $name-attribute - .ss - color: $string + .m, .mf, .mh, .mi, .il, .mo, .mb, .mx + color: $literal + + .ss + color: $string diff --git a/app/assets/stylesheets/site.sass b/app/assets/stylesheets/site.sass index 4f4053e..73c1347 100644 --- a/app/assets/stylesheets/site.sass +++ b/app/assets/stylesheets/site.sass @@ -1,10 +1,6 @@ @import "susy" $susy: ( columns: 12, gutters: 1/4, gutter-position: inside ) -a - color: #53a5ff - text-decoration: none - .container width: 90% max-width: 1000px @@ -25,66 +21,66 @@ a @media only screen and (max-width: 880px) @include span(12) -ul.nav - text-align: center - li - display: inline - margin-left: 5px - &:before - color: #b5e853 - content: ">> " - width: 30px - height: 30px - left: -30px - a - border-bottom: 1px dashed #53a5ff - &:hover - border-bottom: 0px - small - color: lightgrey -.center - text-align: center +main , header , footer + a + color: #53a5ff + text-decoration: none -.row - clear: both - width: 100% + ul.nav + text-align: center + li + display: inline + margin-left: 5px + &:before + color: #b5e853 + content: ">> " + width: 30px + height: 30px + left: -30px + a + border-bottom: 1px dashed #53a5ff + &:hover + border-bottom: 0px + small + color: lightgrey + .center + text-align: center -.tripple - @include span(4) - @media only screen and (max-width: 880px) - @include span(12) - -.main - width: 78% -.menu - width: 20% - -.full_width - img - width: 100% -.debug_pic - border-color: white - border-width: 8px - border-style: solid - border-radius: 6px - img + .row + clear: both width: 100% -.blog_nav - .next_post , .prev_post - width: 20% - .next_post - float: right - .prev_post - float: left -.blog_post - h1 - span - font-size: 18px -.blog_index - h1 - font-size: 20px - h2 - font-size: 16px - span - font-size: 14px + .tripple + @include span(4) + @media only screen and (max-width: 880px) + @include span(12) + + .full_width + img + width: 100% + .debug_pic + border-color: white + border-width: 8px + border-style: solid + border-radius: 6px + img + width: 100% + + .blog_nav + .next_post , .prev_post + width: 20% + .next_post + float: right + .prev_post + float: left + .blog_post + h1 + span + font-size: 18px + .blog_index + h1 + font-size: 20px + h2 + font-size: 16px + span + font-size: 14px