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

Merge pull request #2342 from aignatov-bio/ai-sci-4269-fix-small-scss-issue-with-new-branding

Browse source 
Fix small css issues [SCI-4269]
This commit is contained in:
Miha Mencin 2020-01-21 09:22:56 +01:00 committed by GitHub
commit 96ed19ab22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/assets/javascripts/protocols/steps.js.erb
View file

@ -198,8 +198,8 @@
var collapseIcon = $(this).find(".collapse-step-icon");
var collapsed = $(this).hasClass("collapsed");
// Toggle collapse button
collapseIcon.toggleClass("fa-caret-square-up", !collapsed);
collapseIcon.toggleClass("fa-caret-square-down", collapsed);
collapseIcon.toggleClass("fa-chevron-up", !collapsed);
collapseIcon.toggleClass("fa-chevron-down", collapsed);
});
}
@ -645,16 +645,16 @@
renderTable($(this));
});
$(document).find("span.collapse-step-icon").each(function() {
$(this).addClass("fa-caret-square-up");
$(this).removeClass("fa-caret-square-down");
$(this).addClass("fa-chevron-up");
$(this).removeClass("fa-chevron-down");
});
}
function expandStep(step) {
$('.panel-collapse', step).collapse('show');
$(step).find("span.collapse-step-icon")
.addClass("fa-caret-square-up")
.removeClass("fa-caret-square-down");
.addClass("fa-chevron-up")
.removeClass("fa-chevron-down");
$(step).find("div.step-result-hot-table").each(function() {
renderTable($(this));
});
@ -703,8 +703,8 @@
$("[data-action='collapse-steps']").click(function () {
$('.step .panel-collapse').collapse('hide');
$(document).find("span.collapse-step-icon").each(function() {
$(this).addClass("fa-caret-square-down");
$(this).removeClass("fa-caret-square-up");
$(this).addClass("fa-chevron-down");
$(this).removeClass("fa-chevron-up");
});
});
$("[data-action='expand-steps']").click(expandAllSteps);

2
app/assets/stylesheets/shared_styles/constants/fonts.scss
View file

@ -11,7 +11,7 @@ $font-size-h2: 18px;
$font-size-h3: $font-size-base;
$font-size-h4: $font-size-base;
$font-size-h5: $font-size-base;
$font-size-h6: $font-size-base;
$font-size-h6: 12px;
$font-fas-check: "\f00c";
$font-fas-exclamation-triangle: "\f071";

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

@ -71,7 +71,6 @@
.step-name-link {
display: flex;
flex-shrink: 1;
line-height: 100%;
overflow: hidden;
.name-block {

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

@ -347,6 +347,7 @@ a[data-toggle="tooltip"] {
&.active {
@include box-shadow(0 4px 0 $brand-primary);
line-height: 24px;
margin-bottom: 4px;
& > a,

4
app/views/global_activities/_top_pane.html.erb
View file

@ -1,6 +1,6 @@
<h4 class="ga-title">
<h2 class="ga-title">
<%= t('activities.index.global_activities_title') %>
</h4>
</h2>
<div class="ga-actions">
<div class="sci-btn-group">
<a id="global-activities-expand-all" class="hide-actions btn btn-light" href="#" data-turbolinks="false">

4
app/views/shared/_secondary_navigation.html.erb
View file

@ -145,7 +145,7 @@
</ul>
<!-- Secondary navigation title -->
<h4 class="nav-name <%= @inline_editable_title_config.present? ? 'editable' : '' %>">
<h2 class="nav-name <%= @inline_editable_title_config.present? ? 'editable' : '' %>">
<% if @inline_editable_title_config.present? %>
<%= render partial: "shared/inline_editing",
locals: {
@ -155,7 +155,7 @@
<% else %>
<%= title_element.name %>
<% end %>
</h4>
</h2>
</div>
</div>