scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2102 from urbanrotnik/ur-sci-3929-missing-border

Browse source 
Fixed missing border, counter, buttons position [SCI-3929]
This commit is contained in:
Urban Rotnik 2019-09-30 14:34:02 +02:00 committed by GitHub
commit 248da9475f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@
.complete-button-container {
float: right;
width: 165px;
width: 260px;
.my_module-state-buttons {
padding-top: 0;
@ -239,11 +239,6 @@
}
}
#protocol-copy-to-repository {
border-left: 0;
border-radius: 0 5px 5px 0;
}
.my-module-recent-protocols {
flex-grow: 1;
margin-bottom: 5px;

1
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -420,6 +420,7 @@
padding: 1px 6px;
position: relative;
top: -10px;
left: 4px;
z-index: 1;
}
}

8
app/views/my_modules/protocols/_protocol_buttons.html.erb
View file

@ -32,11 +32,9 @@
<a href="#" class="btn btn-default disabled"><span class="fas fa-upload"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.export") %></span></a>
<% end %>
<% if can_read_protocol_in_module?(@protocol) && can_create_protocols_in_repository?(@protocol.team) %>
<span data-hook="protocol-copy-to-repository">
<%= link_to copy_to_repository_modal_protocol_path(@protocol, format: :json), id: "protocol-copy-to-repository", class: "btn btn-default", remote: true, data: { action: "copy-to-repository" } do %>
<span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
<% end %>
</span>
<a id="protocol-copy-to-repository" class="btn btn-default" data-action="copy-to-repository" data-hook="protocol-copy-to-repository" data-remote="true" href="<%= copy_to_repository_modal_protocol_path(@protocol, format: :json) %>">
<span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span>
</a>
<% else %>
<a href="#" class="btn btn-default disabled"><span class="fas fa-copy"></span><span class="hidden-xs-custom">&nbsp;<%= t("my_modules.protocols.buttons.copy_to_repository") %></span></a>
<% end %>