diff --git a/concordia/static/js/src/contribute.js b/concordia/static/js/src/contribute.js index d9bb9997f..f30446145 100644 --- a/concordia/static/js/src/contribute.js +++ b/concordia/static/js/src/contribute.js @@ -424,9 +424,8 @@ 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(); @@ -434,6 +433,7 @@ function setupPage() { .attr('hidden', 'hidden') .filter('#message-completed') .removeAttr('hidden'); + $('#transcription-status-display').removeAttr('hidden'); messageChildren .filter('#message-contributors') .removeAttr('hidden') diff --git a/concordia/static/scss/base.scss b/concordia/static/scss/base.scss index 9600ef926..a9d8965f9 100644 --- a/concordia/static/scss/base.scss +++ b/concordia/static/scss/base.scss @@ -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; } diff --git a/concordia/templates/base.html b/concordia/templates/base.html index 3cc67b72c..b20b7bdb6 100644 --- a/concordia/templates/base.html +++ b/concordia/templates/base.html @@ -167,7 +167,7 @@