From bd4c6ca11ba798a37bfe3f6464a1ccd694f7a029 Mon Sep 17 00:00:00 2001 From: Christophe Gabard Date: Wed, 11 Feb 2015 21:10:33 +0100 Subject: [PATCH 1/7] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a29cc0b785..b9f7f221ce 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ factory-boy==2.4.1 pygeoip==0.3.2 pillow==2.7.0 gitpython==0.3.5 -https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.4.1-zds.12.zip +https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.1.zip easy-thumbnails==2.2 # Api dependencies From 661865ce74bac8c9f0bff3ed3afdf5b1825cd366 Mon Sep 17 00:00:00 2001 From: Situphen Date: Sat, 7 Feb 2015 13:01:38 +0100 Subject: [PATCH 2/7] Rend les tableaux responsive --- assets/scss/base/_tables.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/assets/scss/base/_tables.scss b/assets/scss/base/_tables.scss index f056b82c30..7cf367d4df 100644 --- a/assets/scss/base/_tables.scss +++ b/assets/scss/base/_tables.scss @@ -1,3 +1,8 @@ +.table-wrapper { + max-width: 100%; + overflow: auto; +} + table { margin: 15px 0; border-top: 1px solid #DDD; From 8e7233d45f58f89b3d3abfcd08a171ec37470ebd Mon Sep 17 00:00:00 2001 From: Situphen Date: Sat, 7 Feb 2015 13:05:17 +0100 Subject: [PATCH 3/7] Rend les formules Mathjax responsive --- assets/scss/layout/_content.scss | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/assets/scss/layout/_content.scss b/assets/scss/layout/_content.scss index 614fceb9d8..3fa1978e4e 100644 --- a/assets/scss/layout/_content.scss +++ b/assets/scss/layout/_content.scss @@ -317,9 +317,14 @@ padding: 0 5px; } - mathjax { - font-size: 16px; - font-size: 1.6rem; + .mathjax-wrapper { + max-width: 100%; + overflow: auto; + + mathjax { + font-size: 16px; + font-size: 1.6rem; + } } .footnote { From 99885b46c7b889cb75ab49654d24d5b0e0386ddb Mon Sep 17 00:00:00 2001 From: Christophe Gabard Date: Mon, 16 Feb 2015 19:07:54 +0100 Subject: [PATCH 4/7] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b9f7f221ce..0cc380abb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ factory-boy==2.4.1 pygeoip==0.3.2 pillow==2.7.0 gitpython==0.3.5 -https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.1.zip +https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.2.zip easy-thumbnails==2.2 # Api dependencies From 21ad6f8e2742fe5aa8303a3d5c7435afedf8c9da Mon Sep 17 00:00:00 2001 From: Christophe Gabard Date: Tue, 17 Feb 2015 20:40:42 +0100 Subject: [PATCH 5/7] fix markdown --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0cc380abb9..0ab7b69f1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ factory-boy==2.4.1 pygeoip==0.3.2 pillow==2.7.0 gitpython==0.3.5 -https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.2.zip +https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.3.zip easy-thumbnails==2.2 # Api dependencies From 480eb5acc8ce1ca8fe77a8c996cde57ef5b41bc9 Mon Sep 17 00:00:00 2001 From: Christophe Gabard Date: Tue, 24 Feb 2015 16:38:22 +0100 Subject: [PATCH 6/7] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0ab7b69f1d..1d5a619d66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ factory-boy==2.4.1 pygeoip==0.3.2 pillow==2.7.0 gitpython==0.3.5 -https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.3.zip +https://github.com/zestedesavoir/Python-ZMarkdown/archive/2.6.0-zds.4.zip easy-thumbnails==2.2 # Api dependencies From 8f53d8207677567a0b9bdd907c5e56249e588ac4 Mon Sep 17 00:00:00 2001 From: Christophe Gabard Date: Tue, 24 Feb 2015 17:24:06 +0100 Subject: [PATCH 7/7] Update emarkdown.py --- zds/utils/templatetags/emarkdown.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zds/utils/templatetags/emarkdown.py b/zds/utils/templatetags/emarkdown.py index f21209e1f2..2f4040df13 100644 --- a/zds/utils/templatetags/emarkdown.py +++ b/zds/utils/templatetags/emarkdown.py @@ -28,7 +28,7 @@ def get_markdown_instance(inline=False, js_support=False): :param bool inline: If `True`, configure parser to parse only inline content. :return: A ZMarkdown parser. """ - zdsext = ZdsExtension({'inline': inline, 'emoticons': smileys, 'js_support': js_support}) + zdsext = ZdsExtension(inline=inline, emoticons=smileys, js_support=js_support) # Generate parser md = Markdown( extensions=(zdsext,),