diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-09-22 01:15:09 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-09-22 01:15:09 +0000 |
| commit | 34e43c1a62526ce1d64ebaf9e7c1e36aae607f19 (patch) | |
| tree | 30c3674942ec859c9b74f390dbbeda9f6f27d273 | |
| parent | c1399cbc6667361bb0c42a0cdf83aa175e4b9dac (diff) | |
| parent | 0346e9724a8caf82378b5acc631d389f0cac64d9 (diff) | |
| download | gitlab-ce-34e43c1a62526ce1d64ebaf9e7c1e36aae607f19.tar.gz | |
Merge branch 'tweak-more-css-for-md-preview' into 'master'
Tweak remaining CSS for Markdown preview
See merge request !1383
| -rw-r--r-- | app/views/projects/milestones/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/milestones/_form.html.haml b/app/views/projects/milestones/_form.html.haml index b93462e5bdf..74e9668052d 100644 --- a/app/views/projects/milestones/_form.html.haml +++ b/app/views/projects/milestones/_form.html.haml @@ -21,7 +21,7 @@ .form-group.milestone-description = f.label :description, "Description", class: "control-label" .col-sm-10 - = render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do + = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do = render 'projects/zen', f: f, attr: :description, classes: 'description form-control' .hint .pull-left Milestones are parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'}. diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index 904600499ae..05d754adbe5 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -21,7 +21,7 @@ .form-group.wiki-content = f.label :content, class: 'control-label' .col-sm-10 - = render layout: 'projects/md_preview', locals: { preview_class: "wiki" } do + = render layout: 'projects/md_preview', locals: { preview_class: "md-preview" } do = render 'projects/zen', f: f, attr: :content, classes: 'description form-control' .col-sm-12.hint .pull-left Wiki content is parsed with #{link_to "GitLab Flavored Markdown", help_page_path("markdown", "markdown"), target: '_blank'} diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 1aa1e3c6c97..33ec726e93c 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -24,7 +24,7 @@ = f.label :description, 'Description', class: 'control-label' .col-sm-10 - = render layout: 'projects/md_preview', locals: { preview_class: "wiki", referenced_users: true } do + = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do = render 'projects/zen', f: f, attr: :description, classes: 'description form-control' .col-sm-12.hint |