lalala 4.0.0.dev.239 → 4.0.0.dev.240

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a45a4659c75ccea93a250c85b4591f5c2a1117f
-  data.tar.gz: 7184be267b5a060af4a2870fa4e72cf8aac7316c
+  metadata.gz: 0951666ef51b83946343af279cd8d2c86804e916
+  data.tar.gz: da78d746c23abe740ad152bbd93ac72855080927
 SHA512:
-  metadata.gz: 3cf1effa5821870958aae13f8416d75a2e23b902de4e091354e73575215727fd94944917a475a49443a1b903ec4dfb61fa72e75fbdedfd8984362224083195f0
-  data.tar.gz: af259cb61c626dff79c4623f91d9b3368684ac44068b0ab66065abe258cb9662938dd8868d81c474f938991cf56b62c8d78aba2e1677280f51213677c473882d
+  metadata.gz: 09e7cea2c417de99138951ca71c76983d40d248d539298cceb5f22784fb788db09d98c2989c49861dd70c2b5040dce9829635e8e2912df75784a0a5e1870a81d
+  data.tar.gz: 3e849a42f10f3d7b50aad11d488672a0dbd5eee8cb415d4dc5af3038203c7bdf3399853a17bab5e71d34972bc85333a85bede9badda244920e931d42fd717ee6

data/app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss

@@ -1,5 +1,5 @@
 #markdown-cheatsheet {
-  @include box-shadow();
+  @include box-shadow(0 0 10px gray(100));
   background-color: rgba(255,255,255, 0.95);
   bottom: 0;
   overflow: auto;
@@ -9,9 +9,37 @@
   top: 0;
   z-index: 230;
 
+  h2 {
+    font-size: 16px;
+    font-weight: bold;
+    line-height: 1.5em;
+    margin: 1em 0;
+  }
+
+  h3 {
+    border-bottom: 1px solid rgb(200,200,200);
+    font-size: 14px;
+    font-weight: bold;
+    line-height: 2em;
+    margin: 1em 0;
+  }
+
+  p {
+    margin: 0 0 1em 0;
+  }
+
   pre {
     background-color: rgb(240,240,240);
-    padding: 7px;
+    font-family: Monaco, monospace;
+    font-size: 12px;
+    line-height: 1.5em;
+    margin: 0 0 1em 0;
+    padding: 10px;
+
+    & + h3 {
+      margin-top: 2em;
+    }
+
   }
 
 }

data/app/assets/stylesheets/lalala/modules/_editor-preview.css.scss

@@ -1,4 +1,3 @@
-
 html,
 body {
   font-family: helvetica, arial, sans-serif;
@@ -21,3 +20,21 @@ td {
   border: 1px solid rgb(200,200,200);
   padding: 3px 10px;
 }
+
+blockquote {
+  position: relative;
+
+  &:before {
+    content: open-quote;
+    left: -10px;
+    position: absolute;
+    top: -10px;
+  }
+
+}
+
+pre,
+code {
+  background-color: rgb(240,240,240);
+  padding: 10px;
+}

data/app/views/lalala/markdown/cheatsheet.html.erb

@@ -1,137 +1,103 @@
-<h2>Syntax Cheatsheet:</h2>
+<h2>Markdown Cheatsheet:</h2>
 
-<h3>Phrase Emphasis</h3>
+<a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">
+  See full documentation
+</a>
 
-<pre><code>*italic*   **bold**
-_italic_   __bold__
-</code></pre>
-
-<h3>Links</h3>
+<h3>Emphasis</h3>
 
-<p>Inline:</p>
-
-<pre><code>An [example](http://url.com/ "Title")
+<pre>
+_italic_
+**bold**
 </code></pre>
 
-<p>Reference-style labels (titles are optional):</p>
-
-<pre><code>An [example][id]. Then, anywhere
-else in the doc, define the link:
+<h3>Links</h3>
 
-  [id]: http://example.com/  "Title"
-</code></pre>
+<pre>
+An [example](http://url.com/ "Title")
+</pre>
 
 <h3>Images</h3>
 
 <p>Inline (titles are optional):</p>
 
-<pre><code>![alt text](/path/img.jpg "Title")
-</code></pre>
-
-<p>Reference-style:</p>
-
-<pre><code>![alt text][id]
-
-[id]: /url/to/img.jpg "Title"
-</code></pre>
+<pre>
+![alt text](/path/img.jpg "Title")
+</pre>
 
 <h3>Headers</h3>
 
-<p>Setext-style:</p>
-
-<pre><code>Header 1
-========
-
-Header 2
---------
-</code></pre>
-
-<p>atx-style (closing #'s are optional):</p>
-
-<pre><code># Header 1 #
+<pre>
+# Header 1 #
 
 ## Header 2 ##
 
 ###### Header 6
-</code></pre>
+</pre>
 
 <h3>Lists</h3>
 
-<p>Ordered, without paragraphs:</p>
-
-<pre><code>1.  Foo
-2.  Bar
-</code></pre>
-
-<p>Unordered, with paragraphs:</p>
+<p>Ordered:</p>
 
-<pre><code>*   A list item.
+<pre>
+1. Foo
+2. Bar
+</pre>
 
-    With multiple paragraphs.
+<p>Unordered:</p>
 
-*   Bar
-</code></pre>
+<pre>
+* Foo
+* Bar
+</pre>
 
 <p>You can nest them:</p>
 
-<pre><code>*   Abacus
-    * answer
-*   Bubbles
-    1.  bunk
-    2.  bupkis
-        * BELITTLER
-    3. burper
-*   Cunning
+<pre>
+* Foo
+* Bar
+* Bubbles
+  1. bunk
+  2. bupkis
+  3. burper
+* Warper
 </code></pre>
 
 <h3>Blockquotes</h3>
 
-<pre><code>&gt; Email-style angle brackets
-&gt; are used for blockquotes.
-
-&gt; &gt; And, they can be nested.
-
-&gt; #### Headers in blockquotes
-&gt;
-&gt; * You can quote a list.
-&gt; * Etc.
-</code></pre>
-
-<h3>Code Spans</h3>
+<pre>
+> This is a quote
+</pre>
 
-<pre><code>`&lt;code&gt;` spans are delimited
-by backticks.
+<h3>Code</h3>
 
-You can include literal backticks
-like `` `this` ``.
-</code></pre>
+<pre>
+`` Look mom, I'm programming! ``
+</pre>
 
 <h3>Preformatted Code Blocks</h3>
 
 <p>Indent every line of a code block by at least 4 spaces or 1 tab.</p>
 
-<pre><code>This is a normal paragraph.
+<pre>
+This is a normal paragraph.
 
     This is a preformatted
     code block.
-</code></pre>
+</pre>
 
 <h3>Horizontal Rules</h3>
 
-<p>Three or more dashes or asterisks:</p>
-
-<pre><code>---
-
-* * *
-
-- - - -
-</code></pre>
+<pre>
+---
+</pre>
 
 <h3>Manual Line Breaks</h3>
 
 <p>End a line with two or more spaces:</p>
 
-<pre><code>Roses are red,
-Violets are blue.
-</code></pre>
+<pre>
+  Roses are red,
+  Violets are blue.
+</pre>
 </div>

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.0.0"
-  BUILD   = "239"
+  BUILD   = "240"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/app/pages/application_page.rb

@@ -6,4 +6,5 @@ class ApplicationPage < Lalala::Page
   # All page associations should be placed here:
   # has_many :comments
 
+  markdown :body
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.239
+  version: 4.0.0.dev.240
 platform: ruby
 authors:
 - Simon Menke