From 7ea8dac0107f6335d965853c2afeeadf945e8fab Mon Sep 17 00:00:00 2001 From: StevenJoeZhang <1119186082@qq.com> Date: Wed, 3 Apr 2019 11:47:14 +0800 Subject: [PATCH 1/3] fix #761 --- source/css/_common/components/highlight/highlight.styl | 4 +--- source/css/_common/scaffolding/tables.styl | 4 ++++ source/js/utils.js | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl index ead2202c5f..a97507cddf 100644 --- a/source/css/_common/components/highlight/highlight.styl +++ b/source/css/_common/components/highlight/highlight.styl @@ -5,9 +5,7 @@ // Placeholder: $code-block $code-block { - overflow: auto; margin: 20px 0; - padding: 0; font-size $code-font-size; color: $highlight-foreground; background: $highlight-background; @@ -27,6 +25,7 @@ code { pre { @extend $code-block; + overflow: auto; padding: 10px; code { padding: 0; @@ -64,7 +63,6 @@ pre { font-size: 1em; color: $highlight-foreground; line-height: 1em; - margin-bottom: 1em; margin: 0em; padding: 0.5em; background: $code-background; diff --git a/source/css/_common/scaffolding/tables.styl b/source/css/_common/scaffolding/tables.styl index a563abcef2..91ae458213 100644 --- a/source/css/_common/scaffolding/tables.styl +++ b/source/css/_common/scaffolding/tables.styl @@ -4,6 +4,10 @@ -webkit-overflow-scrolling: touch; } +.highlight .table-container { + margin: 0px; +} + table { width: $table-width; border-collapse: collapse; diff --git a/source/js/utils.js b/source/js/utils.js index c7f3de45d8..df3aeb5407 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -298,7 +298,7 @@ NexT.utils = NexT.$u = { $(document).ready(function() { function wrapTable() { - $('table').not('figure table').wrap('
'); + $('table').wrap('
'); } /** From e391fd7462153f7279de2cc63f36d37013ad5014 Mon Sep 17 00:00:00 2001 From: ivan-nginx Date: Wed, 3 Apr 2019 20:11:37 +0300 Subject: [PATCH 2/3] Fixed right marign during refresh --- source/css/_common/components/highlight/highlight.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl index a97507cddf..abc979f42c 100644 --- a/source/css/_common/components/highlight/highlight.styl +++ b/source/css/_common/components/highlight/highlight.styl @@ -5,6 +5,7 @@ // Placeholder: $code-block $code-block { + overflow: auto; margin: 20px 0; font-size $code-font-size; color: $highlight-foreground; @@ -25,7 +26,6 @@ code { pre { @extend $code-block; - overflow: auto; padding: 10px; code { padding: 0; From c3031d0eb56a46625dd869e4bf1972450c202f58 Mon Sep 17 00:00:00 2001 From: ivan-nginx Date: Wed, 3 Apr 2019 20:25:39 +0300 Subject: [PATCH 3/3] Backed highlight --- source/css/_common/components/highlight/highlight.styl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl index abc979f42c..ead2202c5f 100644 --- a/source/css/_common/components/highlight/highlight.styl +++ b/source/css/_common/components/highlight/highlight.styl @@ -7,6 +7,7 @@ $code-block { overflow: auto; margin: 20px 0; + padding: 0; font-size $code-font-size; color: $highlight-foreground; background: $highlight-background; @@ -63,6 +64,7 @@ pre { font-size: 1em; color: $highlight-foreground; line-height: 1em; + margin-bottom: 1em; margin: 0em; padding: 0.5em; background: $code-background;