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.

Sign up for GitHub

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

CONCD-924 still more fixes (for spacing, etc) #2563

Merged
merged 1 commit into from
Oct 10, 2024
Merged

CONCD-924 still more fixes (for spacing, etc) #2563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 26 additions & 10 deletions concordia/static/scss/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ $alert-padding-x: 1rem;
$bg-completed: $dark;
$bg-submitted: $primary;
/* stylelint-disable-next-line scss/no-global-function-names */
$bg-in-progress: tint-color($primary, 30%);
$bg-in-progress: tint-color($primary, 28%);
$bg-not-started: #fff;

// shadow
Expand Down Expand Up @@ -187,14 +187,17 @@ body .container,
padding-right: 15px;
}

.row {
div.row {
margin-left: -15px;
margin-right: -15px;
}

body .row > * {
padding-left: 0;
padding-right: 0;
small {
font-weight: 400;
}

header.border-bottom {
border-bottom: 1px solid $border-color !important;
}

.close {
Expand Down Expand Up @@ -249,6 +252,10 @@ body h5 {
font-weight: $headings-font-weight;
}

div h6 {
font-weight: $headings-font-weight;
}

li a {
text-decoration: none;
}
Expand Down Expand Up @@ -288,6 +295,10 @@ body .btn {
font-weight: $btn-font-weight;
}

.btn-block {
width: 100%;
}

.input-group-sm > .input-group-prepend > .input-group-text {
font-size: 0.875rem;
}
Expand Down Expand Up @@ -650,6 +661,10 @@ a.card-title.text-dark {
overflow: hidden;
}

li.breadcrumb-item.active {
color: $gray-800;
}

.breadcrumb .breadcrumb-item + .breadcrumb-item {
padding-left: 0.25rem;
}
Expand Down Expand Up @@ -793,7 +808,7 @@ body .campaign-page-progress {
height: 2.5rem;
}

.campaign-progress {
div.campaign-progress {
height: 35px;
margin-top: 20px;
}
Expand Down Expand Up @@ -876,6 +891,10 @@ body .disabled > .page-link {
max-width: 270px;
}

.call-to-action {
min-width: 292px;
}

// Campaign small blocks

.small-campaign-title {
Expand Down Expand Up @@ -1053,10 +1072,6 @@ body .disabled > .page-link {
}
}

body .help-buttons {
padding-left: 75px;
}

@include media-breakpoint-down(sm) {
#contribute-container {
flex-direction: column !important;
Expand Down Expand Up @@ -1382,6 +1397,7 @@ a.btn-outline-primary:hover {
right: 1rem;
top: 0.375rem;
color: $blue;
cursor: pointer;
font-size: 1.5rem;
font-weight: 700;
}
Expand Down
2 changes: 1 addition & 1 deletion concordia/templates/fragments/_filter-buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if user.is_authenticated and user.is_staff %}
<div class="mt-4">
<div class="col-4 mt-4 ps-5">
<input name="radioButtons" type="radio" id="show-all" {% if do_filter %}onclick="filterAssets(false, '{{ all_url }}?{{ sublevel_qs }}')"{% else %}checked{% endif %}>
<label>Show all</label>
<input name="radioButtons" type="radio" id="filter-assets" {% if do_filter %}checked{% else %}onclick="filterAssets(true, '{{ filtered_url }}?{{ sublevel_qs }}')"{% endif %}>
Expand Down
4 changes: 2 additions & 2 deletions concordia/templates/transcriptions/asset_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
<div id="help-container" class="mt-1 d-print-none">
<div class="row p-3 bg-light justify-content-sm-between">
<div class="d-flex align-items-center ps-1 col">Share this item: {% share_buttons current_asset_url asset.item.title %}</div>
<div class="btn-group align-items-center col-3 help-buttons">
<p class="ms-1 me-2 my-0">Need help?</p>
<div class="btn-group align-items-center col">
<p class="ms-auto me-2 my-0">Need help?</p>

<div class="d-grid gap-2 d-md-block">
<a class="btn btn-primary mx-1" href="https://ask.loc.gov/crowd" target="_blank" rel=noopener>
Expand Down
6 changes: 3 additions & 3 deletions concordia/templates/transcriptions/asset_detail/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ <h2 id="display-inprogress" {% if transcription_status != "in_progress" %}hidden
{% csrf_token %}
<input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />

<div class="row justify-content-sm-between px-3">
<div class="col-4">
<div class="row justify-content-sm-between ps-3 pe-2">
<div class="col">
<span id="transcription-status-message">
<h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidden{% endif %}>
Registered Contributors: <span id="message-contributors-num" class="fw-normal">{{ registered_contributors }}</span>
Expand All @@ -47,7 +47,7 @@ <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidd
</span>
</div>
{% if cards %}
<div class="align-items-center align-self-end btn-group col-6">
<div class="align-items-end btn-group col call-to-action pe-0">
<a class="fw-bold" id="quick-tips" data-bs-toggle="modal" data-bs-target="#tutorial-popup" role="button">
<u>Campaign Tips</u>
</a>
Expand Down