scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5706 from wandji20/wb-SCI-8559

Browse source 
Fix CSS Issues[SCI-8559]
This commit is contained in:
artoscinote 2023-08-21 11:05:38 +02:00 committed by GitHub
parent 22bf9eaced b4657e534a
commit de61c37a4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/dashboard/show.scss
View file

@ -90,7 +90,7 @@
} }
} }
@media (max-width: 1100px) { @media (max-width: 1240px) {
.dashboard-container { .dashboard-container {
--dashboard-widgets-gap: 15px; --dashboard-widgets-gap: 15px;
grid-template-columns: 100%; grid-template-columns: 100%;

2
app/assets/stylesheets/label_templates/index.scss
View file

@ -60,7 +60,7 @@
.label-templates-datatable { .label-templates-datatable {
--content-header-size: 3.5rem; --content-header-size: 3.5rem;
height: calc(100vh - var(--navbar-height) - var(--content-header-size)); height: calc(100vh - var(--top-navigation-height) - var(--breadcrumbs-navigation-height) - var(--content-header-size));
#label-templates-table_wrapper { #label-templates-table_wrapper {
display: flex; display: flex;

6
app/assets/stylesheets/partials/_inline_editing.scss
View file

@ -114,4 +114,10 @@
} }
} }
} }
@-moz-document url-prefix() {
input {
padding: 0 4px;
}
}
} }

11
app/assets/stylesheets/settings/teams.scss
View file

@ -94,16 +94,7 @@
} }
.button-container { .button-container {
position: absolute; top: -32px;
right: 0;
top: -20px;
.inline-field-button {
color: $color-silver-chalice;
cursor: pointer;
line-height: 20px;
padding-left: 20px;
}
} }
&:hover .input-field, &:hover .input-field,

2
app/views/experiments/_clone_modal.html.erb
View file

@ -17,7 +17,7 @@
end end
end, end,
@experiment.project.id ), @experiment.project.id ),
{}, {class: "form-control selectpicker", "data-role" => "clear"} %> {}, {"data-role" => "clear"} %>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button> <button type="button" class="btn btn-secondary" data-dismiss="modal"><%=t "general.cancel" %></button>

7
app/views/users/settings/teams/show.html.erb
View file

@ -65,7 +65,7 @@
</span> </span>
</div> </div>
<div class="team-description"> <div class="team-description inline-editing-container">
<% if can_manage_team?(@team) %> <% if can_manage_team?(@team) %>
<div <div
class="inline-init-handler" class="inline-init-handler"
@ -77,8 +77,9 @@
<div class="view-mode" data-placeholder="<%= t("users.settings.teams.show.enter_description") %>"><%= @team.description %></div> <div class="view-mode" data-placeholder="<%= t("users.settings.teams.show.enter_description") %>"><%= @team.description %></div>
<textarea placeholder="<%= t("users.settings.teams.show.enter_description") %>" class="hidden input-field smart-text-area" type="text" value="<%= @team.description %>" disabled><%= @team.description %></textarea> <textarea placeholder="<%= t("users.settings.teams.show.enter_description") %>" class="hidden input-field smart-text-area" type="text" value="<%= @team.description %>" disabled><%= @team.description %></textarea>
<div class="button-container"> <div class="button-container">
<span class="cancel-button inline-field-button"><%= t('general.cancel') %></span> <span class="cancel-button inline-field-button"><i class="sn-icon sn-icon-close"></i></span>
<span class="save-button inline-field-button"><%= t('general.save') %></span> <span class="save-button inline-field-button"><i class="sn-icon sn-icon-check"></i></span>
</div> </div>
</div> </div>
<% else %> <% else %>

5
vendor/assets/stylesheets/handsontable.full.sass.scss vendored
View file

@ -29,6 +29,7 @@
/** /**
* Fix for bootstrap styles * Fix for bootstrap styles
*/ */
// scss-lint:disable ImportantRule
.handsontable .table th, .handsontable .table td { .handsontable .table th, .handsontable .table td {
border-top: none; border-top: none;
} }
@ -509,6 +510,10 @@
top: 0; top: 0;
left: 0; left: 0;
z-index: 104; z-index: 104;
*:focus {
outline: none !important;
}
} }
.htSelectEditor { .htSelectEditor {