Skip to content

Commit

Permalink
Merge pull request #328 from DigitalCurationCentre/issue_272
Browse files Browse the repository at this point in the history
Guidances new/edit with table formatting displayed properly. DMPRoadm…
  • Loading branch information
vyruss committed May 19, 2017
2 parents ac88afc + f211b02 commit 5e20286
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 2 additions & 1 deletion app/views/guidances/admin_edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@
<table class="dmp_details_table guidance_table">
<tr>
<td class="first"><%= _('Text') %></td>
<td><div class="div_left_icon_g">
<td class="tinymce">
<div class="div_left_icon_g">
<%= text_area_tag("guidance-text", @guidance.text, class: "tinymce") %>
</div>
<div class="div_right_icon_g">
Expand Down
3 changes: 2 additions & 1 deletion app/views/guidances/admin_new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<table class="dmp_details_table guidance_table">
<tr>
<td class="first"><%= _('Text') %></td>
<td><div class="div_left_icon_g">
<td class="tinymce">
<div class="div_left_icon_g">
<%= text_area_tag("guidance-text", "", class: "tinymce") %>
</div>
<div class="div_right_icon_g">
Expand Down
4 changes: 4 additions & 0 deletions lib/assets/stylesheets/admin.css.less
Original file line number Diff line number Diff line change
Expand Up @@ -1185,6 +1185,10 @@ table.dmp_details_table tr td.first{
width: 250px;
}

table.dmp_details_table tr td.tinymce{
min-width: 370px;
}

table.dmp_details_table .text_area{
width: 90%;
}
Expand Down

0 comments on commit 5e20286

Please sign in to comment.