Skip to content

Commit

Permalink
Fixed conflict with asciidoctor#333 in asciidoctor#332
Browse files Browse the repository at this point in the history
  • Loading branch information
obilodeau committed Feb 11, 2020
2 parents bebd4c9 + 90bf596 commit fa6a079
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 1 deletion.
100 changes: 100 additions & 0 deletions examples/grid-layout.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
= Grid Layout
:docinfo: private
:source-highlighter: highlight.js
:highlightjs-languages: clojure,scala

[.columns]
== 2 columns

[.column]
--
* **Edgar Allen Poe**
* Sheri S. Tepper
* Bill Bryson
--

[.column]
--
Edgar Allan Poe (/poʊ/; born Edgar Poe; January 19, 1809 – October 7, 1849) was an American writer, editor, and literary critic.
--

[.columns.wrap]
== Multi-columns with wrap

[.column]
--
.Kotlin
[source,kotlin]
----
fun main() {
println("Hello, World!")
}
----
--

[.column]
--
.Clojure
[source,clojure]
----
(defn -main [& args]
(println "Hello, World!"))
----
--

[.column]
--
.Scala
[source,scala]
----
object HelloWorld {
def main(args: Array[String]): Unit = {
println("Hello, world!")
}
}
----
--

[.columns]
== Columns with size

[.column.is-one-third]
--
* **Kotlin**
* Java
* Scala
--

[.column]
--
Programming language for Android, mobile cross-platform
and web development, server-side, native,
and data science. Open source forever Github.
--

[.columns]
== 3 columns

[.column]
* Java
* **Kotlin**

[.column]
* Node
* **Deno**

[.column]
* Ruby
* **Crystal**


[.columns.is-half.green.left]
== !

[.column.is-half]
* Java
* **Kotlin**

[.column.is-half]
* Ruby
* **Crystal**
67 changes: 67 additions & 0 deletions templates/asciidoctor-compatibility.css
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,70 @@ b.conum *{color:inherit!important}

/* Override Asciidoctor CSS that causes issues with reveal.js features */
.reveal .hljs table{border: 0}

/* Columns layout */
.columns .slide-content {
display: flex;
}

.columns.wrap .slide-content {
flex-wrap: wrap;
}

.columns .slide-content > .column {
display: block;
flex-basis: 0;
flex-grow: 1;
flex-shrink: 1;
padding: .75rem;
}

.columns .slide-content > .column.is-full {
flex: none;
width: 100%;
}

.columns .slide-content > .column.is-four-fifths {
flex: none;
width: 80%;
}

.columns .slide-content > .column.is-three-quarters {
flex: none;
width: 75%;
}

.columns .slide-content > .column.is-two-thirds {
flex: none;
width: 66.6666%;
}

.columns .slide-content > .column.is-three-fifths {
flex: none;
width: 60%;
}

.columns .slide-content > .column.is-half {
flex: none;
width: 50%;
}

.columns .slide-content > .column.is-two-fifths {
flex: none;
width: 40%;
}

.columns .slide-content > .column.is-one-third {
flex: none;
width: 33.3333%;
}

.columns .slide-content > .column.is-one-quarter {
flex: none;
width: 25%;
}

.columns .slide-content > .column.is-one-fifth {
flex: none;
width: 20%;
}
3 changes: 2 additions & 1 deletion templates/section.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
- (blocks - vertical_slides).each do |block|
=block.convert
- else
=content.chomp
div.slide-content
=content.chomp

/ RENDERING
/ render parent section of vertical slides set
Expand Down

0 comments on commit fa6a079

Please sign in to comment.