scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix

Browse source 
Fonts size update [SCI-4650]
This commit is contained in:
Urban Rotnik 2020-05-19 14:55:22 +02:00 committed by GitHub
parent 7cbbcff86a ac4532eea3
commit 431bd0c53b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 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

@ -471,12 +471,17 @@
}
.dropdown-menu {
@include font-button;
min-width: 500px;
padding: 1em 2em;
.task-details-value {
@include font-h3;
}
.row-v-margin {
margin-bottom: .5em;
margin-top: .5em
margin-top: .5em;
}
}
}

20
app/views/my_modules/_module_header_details_popover.html.erb
View file

@ -3,30 +3,24 @@
<div class="col-xs-3">
<%= t('my_modules.module_header.details_popover.project_label') %>
</div>
<div class="col-xs-9">
<strong>
<div class="col-xs-9 task-details-value">
<%= @my_module.experiment.project.name.truncate(Constants::MAX_NAME_TRUNCATION) %>
</strong>
</div>
</div>
<div class="row row-v-margin">
<div class="col-xs-3">
<%= t('my_modules.module_header.details_popover.experiment_label') %>
</div>
<div class="col-xs-9">
<strong>
<div class="col-xs-9 task-details-value">
<%= @my_module.experiment.name.truncate(Constants::MAX_NAME_TRUNCATION) %>
</strong>
</div>
</div>
<div class="row row-v-margin">
<div class="col-xs-3">
<%= t('my_modules.module_header.details_popover.creator_label') %>
</div>
<div class="col-xs-9">
<strong>
<div class="col-xs-9 task-details-value">
<%= @my_module.created_by&.full_name&.truncate(Constants::MAX_NAME_TRUNCATION) %>
</strong>
<%= t('my_modules.module_header.details_popover.creator_same_user_label') if current_user == @my_module.created_by %>
</div>
</div>
@ -34,18 +28,15 @@
<div class="col-xs-3">
<%= t('my_modules.module_header.details_popover.created_label') %>
</div>
<div class="col-xs-9">
<strong>
<div class="col-xs-9 task-details-value">
<%= l(@my_module.created_at, format: :full_date) %>
</strong>
</div>
</div>
<div class="row row-v-margin">
<div class="col-xs-3">
<%= t('my_modules.module_header.details_popover.modified_label') %>
</div>
<div class="col-xs-9">
<strong>
<div class="col-xs-9 task-details-value">
<% if @my_module.last_modified_by.present? %>
<%= t('my_modules.module_header.details_popover.modified_value',
date: l(@my_module.updated_at, format: :full_date),
@ -54,7 +45,6 @@
<%= t('my_modules.module_header.details_popover.modified_value_without_user',
date: l(@my_module.updated_at, format: :full_date)) %>
<% end %>
</strong>
</div>
</div>
</div>