Skip to content

Commit 260cc09

Browse files
committed
2 Column div
option to allow 2 column display using a <div>div</div>
1 parent 147f69c commit 260cc09

File tree

2 files changed

+93
-4
lines changed

2 files changed

+93
-4
lines changed

display_test.md

Lines changed: 69 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Markdown Display Test #
2-
**v1.0.17, November 12, 2012**
2+
**v1.1.2, November 13, 2012**
33

44
This file serves three purposes:
55
1) a markdown language reference,
@@ -115,7 +115,7 @@ This is [an example][id] reference-method link.
115115
As a bonus, email addresses are automatically obscured.
116116

117117
# Images #
118-
![Alt text](/files/expand_arrow.JPG "Image call example")
118+
![Alt text](/path/to/img.jpg "Image call example")
119119
![Alt text](/path/to/img.jpg)
120120
![Alt text](/path/to/img.jpg "Title")
121121
![Alt text][img1]
@@ -161,6 +161,7 @@ if (this_is_more_code == true && !indented) {
161161
// tild wrapped code blocks, also not indented
162162
}
163163
~~~
164+
<!-- _ this is just to make it display nice is Notepad++ -->
164165

165166
For inline code:
166167

@@ -247,7 +248,7 @@ can make sure Markdown doesn't interpret these characters by placing a backslash
247248
\ backslash
248249
` backtick
249250
* asterisk
250-
_ underscore
251+
_ underscore
251252
{} curly braces
252253
[] square brackets
253254
() parentheses
@@ -259,7 +260,7 @@ can make sure Markdown doesn't interpret these characters by placing a backslash
259260
: colon
260261
| pipe
261262

262-
263+
<!-- _ this is just to make it display nice is Notepad++ -->
263264
# SmartyPants #
264265
SmartyPants transforms:
265266

@@ -331,6 +332,70 @@ Some other samples:
331332
\left(a+\frac{2d}{\pi}\right) v_\infty\, \overline{f'(z)} =
332333
v_\infty \left[ \pi a + \frac{2d}{\pi a + 2dw^{-1/2}(w-1)^{1/2}} \right]^-\)
333334

335+
<div class="col2" markdown="1">
336+
# 2 Column Display
337+
338+
This is text that is supposed to be displayed in
339+
2 columns. Invoke columns by using:
340+
~~~
341+
<div class="col2" markdown="1"> text here </div>
342+
~~~
343+
Markdown will be rendered. `<H1>`, `<H2>`, and `<hr>` will span both columns.
344+
This is not a function of the Markdown, but rather the stylesheet.
345+
346+
..
347+
348+
# Two Column Break ============ &
349+
350+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas in pretium metus.
351+
Cras tempor lacinia risus in porttitor. In hac habitasse platea dictumst. Proin
352+
auctor nibh in metus condimentum ut lacinia magna rhoncus.
353+
354+
Donec non enim id
355+
dolor elementum tincidunt. Fusce et quam nulla. Vivamus diam lacus, ultrices
356+
quis malesuada ullamcorper, elementum in elit.
357+
358+
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla et leo ac libero
359+
pellentesque volutpat. Nunc euismod fermentum augue, vel laoreet ante gravida nec.
360+
Etiam et odio ac ante interdum adipiscing.
361+
362+
Ut gravida nulla at erat accumsan quis
363+
fermentum est sagittis. Suspendisse dignissim congue nibh, quis porttitor magna
364+
dignissim at. Sed ut eros est.
365+
366+
## Another Two Column Break ================ &
367+
368+
Maecenas dictum sodales leo in sagittis. Sed ullamcorper enim nec ligula tempus
369+
eu gravida enim laoreet. Nunc eu feugiat erat.
370+
371+
Morbi interdum, nisl at fringilla
372+
semper, magna lorem laoreet neque, ac posuere risus diam et odio. Mauris iaculis
373+
aliquet augue, vel ullamcorper massa rutrum pulvinar. Curabitur nisi orci,
374+
molestie egestas dignissim eget, suscipit vel nunc.
375+
376+
Praesent aliquam tempor
377+
lectus, sed facilisis urna aliquam non. Nulla facilisi.
378+
379+
***
380+
381+
Aenean at tellus velit. Aliquam eleifend cursus posuere. Sed semper, justo
382+
lacinia pharetra ultricies, nulla purus tincidunt enim, non pretium odio ante
383+
eget velit. Cras luctus dolor vitae eros mattis hendrerit.
384+
385+
Cum sociis natoque
386+
penatibus et magnis dis parturient montes, nascetur ridiculus mus. Mauris quis
387+
augue tortor, in accumsan urna. Sed vestibulum, augue at commodo ultricies, leo
388+
libero faucibus lorem, nec porta eros massa quis nunc.
389+
390+
Nunc fermentum consequat
391+
ultricies. Quisque eu arcu ipsum. Donec sollicitudin sapien ut metus pretium non
392+
lacinia lacus volutpat. Aliquam erat volutpat.
393+
394+
Vivamus quis erat nec tellus
395+
vehicula placerat. Class aptent taciti sociosqu ad litora torquent per conubia
396+
nostra, per inceptos himenaeos.
397+
</div>
398+
334399
# For more information #
335400
* Markdown - <http://daringfireball.net/projects/markdown/syntax>
336401
* Markdown Plus - <http://michelf.ca/projects/php-markdown/extra/>

markdown/md-styles.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,30 @@ p, li {
6666
line-height: 18px;
6767
}
6868

69+
/* Two Column */
70+
/* Columns don't appear to work in IE */
71+
.col2 {
72+
-moz-column-count: 2; /* Firefox */
73+
-webkit-column-count: 2; /* Safari and Chrome */
74+
column-count: 2;
75+
76+
-moz-column-gap: 40px; /* Firefox */
77+
-webkit-column-gap: 40px; /* Safari and Chrome */
78+
column-gap: 40px;
79+
80+
-moz-column-rule: 1px outset #000; /* Firefox */
81+
-webkit-column-rule: 1px outset #000; /* Safari and Chrome */
82+
column-rule: 1px outset #000;
83+
}
84+
85+
/* span h1, h2, and hr across all columns
86+
said not to work in firefox or IE */
87+
h1, h2, hr {
88+
-webkit-column-span: all; /* Chrome */
89+
-moz-column-span: all;
90+
column-span: all;
91+
}
92+
6993
/* Elements copied from CamenDesign.com - http://camendesign.com/design/ */
7094
/* --- quotes ----------------------------------------------------------------------------------------------------------- */
7195
q {font-style: italic;}

0 commit comments

Comments
 (0)