diff --git a/Gemfile b/Gemfile index c01b1bef4..891323817 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem 'diff-display', '~> 0.0.1' # Wiki gem "gollum", '~> 2.1.3' -gem "redcarpet", "~> 2.1.1" #, "1.17.2" +gem "redcarpet", "~> 2.1.1" gem 'creole' gem 'rdiscount' # gem 'org-ruby' diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index 3282b8762..a14369c7d 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -1497,6 +1497,7 @@ table.tablesorter.platform-maintainers.static-search thead tr.search th input[ty margin: 10px 0 10px; padding: 5px; border-radius: 4px 4px 4px 4px; + background: #FFF; pre { background-color: #F8F8F8; @@ -1569,9 +1570,18 @@ table.tablesorter.platform-maintainers.static-search thead tr.search th input[ty resize: vertical; } + textarea#issue_title { + height: 16px; + margin: 0 0 10px; + } + .tab-pane textarea { min-height: 112px; } + + .edit_comment .comment-left { + margin-top: 0; + } } #open-comment > h3.tmargin0 { diff --git a/app/views/projects/comments/_body.html.haml b/app/views/projects/comments/_body.html.haml index 9b729ddd4..4b57f37b1 100644 --- a/app/views/projects/comments/_body.html.haml +++ b/app/views/projects/comments/_body.html.haml @@ -9,5 +9,5 @@ =f.text_area :body, :cols => 80, :id => "#{id}_edit_input" =hidden_field_tag :body_dup, nil, :name => 'text', :id => "#{id}_edit_input_dup" .tab-pane{:id => "#{id}_preview"} - .formatted.cm-s-default.md_and_cm{:style => 'background: #FFF'} + .formatted.cm-s-default.md_and_cm diff --git a/app/views/projects/comments/_list.html.haml b/app/views/projects/comments/_list.html.haml index 268e9b5cd..aa27c0955 100644 --- a/app/views/projects/comments/_list.html.haml +++ b/app/views/projects/comments/_list.html.haml @@ -8,7 +8,7 @@ %h3.tmargin0= t("layout.comments.edit_header") = form_for comment, :url => project_commentable_comment_path(project, commentable, comment), :html => { :class => 'form edit_comment' } do |f| = render "projects/comments/form", :f => f, :id => "edit_#{comment.id}" - .comment-left{:style => 'margin-top: 0;'} + .comment-left =link_to t('layout.cancel'), '#', :id => "comment-#{comment.id}", :class => 'cancel_edit_comment button' .both = render "projects/comments/markdown_help" diff --git a/app/views/projects/issues/_title_body.html.haml b/app/views/projects/issues/_title_body.html.haml index 2aeb6e0f7..806f9c16a 100644 --- a/app/views/projects/issues/_title_body.html.haml +++ b/app/views/projects/issues/_title_body.html.haml @@ -1,6 +1,6 @@ #open-comment.comment.view - %h3.tmargin0{:style => 'margin-bottom: 0;'}= t 'activerecord.attributes.issue.title' - .wrapper= f.text_area :title, :cols => 80, :rows => 1, :style => 'height: 16px; margin: 0 0 10px;' + %h3.tmargin0= t 'activerecord.attributes.issue.title' + .wrapper= f.text_area :title, :cols => 80, :rows => 1 #open-comment.comment.view =link_to t('layout.comments.md_cheatsheet_header'), '#md_help', 'data-toggle' => 'modal', :style => 'float:right;' %h3.tmargin0= t 'activerecord.attributes.issue.body'