Commit 9a8ad3a0 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Adjusted styles for markdown-rendered HTML. 

Markdown-stuff no more wrapped inside <div class="markdown">.

Unified the formatting of parameter lists and normal lists, so
that creating list with markdown results in something similar
created with built-in parameters list.

Paragraphs now always have margins and aren't crushed together
in method comments.

<strong> is no more has display:block - that was just insane.

Finally added DOCTYPE for touch of sanity.
parent 205873be

lib/jsduck/doc_formatter.rb

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ module JsDuck 
    # Formats doc-comment for placement into HTML.

    # Renders it with Markdown-formatter and replaces @link-s.

    def format(input)

      replace("<div class='markdown'>" + RDiscount.new(input).to_html + "</div>")

      replace(RDiscount.new(input).to_html)

    end



  end

template/index.html

+1 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="en" xmlns:ext="http://www.sencha.com/docs">

<head>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

template/resources/style.css

+18 −27
Original line number Diff line number Diff line
@@ -111,10 +111,7 @@ 
}

/* Class description */

.body-wrap .description {

    margin: 10px 0px;

}

.body-wrap .description p {

    margin: 8px 3px !important;

    margin: 10px 3px;

}

/* horizontal line after description */

.body-wrap div.hr {
@@ -210,12 +207,6 @@ 
    color: #444 !important;

}



/* Wraps descriptions of parameters */

/* also heavily used in ExtJS source */

.body-wrap .sub-desc {

    margin: 5px;

    margin-left: 16px;

}

/* wraps method parameters and return values */

/* also used in ExtJS source for wrapping lists */

.body-wrap .mdetail-params {
@@ -223,22 +214,22 @@ 
    font-size: 12px;

    padding-left: 12px;

}

    /* Header for parameters description */

    .body-wrap .mdetail-params strong {

        display: block;

        margin-bottom: 3px;

        font-size: 11px;

        font-weight: bold;

        color: #555;



/* Styles for common text elements */

.body-wrap p {

    margin-bottom: 8px;

}

    .mdetail-params ul {

        list-style: inside;

.body-wrap ul {

    list-style-type: circle;

        margin: 12px;

    margin: 12px 12px 12px 24px;

}

    .mdetail-params li {

        list-style: inside;

        list-style-type: circle;

.body-wrap strong {

    font-weight: bold;

    font-size: 11px;

    color: #555;

}

.body-wrap em {

    font-style: italic;

}



.body-wrap pre,