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

Merge pull request #1719 from mlorb/ml-sci-3399

Browse source 
Visual fixes for edit/add step on protocol [SCI-3399]
This commit is contained in:
mlorb 2019-05-06 10:33:28 +02:00 committed by GitHub
commit df16b54be0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/my_modules/protocols/index.scss
View file

@ -14,7 +14,7 @@
}
}
.my-modules-protocols-index {
.module-header {
padding-top: 15px !important;
.first-row {

3
app/assets/stylesheets/steps.scss
View file

@ -15,8 +15,6 @@
list-style: none;
li {
margin-bottom: 10px;
& > div > span.pull-left {
margin-top: 10px;
}
@ -388,4 +386,3 @@
margin-top: 20px;
width: 100%;
}

4
app/views/my_modules/protocols.html.erb
View file

@ -14,7 +14,9 @@
} %>
<div class="content-pane my-modules-protocols-index">
<%= render partial: "module_header" %>
<span class="module-header">
<%= render partial: "module_header" %>
</span>
<h2>
<%= t('Protocol') %>

2
app/views/steps/_edit.html.erb
View file

@ -1,9 +1,7 @@
<div class="well">
<%= bootstrap_form_for(@step, url: step_path(id: @step.id, format: :json), remote: true, authenticity_token: true, multipart: true, data: { role: "edit-step-form", type: :json }) do |f| %>
<h4><%= t("protocols.steps.edit.edit_step_title") %></h4>
<hr>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<hr>
<div class="align-right">
<a type="button" data-action="cancel-edit" class="btn btn-default" href="<%= step_path(id: @step, format: :json) %>" data-remote="true">
<%= t("general.cancel")%>

2
app/views/steps/_new.html.erb
View file

@ -1,9 +1,7 @@
<div class="well">
<%= bootstrap_form_for(@step, url: protocol_steps_path(@protocol, format: :json), authenticity_token: true, multipart: true, data: { role: "new-step-form", type: :json }) do |f| %>
<h4><%= t("protocols.steps.new.add_step_title") %></h4>
<hr>
<%= render partial: "empty_step.html.erb", locals: {step: @step, f: f} %>
<hr>
<div class="align-right">
<button type="button" data-action="cancel-new" class="btn btn-default">
<%= t("general.cancel")%>