Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UX: Remove duplicate title from watched words page (#12321)

This commit is contained in:
Bianca Nenciu 2021-03-09 11:52:12 +02:00 committed by GitHub
parent 1106aee152
commit 08f169ddd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/assets/javascripts/admin/addon/templates/watched-words-action.hbs
View File

@ -1,26 +1,22 @@
<div class="watched-word-container"> <div class="watched-word-controls">
<h2>{{model.name}}</h2> {{d-button
class="btn-default download-link"
href=downloadLink
icon="download"
label="admin.watched_words.download"}}
<div class="watched-word-controls"> {{watched-word-uploader uploading=uploading actionKey=actionNameKey done=(action "uploadComplete")}}
{{d-button
class="btn-default download-link"
href=downloadLink
icon="download"
label="admin.watched_words.download"}}
{{watched-word-uploader uploading=uploading actionKey=actionNameKey done=(action "uploadComplete")}} {{d-button
label="admin.watched_words.test.button_label"
icon="far-eye"
action=(action "test")}}
{{d-button {{d-button
label="admin.watched_words.test.button_label" class="btn-danger clear-all"
icon="far-eye" label="admin.watched_words.clear_all"
action=(action "test")}} icon="trash-alt"
action=(action "clearAll")}}
{{d-button
class="btn-danger clear-all"
label="admin.watched_words.clear_all"
icon="trash-alt"
action=(action "clearAll")}}
</div>
</div> </div>
<p class="about">{{actionDescription}}</p> <p class="about">{{actionDescription}}</p>

14
app/assets/stylesheets/common/admin/staff_logs.scss
View File

@ -329,11 +329,6 @@ table.screened-ip-addresses {
vertical-align: top; vertical-align: top;
} }
.watched-word-container {
display: flex;
justify-content: space-between;
}
.watched-words-uploader { .watched-words-uploader {
display: inline-block; display: inline-block;
} }
@ -363,9 +358,12 @@ table.screened-ip-addresses {
} }
} }
.watched-words-detail .about, .watched-words-detail {
.watched-word-form { .watched-word-controls,
margin: 0.5em 0 1em 0; .about,
.watched-word-form {
margin-bottom: 1em;
}
} }
.watched-words-test-modal p { .watched-words-test-modal p {