Skip to content

Commit

Permalink
CONCD-924 I may have forgotten to commit this previously (#2569)
Browse files Browse the repository at this point in the history
* CONCD-924 I may have forgotten to commit this previously, or maybe it got stomped by the merge

* CONCD-924 stylelint is throwing an error here, but it's suggestion causes sass to throw an error instead

* CONCD-924 not sure if we need both sass and node-sass
  • Loading branch information
rasarkar authored Oct 18, 2024
1 parent 5eb1269 commit 3411e06
Show file tree
Hide file tree
Showing 5 changed files with 117 additions and 1,447 deletions.
6 changes: 6 additions & 0 deletions concordia/static/scss/base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1438,6 +1438,12 @@ button.btn-outline-primary:hover {
}

/* How to Guide */
@media (width >= 965px) {
#instruction-buttons {
justify-content: flex-end;
}
}

#open-guide {
border-radius: $btn-border-radius;
margin: 0 5px 0 9px;
Expand Down
6 changes: 3 additions & 3 deletions concordia/templates/transcriptions/asset_detail/editor.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="flex-grow-1 d-flex d-print-block flex-column">
<form id="transcription-editor" class="ajax-submission flex-grow-1 d-flex flex-column d-print-block" method="post" action="{% url 'save-transcription' asset_pk=asset.pk %}" data-transcription-status="{{ transcription_status }}" {% if transcription %}data-transcription-id="{{ transcription.pk|default:'' }}" {% if transcription.submitted %}data-unsaved-changes="true"{% endif %} data-submit-url="{% url 'submit-transcription' pk=transcription.pk %}" data-review-url="{% url 'review-transcription' pk=transcription.pk %}"{% endif %}>
{% csrf_token %}
<input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
<div class="row justify-content-sm-between align-items-end mx-0 pe-2">
<input type="hidden" name="supersedes" value="{{ transcription.pk|default:'' }}" />
<div class="row justify-content-sm-between align-items-end mx-0">
<div class="col">
<div id="transcription-status-message">
<div id="transcription-status-display" class="row">
Expand Down Expand Up @@ -47,7 +47,7 @@ <h2 id="message-contributors" {% if transcription_status == 'not_started' %}hidd
</div>
</div>
{% if cards %}
<div class="d-flex align-items-end">
<div id="instruction-buttons" class="d-flex align-items-end col pe-0">
<a class="fw-bold mt-3" id="quick-tips" data-bs-toggle="modal" data-bs-target="#tutorial-popup" role="button">
<u>Campaign Tips</u>
</a>
Expand Down
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ let child_process = require('child_process');
let gulp = require('gulp');
let log = require('fancy-log');
let rename = require('gulp-rename');
let sass = require('gulp-sass')(require('node-sass'));
let sass = require('gulp-sass')(require('sass'));
let sourcemaps = require('gulp-sourcemaps');
let Transform = require('stream').Transform;

Expand Down
Loading

0 comments on commit 3411e06

Please sign in to comment.