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

Some gui fixes (#1757)

Browse source
This commit is contained in:
aignatov-bio 2019-05-14 09:43:02 +02:00 • committed by GitHub
parent e544edeaf7
commit f970eea525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 60 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
.well {
border: 0;
box-shadow: none;
font-size: 14px;
padding-left: 0;
padding-right: 0;
}
@ -30,7 +31,7 @@
padding-right: 5px;
+ .well-sm {
margin-bottom: 10px;
margin-bottom: 5px;
margin-left: 0;
}
}
@ -79,7 +80,7 @@
.title {
font-size: 22px;
font-weight: bold;
padding: 10px 0 5px;
padding: 20px 0 5px;
}
.my-module-description-content {
@ -100,14 +101,15 @@
display: inline-block;
line-height: 32px;
padding: 0 5px 0 0;
width: 38px;
width: 28px;
}
.tags-title {
display: inline-block;
font-size: 14px;
line-height: 32px;
padding-right: 3px;
width: 35px;
width: 37px;
}
.select-container {
@ -115,7 +117,7 @@
flex-basis: 100px;
flex-grow: 1;
flex-shrink: 1;
max-width: calc(100% - 73px);
max-width: calc(100% - 65px);
position: relative;
select {

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

@ -93,7 +93,7 @@
overflow: hidden;
strong {
font-size: 14px;
font-size: 16px;
white-space: nowrap;
}
}
@ -103,10 +103,11 @@
}
.author-block {
display: inline-block;
font-size: 16px;
overflow: hidden;
padding-right: 10px;
margin-right: 20px;
white-space: nowrap;
width: 300px;
}
}
}

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

@ -915,12 +915,43 @@ ul.content-activities {
border-radius: 0;
}
.panel-protocol-status {
display: inline-block;
margin-bottom: 5px;
.protocol-status-container {
align-items: center;
display: flex;
flex-wrap: wrap;
& > .panel-body {
padding: 5px 5px 5px 15px;
.protocol-button {
margin-bottom: 5px;
}
.protocol-status-bar {
display: flex;
height: 33px;
margin-bottom: 5px;
margin-right: 15px;
}
.panel-protocol-status {
border-color: $color-silver;
box-shadow: none;
display: inline-block;
height: 33px;
& > .panel-body {
padding: 0 0 0 15px;
}
.link-button {
border-radius: 0;
}
.link-button,
.link-toggle {
height: 33px;
position: relative;
right: -1px;
top: -1px;
}
}
}

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

@ -22,8 +22,8 @@
<%= t('Protocol') %>
</div>
<div>
<div data-role="protocol-status-bar" style="display: inline;">
<div class="protocol-status-container">
<div class="protocol-status-bar" data-role="protocol-status-bar">
<%= render partial: "my_modules/protocols/protocol_status_bar.html.erb" %>
</div>
<%= render partial: "my_modules/protocols/protocol_buttons.html.erb" %>

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

@ -1,4 +1,4 @@
<div class="btn-group" role="group" aria-label="" style="margin-left: 15px;">
<div class="btn-group protocol-button" role="group" aria-label="">
<div class="btn-group">
<a class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" href="#">
<span class="fas fa-download"></span>

20
app/views/my_modules/protocols/_protocol_status_bar_buttons.html.erb
View file

@ -1,21 +1,21 @@
<div class="btn-group">
<% if @protocol.unlinked? %>
<a type="button" class="btn btn-info" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.text") %>">
<a type="button" class="btn btn-info link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_unlinked.text") %>">
<span class="fas fa-book"></span>
&nbsp;
<span class="fas fa-times-sign"></span>
</a>
<a type="button" class="btn btn-info dropdown-toggle" disabled="disabled">
<a type="button" class="btn btn-info dropdown-toggle link-toggle" disabled="disabled">
<span class="caret"></span>
</a>
<% else %>
<% if @protocol.linked_no_diff? %>
<a type="button" class="btn btn-info" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.text") %>">
<a type="button" class="btn btn-info link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_linked_no_diff.text") %>">
<span class="fas fa-book"></span>
&nbsp;
<span class="fas fa-check-circle"></span>
</a>
<a type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a type="button" class="btn btn-info dropdown-toggle link-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
@ -31,12 +31,12 @@
<% end %>
</ul>
<% elsif @protocol.newer_than_parent? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<a type="button" class="btn btn-warning link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_newer_than_parent.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="fas fa-book"></span>
&nbsp;
<span class="fas fa-arrow-circle-up"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a type="button" class="btn btn-warning dropdown-toggle link-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
@ -72,12 +72,12 @@
<% end %>
</ul>
<% elsif @protocol.parent_newer? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<a type="button" class="btn btn-warning link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="fas fa-book"></span>
&nbsp;
<span class="fas fa-arrow-circle-up"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a type="button" class="btn btn-warning dropdown-toggle link-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
@ -103,12 +103,12 @@
<% end %>
</ul>
<% elsif @protocol.parent_and_self_newer? %>
<a type="button" class="btn btn-warning" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<a type="button" class="btn btn-warning link-button" tabindex="0" role="button" data-trigger="focus" data-container="body" data-html="true" data-toggle="popover" data-placement="bottom" title="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.title") %>" data-content="<%= t("my_modules.protocols.protocol_status_bar.btns_parent_and_self_newer.text", self_ts: l(@protocol.updated_at, format: :full), parent_ts: l(@protocol.parent.updated_at, format: :full)).html_safe %>">
<span class="fas fa-book"></span>
&nbsp;
<span class="fas fa-exclamation-circle"></span>
</a>
<a type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a type="button" class="btn btn-warning dropdown-toggle link-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">