diff --git a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs index 1c7e816f17..d17ce9e300 100644 --- a/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs +++ b/app/assets/javascripts/admin/addon/templates/watched-words-action.hbs @@ -1,26 +1,22 @@ -
-

{{model.name}}

+
+ {{d-button + class="btn-default download-link" + href=downloadLink + icon="download" + label="admin.watched_words.download"}} -
- {{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")}} - {{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 - label="admin.watched_words.test.button_label" - icon="far-eye" - action=(action "test")}} - - {{d-button - class="btn-danger clear-all" - label="admin.watched_words.clear_all" - 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")}}

{{actionDescription}}

diff --git a/app/assets/stylesheets/common/admin/staff_logs.scss b/app/assets/stylesheets/common/admin/staff_logs.scss index e5de3d6722..73533b1c2d 100644 --- a/app/assets/stylesheets/common/admin/staff_logs.scss +++ b/app/assets/stylesheets/common/admin/staff_logs.scss @@ -329,11 +329,6 @@ table.screened-ip-addresses { vertical-align: top; } -.watched-word-container { - display: flex; - justify-content: space-between; -} - .watched-words-uploader { display: inline-block; } @@ -363,9 +358,12 @@ table.screened-ip-addresses { } } -.watched-words-detail .about, -.watched-word-form { - margin: 0.5em 0 1em 0; +.watched-words-detail { + .watched-word-controls, + .about, + .watched-word-form { + margin-bottom: 1em; + } } .watched-words-test-modal p {