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

Merge pull request #1538 from biosistemika/revert-1522-ai-sci-3058-task-info-section-improvments

Browse source 
Revert "Task info section improvements [SCI - 3058]"
This commit is contained in:
Miha Mencin 2019-02-27 21:51:53 +01:00 committed by GitHub
commit e0ef3781a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/application.scss
View file

@ -20,4 +20,3 @@
@import "ajax-bootstrap-select.min";
@import "extend/bootstrap";
@import "themes/scinote";
@import "my_modules/protocols/*"

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

@ -1,44 +0,0 @@
@import "constants";
@import "mixins";
.my-modules-protocols-index {
padding-top: 15px !important;
.first-row {
max-height: 40px;
.date-block {
max-width: 250px;
}
div {
height: 45px;
}
.complete-button-container {
float: right;
max-width: 165px;
.my_module-state-buttons {
padding-top: 0;
}
}
}
.well {
border: 0;
box-shadow: none;
padding-left: 0;
padding-right: 0;
}
.badge-icon {
background: transparent;
color: $color-silver;
padding-right: 5px;
+ .well-sm {
margin-left: 32px;
}
}
}

15
app/views/my_modules/_module_header.html.erb
View file

@ -1,5 +1,5 @@
<div class="row first-row">
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4 date-block">
<div class="row">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="badge-icon">
<span class="fas fa-calendar-alt"></span>
</div>
@ -9,7 +9,7 @@
</div>
</div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-4 help_tooltips date-block"
<div class="col-xs-6 col-sm-6 col-md-4 help_tooltips"
data-tooltiplink="<%= I18n.t('tooltips.link.task.due_date_specific') %>"
data-tooltipcontent="<%= I18n.t('tooltips.text.task.due_date_specific') %>">
<div class="badge-icon">
@ -39,13 +39,9 @@
</div>
</div>
<div class="col-xs-6 col-sm-6 col-md-3 complete-button-container">
<%= render partial: "my_modules/state_buttons.html.erb" %>
</div>
<div class="col-xs-6 col-sm-6 col-md-4 col-lg-3">
<div class="col-xs-6 col-sm-6 col-md-4">
<div class="badge-icon">
<span class="fas fa-tachometer-alt"></span>
<span class="fas fa-check"></span>
</div>
<div class="well well-sm">
<span class="task-state-label">
@ -54,7 +50,6 @@
</span>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12" id="module-tags" data-module-tags-url="<%= my_module_my_module_tags_url(@my_module, format: :json) %>">

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

@ -4,7 +4,7 @@
<%= render partial: "shared/sidebar", locals: { current_task: @my_module, page: 'task' } %>
<%= render partial: "shared/secondary_navigation" %>
<div class="content-pane my-modules-protocols-index">
<div class="content-pane">
<%= render partial: "module_header" %>
<div>
@ -12,6 +12,7 @@
<%= render partial: "my_modules/protocols/protocol_status_bar.html.erb" %>
</div>
<%= render partial: "my_modules/protocols/protocol_buttons.html.erb" %>
<%= render partial: "my_modules/state_buttons.html.erb" %>
</div>
<div data-role="steps-container">