Fix CSS for protocol versioning modal [SCI-8194] (#5197)

This commit is contained in:
ajugo 2023-03-27 13:28:00 +02:00 committed by GitHub
parent b9b785c122
commit 26879f200d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 84 additions and 71 deletions

View file

@ -209,15 +209,40 @@
flex-wrap: wrap; flex-wrap: wrap;
padding: 1em 0; padding: 1em 0;
.protocol-version-metadata {
display: flex;
flex-wrap: nowrap;
width: 100%;
.protocol-link {
@include font-button;
flex-shrink: 0;
}
.protocol-actions { .protocol-actions {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
min-height: 36px; min-height: 36px;
} }
.edit-buttons {
margin-top: .25em;
.btn {
margin-left: .5em;
}
}
.protocol-metadata {
@include font-small;
margin-left: 16px;
}
}
&:not(:hover) { &:not(:hover) {
.save-as-draft { .save-as-draft {
display: none; opacity: 0;
pointer-events: none;
} }
} }
@ -250,16 +275,6 @@
width: 100%; width: 100%;
} }
.edit-buttons {
display: flex;
justify-content: end;
margin-top: .25em;
.btn {
margin-left: .5em;
}
}
.protocol-comment-container { .protocol-comment-container {
&[data-edit-mode="0"] { &[data-edit-mode="0"] {
.edit-buttons { .edit-buttons {
@ -268,12 +283,6 @@
} }
} }
} }
.protocol-metadata {
@include font-small;
margin-left: 16px;
max-width: 220px;
}
} }
.protocol-version-link { .protocol-version-link {

View file

@ -11,6 +11,7 @@
<% if @protocol.initial_draft? || @protocol.draft.present? %> <% if @protocol.initial_draft? || @protocol.draft.present? %>
<% draft = @protocol.initial_draft? ? @protocol : @protocol.draft %> <% draft = @protocol.initial_draft? ? @protocol : @protocol.draft %>
<div class="protocol-version-row"> <div class="protocol-version-row">
<div class="protocol-version-metadata">
<div class="protocol-link"> <div class="protocol-link">
<%= link_to protocol_path(draft) do %> <%= link_to protocol_path(draft) do %>
<% if draft.previous_version %> <% if draft.previous_version %>
@ -43,6 +44,7 @@
</div> </div>
<% end %> <% end %>
</div> </div>
</div>
<div class="protocol-version-comment"> <div class="protocol-version-comment">
<% if can_manage_protocol_draft_in_repository?(draft) %> <% if can_manage_protocol_draft_in_repository?(draft) %>
<div <div
@ -71,6 +73,7 @@
<% end %> <% end %>
<% @published_versions.each do |protocol_version| %> <% @published_versions.each do |protocol_version| %>
<div class="protocol-version-row"> <div class="protocol-version-row">
<div class="protocol-version-metadata">
<div class="protocol-link"> <div class="protocol-link">
<%= link_to protocol_path(protocol_version) do %> <%= link_to protocol_path(protocol_version) do %>
<b><%= t('protocols.index.versions.revision', version: protocol_version.version_number) %></b> <b><%= t('protocols.index.versions.revision', version: protocol_version.version_number) %></b>
@ -95,6 +98,7 @@
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div>
<div class="protocol-version-comment"> <div class="protocol-version-comment">
<%= protocol_version.version_comment %> <%= protocol_version.version_comment %>
</div> </div>

View file

@ -2671,7 +2671,7 @@ en:
publish_modal: publish_modal:
title: "Publish version %{version} of the protocol template" title: "Publish version %{version} of the protocol template"
name: "Protocol template name" name: "Protocol template name"
comment: "Revision comment" comment: "Revision notes"
comment_placeholder: "What's new in this version?" comment_placeholder: "What's new in this version?"
publish: "Publish" publish: "Publish"
new_protocol_modal: new_protocol_modal: