Download as
Browse Code »

Commit dfe9f3674c6e91f34fa6c63f474ff2cc7e8ed535

Authored by randx
1 parent 39ea486e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix image width for markdown

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @dfe9f36
... ... @@ -11,6 +11,7 @@ a {
11 11 }
12 12 }
13 13  
  14 +
14 15 .btn {
15 16 background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f1f1f1), color-stop(25%, #f1f1f1), to(#e6e6e6));
16 17 background-image: -webkit-linear-gradient(#f1f1f1, #f1f1f1 25%, #e6e6e6);
... ... @@ -1016,6 +1017,8 @@ p.time {
1016 1017 @extend .prepend-top-20;
1017 1018 @extend .append-bottom-20;
1018 1019  
  1020 + img { max-width: 100%; }
  1021 +
1019 1022 pre {
1020 1023 background: white !important;
1021 1024  
... ... @@ -1111,6 +1114,7 @@ p.time {
1111 1114  
1112 1115 // Fix issue with notes & lists creating a bunch of bottom borders.
1113 1116 li.note {
  1117 + img { max-width:100% }
1114 1118 .note-title {
1115 1119 li {
1116 1120 border-bottom:none !important;
... ... @@ -1121,3 +1125,9 @@ li.note {
1121 1125 }
1122 1126 }
1123 1127 }
  1128 +
  1129 +.markdown {
  1130 + img {
  1131 + max-width:100%;
  1132 + }
  1133 +}
... ...
app/views/projects/show.html.haml
  Diff comments   View file @dfe9f36
... ... @@ -21,7 +21,7 @@
21 21 = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
22 22  
23 23 - if @project.description.present?
24   - .prettyprint= markdown @project.description
  24 + .markdown.prettyprint= markdown @project.description
25 25 - unless @events.blank?
26 26 %br
27 27 %h5.cgray
... ...