From 706b60ca2250c886f92bd9a3bdfbd0fdbadc6017 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 16 Feb 2015 09:45:20 -0500 Subject: [PATCH] Rename _pygments.scss to _syntax.scss - Include Rouge in Pygments examples --- _posts/articles/2011-03-10-sample-post.md | 8 ++-- .../2013-08-16-code-highlighting-post.md | 10 ++--- _sass/_site.scss | 37 ------------------- _sass/{_pygments.scss => _syntax.scss} | 0 assets/css/main.scss | 2 +- 5 files changed, 10 insertions(+), 47 deletions(-) rename _sass/{_pygments.scss => _syntax.scss} (100%) diff --git a/_posts/articles/2011-03-10-sample-post.md b/_posts/articles/2011-03-10-sample-post.md index 7940cf1..24c1cb4 100644 --- a/_posts/articles/2011-03-10-sample-post.md +++ b/_posts/articles/2011-03-10-sample-post.md @@ -68,12 +68,12 @@ HTML and CSS are our tools. Mauris a a | cell1 | cell2 | cell3 | | cell4 | cell5 | cell6 | |===== -| Foot1 | Foot2 | Foot3 -{: rules="groups"} +| Foot1 | Foot2 | Foot3 | +{: .table} ## Code Snippets -Syntax highlighting via Pygments +Syntax highlighting via Pygments and Rouge {% highlight css %} #container { @@ -83,7 +83,7 @@ Syntax highlighting via Pygments } {% endhighlight %} -Non Pygments code example +Non Pygments/Rouge code example

This is great isn't it?

diff --git a/_posts/articles/2013-08-16-code-highlighting-post.md b/_posts/articles/2013-08-16-code-highlighting-post.md index 3d0fd25..208184b 100644 --- a/_posts/articles/2013-08-16-code-highlighting-post.md +++ b/_posts/articles/2013-08-16-code-highlighting-post.md @@ -16,15 +16,15 @@ Syntax highlighting is a feature that displays source code, in different colors [^1]: -### Pygments Code Blocks +### Pygments or Rouge Code Blocks -To modify styling and highlight colors edit `/_sass/_pygments.scss`. +To modify styling and highlight colors edit `/_sass/_syntax.scss`. {% highlight css %} #container { - float: left; - margin: 0 -240px 0 0; - width: 100%; + float: left; + margin: 0 -240px 0 0; + width: 100%; } {% endhighlight %} diff --git a/_sass/_site.scss b/_sass/_site.scss index 111a0c2..d2d40dd 100644 --- a/_sass/_site.scss +++ b/_sass/_site.scss @@ -70,43 +70,6 @@ ins { } -// Tables -table { - border-collapse: collapse; - margin: ((0px + $doc-line-height) / 2) 0; - margin: ((0rem + ($doc-line-height / $doc-font-size)) / 2) 0; - width: 100%; -} -tbody { - tr:hover > td, tr:hover > th { - background-color: $table-hover-color; - } -} -thead { - tr:first-child td { - border-bottom: 2px solid $table-border-color; - } -} -th { - padding: (0px + $doc-line-height) / 2; - padding: (0rem + ($doc-line-height / $doc-font-size)) / 2; - font-family: $alt-font; - font-weight: bold; - text-align: left; - background-color: $table-header-color; - border-bottom: 1px solid darken($border-color, 15%); -} -td { - border-bottom: 1px solid $border-color; - padding: (0px + $doc-line-height) / 2; - padding: (0rem + ($doc-line-height / $doc-font-size)) / 2; - @include font-size(18); -} -tr, td, th { - vertical-align: middle; -} - - // Links // -------------------------------------------------- diff --git a/_sass/_pygments.scss b/_sass/_syntax.scss similarity index 100% rename from _sass/_pygments.scss rename to _sass/_syntax.scss diff --git a/assets/css/main.scss b/assets/css/main.scss index 55c342c..ccb048f 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -19,7 +19,7 @@ sitemap: false @import "mixins"; @import "reset"; @import "site"; -@import "pygments"; +@import "syntax"; @import "coderay"; @import "elements"; @import "forms";