Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style updates for agreement spacing and facet color contrast #1017

Merged
merged 5 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions app/assets/stylesheets/unc_custom.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,21 @@ div.unc-modal {
}
}

.facet-limit-active {
.card-header {
button {
color: white;
}
}
.facet-label .remove {
margin: 0;
}

.facet-values li .selected {
color: black !important;
}
}

/* Fixes https://github.com/samvera/hyrax/blob/f14958e665535be2696dc1cdf9e205d6fc54e668/app/assets/stylesheets/hyrax/_card.scss#L5
Resets it to the default Bootstrap card margins
*/
Expand Down Expand Up @@ -1013,6 +1028,31 @@ Hide it entirely until the issue is resolved upstreeam
font-weight: bold;
}

#form-progress {
.card-footer {
padding: 5px;
text-align: center;

.checkbox {
label {
margin-bottom: 0;
}
}

label {
width: 100%;
}

#agreement {
margin-right: 5px;
}

a {
font-weight: bold;
}
}
}


/* Responsive Hyrax override */
@media only screen and (min-width: 768px) {
Expand Down
6 changes: 4 additions & 2 deletions app/views/hyrax/base/_form_progress.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%# [hyc-override] https://github.com/samvera/hyrax/tree/hyrax-v4.0.0/app/views/hyrax/base/_form_progress.html.erb %>
<%# [hyc-override] Overriding partial from gem to switch ordering of form completion requirements %>
<%# [hyc-override] Switch ordering of form completion requirements. Change agreement checkbox %>
<aside id="form-progress" class="form-progress card">
<div class="card-header">
<h3 class="card-title"><%= t("hyrax.works.progress.header") %></h3>
Expand All @@ -9,7 +9,7 @@
<fieldset>
<legend class="legend-save-work"><%= t('.requirements') %></legend>
<ul class="requirements">
<%# [hyc-override] Overriding partial. Make file completion first in the list %>
<%# [hyc-override] Make file completion first in the list %>
<% if Hyrax.config.work_requires_files? %>
<li class="incomplete" id="required-files"><%= t('.required_files') %></li>
<% end %>
Expand Down Expand Up @@ -39,6 +39,7 @@
<% if ::Flipflop.active_deposit_agreement_acceptance? %>
<% if !current_user.admin? || (current_user.admin? && params[:action] == 'new') %>
<label>
<%# [hyc-override] Changing agreement button to submit the onyen of the depositor %>
<%= f.input :agreement,
as: :boolean,
label: t('hyrax.active_consent_to_agreement'),
Expand All @@ -52,6 +53,7 @@
</label>
<% else %>
<label class="d-none">
<%# [hyc-override] Changing agreement button to submit the onyen of the depositor %>
<%= f.input :agreement,
as: :boolean,
checked: f.object.agreement_accepted,
Expand Down