Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refs #616] remove some inline styles

This commit is contained in:
Alexander Machehin 2012-09-21 18:10:47 +06:00
parent 651be997b3
commit 855f1f356d
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -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'

10
app/assets/stylesheets/design/custom.scss
View File

@ -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 {

2
app/views/projects/comments/_body.html.haml
View File

@ -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

2
app/views/projects/comments/_list.html.haml
View File

@ -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"

4
app/views/projects/issues/_title_body.html.haml
View File

@ -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'