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 #6041 from ivanscinote/SCI-9007-update-colors

Browse source 
Fix 'Not started' status button at missing locations [SCI-9007]
This commit is contained in:
artoscinote 2023-08-22 15:19:05 +02:00 committed by GitHub
parent c8bc4bef01 28adb4956d
commit f60243e424
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/experiments/table.js
View file

@ -43,7 +43,8 @@ var ExperimnetTable = {
return `<a href="${data.url}">${data.count}</a>`;
},
status: function(data) {
return `<div class="my-module-status" style="background-color: ${data.color}">${data.name}</div>`;
return `<div class="my-module-status ${data.name === 'Not started' ? 'btn-not-started' : ''}"
style="background-color: ${data.color}">${data.name}</div>`;
},
assigned: function(data) {
return data.html;

4
app/assets/stylesheets/dashboard/current_tasks.scss
View file

@ -211,6 +211,10 @@
color: $color-white;
font-weight: bold;
padding: .25em .5em;
&.btn-not-started {
@include not-started;
}
}
}

4
app/assets/stylesheets/experiment/canvas.scss
View file

@ -35,6 +35,10 @@
padding: 2px 8px;
text-overflow: ellipsis;
white-space: nowrap;
&.btn-not-started {
@include not-started;
}
}
}

4
app/assets/stylesheets/experiment/table.scss
View file

@ -359,6 +359,10 @@
padding: 2px 8px;
text-overflow: ellipsis;
white-space: nowrap;
&.btn-not-started {
@include not-started;
}
}
.table-row-placeholder-divider {

4
app/assets/stylesheets/mixins.scss
View file

@ -77,6 +77,10 @@
width: .5em;
}
@mixin not-started {
border: 1px solid var(--sn-sleepy-grey);
color: var(--sn-black);
}
// Material design mixins

9
app/assets/stylesheets/my_modules/status_flow.scss
View file

@ -13,8 +13,7 @@
width: 100%;
&.btn-not-started {
border: 1px solid var(--sn-sleepy-grey);
color: var(--sn-black);
@include not-started;
}
.caret {
@ -74,8 +73,7 @@
}
.btn-not-started {
border: 1px solid var(--sn-sleepy-grey);
color: var(--sn-black);
@include not-started;
}
.error-message {
@ -139,8 +137,7 @@
white-space: nowrap;
&.btn-not-started {
border: 1px solid var(--sn-sleepy-grey);
color: var(--sn-black);
@include not-started;
}
}

13
app/views/canvas/full_zoom/_my_module.html.erb
View file

@ -65,12 +65,13 @@
</div>
</div>
<div class="status-label" style="--state-color: <%= my_module.my_module_status.color %>">
<% if my_module.status_changing %>
<i class="fas fa-spinner fa-spin"></i>
<span><%= t('experiments.canvas.full_zoom.status_transitioning_label') %></span>
<% end %>
<%= my_module.my_module_status.name %>
<div class="status-label <%= 'btn-not-started' if my_module.my_module_status.name == 'Not started' %>"
style="--state-color: <%= my_module.my_module_status.color %>">
<% if my_module.status_changing %>
<i class="fas fa-spinner fa-spin"></i>
<span><%= t('experiments.canvas.full_zoom.status_transitioning_label') %></span>
<% end %>
<%= my_module.my_module_status.name %>
</div>
</div>

5
app/views/dashboards/current_tasks/_task.html.erb
View file

@ -16,6 +16,9 @@
<% end %>
</div>
<div class="task-status-container row-border">
<span class="task-status" style="background:<%= task.status_color %>"><%= task.status_name %></span>
<span class="task-status <%= 'btn-not-started' if task.status_name == 'Not started' %>"
style="background:<%= task.status_color %>">
<%= task.status_name %>
</span>
</div>
</a>