diff options
| author | Simon Knox <psimyn@gmail.com> | 2019-02-21 05:32:01 +0300 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2019-02-22 07:14:45 +0300 |
| commit | 77ac026e33ca4b8841836393410801b4d144fe44 (patch) | |
| tree | ebc506b5944c7025bd2a7d4785789b0620e1c0b1 /app | |
| parent | dba6cfdbef1bfb33a62497b0c1ea5e231157a9f3 (diff) | |
Only show borders for images in notes
Compatible with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5162
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 8 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 10 | ||||
| -rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 961de8402ef..d6c4e68f68f 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -149,14 +149,6 @@ margin: 10px 0; } - // Border around images in issue and MR comments. - img:not(.emoji) { - border: 1px solid $white-normal; - padding: 5px; - margin: 5px 0; - // Ensure that image does not exceed viewport - max-height: calc(100vh - 100px); - } table:not(.js-syntax-highlight) { @include markdown-table; diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index bf85acdc0d6..1b36c1f4862 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -371,6 +371,16 @@ code { .md:not(.use-csslab) { @include md-typography; + + &:not(.wiki) { + img:not(.emoji) { + border: 1px solid $white-normal; + padding: 5px; + margin: 5px 0; + // Ensure that image does not exceed viewport + max-height: calc(100vh - 100px); + } + } } /** diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index 3b81148bf59..f659c89dd30 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -81,7 +81,7 @@ = link_to '#', class: 'dashboard-shortcuts-web-ide', title: _('Web IDE') do = _('Web IDE') - = render_if_exists 'dashboard/operations/nav_link_icon' + = render_if_exists 'dashboard/operations/nav_link' - if can?(current_user, :read_instance_statistics) = nav_link(controller: [:conversational_development_index, :cohorts], html_options: { class: "d-none d-lg-block d-xl-block"}) do = link_to instance_statistics_root_path, title: _('Instance Statistics'), aria: { label: _('Instance Statistics') }, data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do |