Merge branch 'hotfix/minor' into develop

This commit is contained in:
Michael Rose 2013-08-23 16:20:34 -04:00
commit 5c013630c8
3 changed files with 18 additions and 8 deletions

View File

@ -11,9 +11,7 @@ image:
comments: true
---
Syntax highlighting is a feature that displays source code, in different colors and fonts according to the category of terms. This feature facilitates writing in a structured language such as a programming language or a markup language as both structures and syntax errors are visually distinct. Highlighting does not affect the meaning of the text itself; it is intended only for human readers.[^1]
[^1]: <http://en.wikipedia.org/wiki/Syntax_highlighting>
[Syntax highlighting](http://en.wikipedia.org/wiki/Syntax_highlighting) is a feature that displays source code, in different colors and fonts according to the category of terms. This feature facilitates writing in a structured language such as a programming language or a markup language as both structures and syntax errors are visually distinct. Highlighting does not affect the meaning of the text itself; it is intended only for human readers.
### Pygments Code Blocks

View File

@ -3402,14 +3402,22 @@ body {
}
#post .entry-content,
#page .entry-content {
margin: 40px 10px 20px 10px;
padding: 20px 30px;
margin: 40px 2px 20px 2px;
padding: 10px 15px;
background-color: #ffffff;
box-shadow: 0 0 0 1px rgba(187, 187, 187, 0.1), 0 6px 12px rgba(0, 0, 0, 0.1);
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
@media only screen and (min-width: 48em) {
#post .entry-content,
#page .entry-content {
margin-left: 10px;
margin-right: 10px;
padding: 20px 30px;
}
}
@media only screen and (min-width: 62.5em) {
#post .entry-content,
#page .entry-content {

View File

@ -172,12 +172,16 @@ body {
#post,
#page {
.entry-content {
margin: 40px 10px 20px 10px;
padding: 20px 30px;
margin: 40px 2px 20px 2px;
padding: 10px 15px;
background-color: @white;
box-shadow: 0 0 0 1px fade(@border-color,10), 0 6px 12px fade(@black,10);
.rounded(3px);
@media @medium {
margin-left: 10px;
margin-right: 10px;
padding: 20px 30px;
}
@media @large {
max-width: 800px;
padding: 50px 80px;