mirror of
https://github.com/adulau/brouilleursdeblanc.git
synced 2024-11-22 01:57:08 +00:00
Merge branch 'hotfix/code-block' into develop
This commit is contained in:
commit
bc04b90545
3 changed files with 24 additions and 9 deletions
|
@ -72,6 +72,8 @@ HTML and <abbr title="cascading stylesheets">CSS<abbr> are our tools. Mauris a a
|
||||||
|
|
||||||
## Code Snippets
|
## Code Snippets
|
||||||
|
|
||||||
|
Syntax highlighting via Pygments
|
||||||
|
|
||||||
{% highlight css %}
|
{% highlight css %}
|
||||||
#container {
|
#container {
|
||||||
float: left;
|
float: left;
|
||||||
|
@ -80,6 +82,12 @@ HTML and <abbr title="cascading stylesheets">CSS<abbr> are our tools. Mauris a a
|
||||||
}
|
}
|
||||||
{% endhighlight %}
|
{% endhighlight %}
|
||||||
|
|
||||||
|
Non Pygments code example
|
||||||
|
|
||||||
|
<div id="awesome">
|
||||||
|
<p>This is great isn't it?</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
## Buttons
|
## Buttons
|
||||||
|
|
||||||
Make any link standout more when applying the `.btn` class.
|
Make any link standout more when applying the `.btn` class.
|
||||||
|
|
|
@ -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;}
|
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;}
|
.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;}
|
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: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{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 .hll{background-color:#ffffcc;}
|
||||||
.highlight .c{color:#999988;font-style:italic;}
|
.highlight .c{color:#999988;font-style:italic;}
|
||||||
|
|
|
@ -100,12 +100,18 @@ blockquote {
|
||||||
tt, code, kbd, samp, pre {
|
tt, code, kbd, samp, pre {
|
||||||
font-family: @code-font;
|
font-family: @code-font;
|
||||||
}
|
}
|
||||||
p code {
|
p,
|
||||||
.font-rem(16);
|
li {
|
||||||
|
code {
|
||||||
|
.font(12);
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
margin: 0 2px;
|
margin: 0 2px;
|
||||||
padding: 0 5px;
|
padding: 0 5px;
|
||||||
border: 1px solid lighten(@black, 90);
|
border: 1px solid lighten(@black, 90);
|
||||||
background-color: lighten(@black, 95);
|
background-color: lighten(@black, 95);
|
||||||
.rounded(3px);
|
.rounded(3px);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pre {
|
||||||
|
.font(12);
|
||||||
}
|
}
|
Loading…
Reference in a new issue