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

Jump to bottom

💄 Small styling fixes #710

Merged
merged 2 commits into from
Sep 15, 2023
Merged

💄 Small styling fixes #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a87cb72
💄 Unify attachment badges
pajowu Sep 13, 2023
8edb53d
💄 Fix small styling bugs on redaction page
pajowu Sep 13, 2023
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
4 changes: 2 additions & 2 deletions froide/foirequest/templates/foirequest/body/message/attachments/item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<!-- approved or redacted badges-->
{% if attachment.redacted or attachment.converted and not attachment.approved %}
<span class="me-1 px-1 small text-nowrap bg-gray-600 text-white">
<span class="me-1 badge small text-nowrap bg-gray-600 text-white">
{% blocktrans %}protected original{% endblocktrans %}
</span>
{% endif %}
Expand All @@ -63,7 +63,7 @@
{% endif %}
{% endif %}
{% if attachment.is_redacted %}
<span class="me-1 px-1 small text-nowrap bg-dark text-white">
<span class="me-1 badge small text-nowrap bg-dark text-white">
{% blocktrans %}redacted{% endblocktrans %}
</span>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion frontend/javascript/components/docupload/file-review.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{{ i18n.review }}
</a>
<template v-if="hasSubMenu">
<div class="btn-group-sm" role="group">
<div class="btn-group btn-group-sm" role="group">
<button
type="button"
class="btn btn-outline-secondary dropdown-toggle"
Expand Down Expand Up @@ -67,7 +67,7 @@
export default {
name: 'FileReview',
mixins: [I18nMixin],
props: ['config', 'document'],

Check warning on line 70 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

Prop "config" should define at least its type

Check warning on line 70 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

Prop "document" should define at least its type

Check warning on line 70 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

Prop "config" should define at least its type

Check warning on line 70 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

Prop "document" should define at least its type
computed: {
attachment() {
return this.document.attachment
Expand Down Expand Up @@ -124,12 +124,12 @@
},
methods: {
approve() {
this.$emit('docupdated', {

Check warning on line 127 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

The "docupdated" event has been triggered but not declared on `emits` option

Check warning on line 127 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

The "docupdated" event has been triggered but not declared on `emits` option
approving: true
})
},
makeRelevant() {
this.$emit('makerelevant')

Check warning on line 132 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

The "makerelevant" event has been triggered but not declared on `emits` option

Check warning on line 132 in frontend/javascript/components/docupload/file-review.vue

View workflow job for this annotation

GitHub Actions / lint 

The "makerelevant" event has been triggered but not declared on `emits` option
},
deleteAttachment() {
const confirm = window.confirm(this.i18n.confirmDelete)
Expand Down
9 changes: 4 additions & 5 deletions frontend/javascript/components/redaction/pdf-redaction.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</button>
</div>

<div class="btn-group me-1">
<div class="input-group me-1">
<button
class="pdf-prev btn btn-outline-secondary"
:disabled="!hasPrevious"
Expand All @@ -117,7 +117,7 @@
v-if="hasRedactions || hasPassword"
class="btn-group me-lg-1 ms-auto mt-1 mt-lg-0">
<button class="btn btn-dark" @click="redact">
<i class="fa fa-paint-brush" />
<i class="fa fa-paint-brush me-2" />
<template v-if="hasRedactions">
{{ i18n.redactAndPublish }}
</template>
Expand All @@ -144,8 +144,7 @@
}"
type="submit"
@click="confirmNoRedactions">
<i class="fa fa-check" />
{{ i18n.publishWithoutRedaction }}
<i class="fa fa-check me-2" />{{ i18n.publishWithoutRedaction }}
</button>
</form>
<a v-else class="btn btn-secondary" :href="attachmentUrl">
Expand Down Expand Up @@ -189,7 +188,7 @@
</div>
<div class="row">
<div v-if="ready" class="btn-toolbar col-lg-12">
<div class="btn-group me-auto ms-auto">
<div class="input-group me-auto ms-auto">
<button
class="pdf-prev btn btn-outline-secondary"
:disabled="!hasPrevious"
Expand Down
Loading