scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-18 09:47:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6261 from G-Chubinidze/gc_SCI_9269

Browse source 
CSS: Results revamp issues [SCI-9269]
This commit is contained in:
Martin Artnik 2023-09-21 10:00:14 +02:00 • committed by GitHub
commit 810e0ffaff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/shared_styles/elements/dropdown.scss
View file

@ -127,4 +127,14 @@
color: $color-white; color: $color-white;
} }
} }
.h-34 {
height: 34px;
}
.dropdown-switch-link {
display: flex;
align-items: center;
}
} }

10
app/javascript/vue/results/results_toolbar.vue
View file

@ -6,6 +6,8 @@
{{ i18n.t('my_modules.results.add_label') }} {{ i18n.t('my_modules.results.add_label') }}
</button> </button>
</div> </div>
<div class="dropdown view-switch" > <div class="dropdown view-switch" >
<div class="btn btn-secondary view-switch-button prevent-shrink" id="viewSwitchButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <div class="btn btn-secondary view-switch-button prevent-shrink" id="viewSwitchButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span v-if="archived" class="state-view-switch-btn-name">{{ i18n.t('my_modules.results.archived_results') }}</span> <span v-if="archived" class="state-view-switch-btn-name">{{ i18n.t('my_modules.results.archived_results') }}</span>
@ -13,13 +15,13 @@
<span class="sn-icon sn-icon-down"></span> <span class="sn-icon sn-icon-down"></span>
</div> </div>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="viewSwitchButton"> <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="viewSwitchButton">
<li class="view-switch-active"> <li class="view-switch-active h-34">
<a :href="active_url" :class="{'form-dropdown-state-item prevent-shrink': !archived}"> <a class="h-34 dropdown-switch-link" :href="active_url" :class="{'form-dropdown-state-item prevent-shrink': !archived}">
{{ i18n.t('my_modules.results.active_results') }} {{ i18n.t('my_modules.results.active_results') }}
</a> </a>
</li> </li>
<li class="view-switch-archived"> <li class="view-switch-archived h-34">
<a :href="archived_url" :class="{'form-dropdown-state-item prevent-shrink': archived}"> <a class="h-34 dropdown-switch-link" :href="archived_url" :class="{'form-dropdown-state-item prevent-shrink': archived}">
{{ i18n.t('my_modules.results.archived_results') }} {{ i18n.t('my_modules.results.archived_results') }}
</a> </a>
</li> </li>

8
app/javascript/vue/shared/content/modal/move.vue
View file

@ -19,9 +19,7 @@
:options="targetOptions" :options="targetOptions"
:isLoading="false" :isLoading="false"
:placeholder=" :placeholder="
i18n.t( i18n.t(`protocols.steps.modals.move_element.${parent_type}.search_placeholder`)
'my_modules.results.move_modal.search_placeholder'
)
" "
:no-options-placeholder=" :no-options-placeholder="
i18n.t( i18n.t(
@ -29,9 +27,7 @@
) )
" "
:searchPlaceholder=" :searchPlaceholder="
i18n.t( i18n.t(`protocols.steps.modals.move_element.${parent_type}.search_placeholder`)
'my_modules.results.move_modal.search_placeholder'
)
" "
/> />
</div> </div>

2
app/javascript/vue/shared/reorderable_items_modal.vue
View file

@ -20,7 +20,7 @@
<div class="step-element-grip step-element-grip--draggable"> <div class="step-element-grip step-element-grip--draggable">
<i class="sn-icon sn-icon-drag"></i> <i class="sn-icon sn-icon-drag"></i>
</div> </div>
<div class="step-element-name"> <div class="step-element-name text-center">
<strong v-if="includeNumbers" class="step-element-number">{{ index + 1 }}</strong> <strong v-if="includeNumbers" class="step-element-number">{{ index + 1 }}</strong>
<i v-if="item.attributes.icon" class="fas" :class="item.attributes.icon"></i> <i v-if="item.attributes.icon" class="fas" :class="item.attributes.icon"></i>
<span :title="nameWithFallbacks(item)" v-if="nameWithFallbacks(item)">{{ nameWithFallbacks(item) }}</span> <span :title="nameWithFallbacks(item)" v-if="nameWithFallbacks(item)">{{ nameWithFallbacks(item) }}</span>

2
app/views/my_modules/status_flow/_task_flow_button.html.erb
View file

@ -49,7 +49,7 @@
<i class="fas fa-long-arrow-alt-right"></i> <i class="fas fa-long-arrow-alt-right"></i>
<div class="status-container"> <div class="status-container">
<div class="status-name <%= 'status-light' if previous_s.light_color? %>" <div class="status-name <%= 'status-light' if previous_s.light_color? %>"
style="<%= "background-color: #{previous_s.color}" %>"><%= previous_s.name %></div> style="<%= "background-color: #{previous_s.color};" %> <%= "color: black !important;" if previous_s.color == "#FFFFFF" %>"><%= previous_s.name %></div>
</div> </div>
</li> </li>
<span class="error-message"><% previous_s_errors.each do |error| %> <span class="error-message"><% previous_s_errors.each do |error| %>

2
config/locales/en.yml
View file

@ -3190,10 +3190,12 @@ en:
step: step:
title: Move to different step title: Move to different step
targets_label: Select step targets_label: Select step
search_placeholder: "Enter step name"
result: result:
title: Move to different result title: Move to different result
targets_label: Select result targets_label: Select result
untitled_result: Untitled result untitled_result: Untitled result
search_placeholder: "Enter result name"
delete_step: delete_step:
title: 'Delete step' title: 'Delete step'
description_1: 'You’re about to delete a whole step from your protocol. It might contain data you don’t want to lose. You won’t be able to get it back.' description_1: 'You’re about to delete a whole step from your protocol. It might contain data you don’t want to lose. You won’t be able to get it back.'