diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2017-04-14 15:31:58 -0400 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2017-04-14 15:31:58 -0400 |
| commit | 669e514731a148c9d9f575b58f30beb4d476f0cf (patch) | |
| tree | d3dd2387530e3c2ed0f1eba1db7655d3b710dcfe | |
| parent | 616eb5eeba80226c61f76b84585d07c987759525 (diff) | |
| download | gitlab-ce-render-docx.tar.gz | |
Make font sizes and measurements correct.render-docx
| -rw-r--r-- | app/assets/javascripts/blob/docx/docx.js | 12 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 26 |
2 files changed, 10 insertions, 28 deletions
diff --git a/app/assets/javascripts/blob/docx/docx.js b/app/assets/javascripts/blob/docx/docx.js index 80a36810aa6..470fe29b42b 100644 --- a/app/assets/javascripts/blob/docx/docx.js +++ b/app/assets/javascripts/blob/docx/docx.js @@ -84,8 +84,14 @@ export default class Docx { setPagesStyles($pageStyles) { if($pageStyles.length) { + const $container = $(this.container); const $pageSize = $pageStyles.find('pgSz'); - $(this.container).css('width', $pageSize.attr('w:h')/20); + $container.css('width', $pageSize.attr('w:h')/20 + 'pt'); + const $pageMargins = $pageStyles.find('pgMar'); + $container.css('padding-top', parseInt($pageMargins.attr('w:top'))/20 + 'pt'); + $container.css('padding-bottom', parseInt($pageMargins.attr('w:bottom'))/20 + 'pt'); + $container.css('padding-left', parseInt($pageMargins.attr('w:left'))/20 + 'pt'); + $container.css('padding-right', parseInt($pageMargins.attr('w:right'))/20 + 'pt'); } } @@ -238,7 +244,7 @@ export default class Docx { return $el; } size = size / 2; - $el.css('font-size',size + 'px'); + $el.css('font-size',size + 'pt'); $el.attr('data-sz', 1); return $el; } @@ -343,7 +349,7 @@ export default class Docx { $p.prepend(`<span style='user-select: none;'>${increment}.</span>`); break; } - $p.css('margin-left', numberInfo.ind); + $p.css('margin-left', numberInfo.ind + 'pt'); return $p; } else { this.listIncrements = {}; diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 1f8150969d5..afbffd5e3ac 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -306,34 +306,10 @@ span.idiff { margin: 0 auto; border: 1px solid #CCC; padding: 22px; - box-sizing: content-box; + box-sizing: border-box; background: #FFFFFF; -webkit-box-shadow: 0px 0px 3px 0px rgba(0,0,0,0.30); -moz-box-shadow: 0px 0px 3px 0px rgba(0,0,0,0.30); box-shadow: 0px 0px 3px 0px rgba(0,0,0,0.30); } - - ol { - list-style-type: decimal; - } - - ol > li > ol { - list-style-type: lower-alpha; - } - - ol > li > ol > li > ol { - list-style-type: lower-roman; - } - - ol > li > ol > li > ol > li > ol { - list-style-type: decimal; - } - - ol > li > ol > li > ol > li > ol > li > ol { - list-style-type: lower-alpha; - } - - ol > li > ol > li > ol > li > ol > li > ol > li > ol { - list-style-type: lower-roman; - } }
\ No newline at end of file |