From a703a9d8c87ea9a902d923a5d4d97bffb0ecf503 Mon Sep 17 00:00:00 2001 From: ma65p Date: Thu, 8 Aug 2013 10:02:02 -0500 Subject: [PATCH 1/2] Update main.css --- assets/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/main.css b/assets/css/main.css index 8b9e04f..e824280 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -45,7 +45,7 @@ figcaption{padding-top:10px;font-size:14px;font-size:0.875rem;line-height:1.7143 blockquote{font-family:'volkhov',serif;font-style:italic;font-size:24px;font-size:1.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem;padding-left:20px;border-left:8px solid #000000;} .footnotes{font-size:14px;font-size:0.875rem;line-height:1.7143;font-family:'source-sans-pro',sans-serif;} tt,code,kbd,samp,pre{font-family:'source-code-pro',monospace;} -p code{font-size:16px;font-size:1rem;white-space:nowrap;margin:0 2px;padding:0 5px;border:1px solid #e6e6e6;background-color:#f2f2f2;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +p code, li code{font-size:16px;font-size:1rem;white-space:nowrap;margin:0 2px;padding:0 5px;border:1px solid #e6e6e6;background-color:#f2f2f2;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .highlight{overflow-x:auto;font-size:12px;font-size:0.75rem;line-height:2;border:1px solid #dedede;}.highlight pre{position:relative;margin:0;padding:1em;} .highlight .hll{background-color:#ffffcc;} .highlight .c{color:#999988;font-style:italic;} From 8dc5f41f17442e489c03dfb4582386c25d4ac4b8 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 8 Aug 2013 13:26:27 -0400 Subject: [PATCH 2/2] Style code syntax to fix #23 and add example to Sample Post --- _posts/2011-03-10-sample-post.md | 8 ++++++++ assets/css/main.css | 3 ++- assets/less/typography.less | 22 ++++++++++++++-------- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/_posts/2011-03-10-sample-post.md b/_posts/2011-03-10-sample-post.md index 08d5fe0..0499eca 100644 --- a/_posts/2011-03-10-sample-post.md +++ b/_posts/2011-03-10-sample-post.md @@ -72,6 +72,8 @@ HTML and CSS are our tools. Mauris a a ## Code Snippets +Syntax highlighting via Pygments + {% highlight css %} #container { float: left; @@ -80,6 +82,12 @@ HTML and CSS are our tools. Mauris a a } {% endhighlight %} +Non Pygments code example + +
+

This is great isn't it?

+
+ ## Buttons Make any link standout more when applying the `.btn` class. diff --git a/assets/css/main.css b/assets/css/main.css index e824280..ae1d06d 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -45,7 +45,8 @@ figcaption{padding-top:10px;font-size:14px;font-size:0.875rem;line-height:1.7143 blockquote{font-family:'volkhov',serif;font-style:italic;font-size:24px;font-size:1.5rem;line-height:1;margin-bottom:24px;margin-bottom:1.5rem;padding-left:20px;border-left:8px solid #000000;} .footnotes{font-size:14px;font-size:0.875rem;line-height:1.7143;font-family:'source-sans-pro',sans-serif;} tt,code,kbd,samp,pre{font-family:'source-code-pro',monospace;} -p code, li code{font-size:16px;font-size:1rem;white-space:nowrap;margin:0 2px;padding:0 5px;border:1px solid #e6e6e6;background-color:#f2f2f2;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +p code,li code{font-size:12px;font-size:0.75rem;line-height:2;white-space:nowrap;margin:0 2px;padding:0 5px;border:1px solid #e6e6e6;background-color:#f2f2f2;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +pre{font-size:12px;font-size:0.75rem;line-height:2;} .highlight{overflow-x:auto;font-size:12px;font-size:0.75rem;line-height:2;border:1px solid #dedede;}.highlight pre{position:relative;margin:0;padding:1em;} .highlight .hll{background-color:#ffffcc;} .highlight .c{color:#999988;font-style:italic;} diff --git a/assets/less/typography.less b/assets/less/typography.less index 0328910..cc2e2de 100644 --- a/assets/less/typography.less +++ b/assets/less/typography.less @@ -100,12 +100,18 @@ blockquote { tt, code, kbd, samp, pre { font-family: @code-font; } -p code { - .font-rem(16); - white-space: nowrap; - margin: 0 2px; - padding: 0 5px; - border: 1px solid lighten(@black, 90); - background-color: lighten(@black, 95); - .rounded(3px); +p, +li { + code { + .font(12); + white-space: nowrap; + margin: 0 2px; + padding: 0 5px; + border: 1px solid lighten(@black, 90); + background-color: lighten(@black, 95); + .rounded(3px); + } +} +pre { + .font(12); } \ No newline at end of file