scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-09 06:35:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #305 from mlorb/ml_sci_692

Browse source 
Fix empty space and blockquote padding - rich text editing [SCI-692]
This commit is contained in:
mlorb 2016-11-21 14:38:33 +01:00 • committed by GitHub
commit f4aa75b4d2
3 changed files with 85 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/stylesheets/themes/scinote.scss
View file

@ -482,6 +482,17 @@ a[data-toggle="tooltip"] {
overflow: hidden
}
.panel-body {
.ql-editor {
padding: 0;
white-space: normal;
blockquote {
padding: 10px 20px;
}
}
}
.navbar-secondary {
background: $color-concrete !important;
margin-left: -280px;

6
app/views/steps/_step.html.erb
View file

@ -32,6 +32,7 @@
<div class="panel-collapse collapse" id="step-panel-<%= step.id %>" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-xs-12">
<% if strip_tags(step.description).blank? %>
<em><%= t("protocols.steps.no_description") %></em>
<% else %>
@ -39,8 +40,10 @@
<%= step.description.html_safe %>
</div>
<% end %>
<hr>
</div>
</div>
<div class="row">
<hr>
<% unless step.tables.blank? then %>
<div class="col-xs-12">
<strong><%= t("protocols.steps.tables") %></strong>
@ -105,7 +108,6 @@
<% end %>
</div>
<% end %>
</div>
<% if @protocol.in_module? %>
<% if !step.completed? and can_complete_step_in_protocol(@protocol) %>