diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-16 15:20:52 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-16 16:11:40 -0400 |
| commit | 4a3f0f951797217e588fef9ec4ff699a47181203 (patch) | |
| tree | 64fc88cd95920518c2d08b3c1dc79343fb4d2034 | |
| parent | 201d265b478be1c750aa86f6ee7e732f7fe96440 (diff) | |
| download | gitlab-ce-4a3f0f951797217e588fef9ec4ff699a47181203.tar.gz | |
Merge branch 'fix-wiki-padding' into 'master'
Dont put padding on typography but on holder elements instead
Fixes wrong padding of wiki content.
See merge request !1620
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/help.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 6ccc084526a..1f4341b2462 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -207,9 +207,7 @@ a > code { */ .wiki { @include md-typography; - word-wrap: break-word; - padding: 7px; /* Link to current header. */ h1, h2, h3, h4, h5, h6 { diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss index 6da7a2511a2..bd224705f04 100644 --- a/app/assets/stylesheets/pages/help.scss +++ b/app/assets/stylesheets/pages/help.scss @@ -68,3 +68,7 @@ body.modal-open { .modal .modal-dialog { width: 860px; } + +.documentation { + padding: 7px; +} diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index f7a22849003..ec674fdf1c9 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -511,3 +511,7 @@ pre.light-well { margin-top: -1px; } } + +.project-show-readme .readme-holder { + padding: 7px; +} |