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

CONCD-924 #2588

Merged
merged 7 commits into from
Nov 12, 2024
6 changes: 3 additions & 3 deletions concordia/static/js/src/contribute.js
Original file line number Diff line number Diff line change
@@ -424,16 +424,16 @@ function setupPage() {
} else {
$('#transcription-status-display')
.children()
.attr('hidden', 'hidden')
.filter('#display-completed')
.removeAttr('hidden');
.attr('hidden', 'hidden');
$('#display-completed').removeAttr('hidden');
let messageChildren = $(
'#transcription-status-message',
).children();
messageChildren
.attr('hidden', 'hidden')
.filter('#message-completed')
.removeAttr('hidden');
$('#transcription-status-display').removeAttr('hidden');
messageChildren
.filter('#message-contributors')
.removeAttr('hidden')
21 changes: 21 additions & 0 deletions concordia/static/scss/base.scss
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ $orange: #f05129;
$green: #218739;
$red: #d1332e;
$navy: #002347;
$white: #fff;

$dark: $gray-900;
$accent: $orange;
@@ -247,6 +248,10 @@ header.border-bottom {
&.alert-success {
background-color: $green;
}

&.alert-warning {
background-color: $gray-700;
}
}

.alert a[type='button'] {
@@ -406,6 +411,12 @@ body .btn-outline-primary:disabled {
opacity: 0.2;
}

a.btn-info:hover {
background-color: #005c87;
border-color: #005c87;
color: $white;
}

button.btn-primary:hover {
background-color: #005c87;
}
@@ -418,8 +429,14 @@ button.btn-primary:hover {

&.btn-info {
background-color: $blue;
border-color: $blue;
color: #fff;
}

&.btn-warning {
background-color: $gray-700;
border-color: $gray-700;
}
}

a.btn-dark {
@@ -1786,6 +1803,10 @@ table.table thead.border-y {
color: $light;
}

.dropdown-menu .dropdown-item:active {
background-color: $blue;
}

.change-options {
background-color: $gray-200;
}
2 changes: 1 addition & 1 deletion concordia/templates/base.html
Original file line number Diff line number Diff line change
@@ -167,7 +167,7 @@ <h1 class="logo-by-the-people m-0 -d-flex -align-items-center">
<div hidden id="message-template">
{% comment %} This is a hidden <div> rather than <template>
because it's not worth dealing with IE11 compatibility {% endcomment %}
<div class="alert alert-dismissible mx-3 my-2 d-flex justify-content-between" role="alert">
<div class="alert alert-dismissible mx-3 my-2 d-flex justify-content-between align-items-center" role="alert">
<a type="button" data-bs-dismiss="alert"
aria-label="Close">
<!--span aria-hidden="true">&times;</span-->
4 changes: 2 additions & 2 deletions concordia/templates/transcriptions/asset_detail/editor.html
Original file line number Diff line number Diff line change
@@ -78,9 +78,9 @@ <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidd

<div class="my-3 d-print-none d-flex flex-wrap justify-content-center align-items-center">
{% if transcription_status == 'not_started' or transcription_status == 'in_progress' %}
<div class="form-check mt-0 mb-3">
<div class="form-check mt-0 mb-3 d-flex justify-content-center w-100">
<input id="nothing-to-transcribe" type="checkbox" class="form-check-input" />
<label class="form-check-label" for="nothing-to-transcribe">
<label class="form-check-label ml-1" for="nothing-to-transcribe">
Nothing to transcribe
</label>