summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2016-08-13 12:20:57 +0100
committerLuke Bennett <lukeeeebennettplus@gmail.com>2016-08-14 00:54:18 +0100
commitd8f88aa4101e654982a4d941742d07a299a472f9 (patch)
treef116320a0422d13cd80c84d16a45b6f0895e3cb0
parent673806a29e66d72ba2d8cc4e0f42611d96e0bfd7 (diff)
downloadgitlab-ce-d8f88aa4101e654982a4d941742d07a299a472f9.tar.gz
Review changes
-rw-r--r--app/assets/javascripts/abuse_reports.js.es68
-rw-r--r--app/assets/stylesheets/pages/admin.scss5
2 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/abuse_reports.js.es6 b/app/assets/javascripts/abuse_reports.js.es6
index ecafa1dee8d..f51a5121399 100644
--- a/app/assets/javascripts/abuse_reports.js.es6
+++ b/app/assets/javascripts/abuse_reports.js.es6
@@ -12,8 +12,8 @@ window.gl = window.gl || {};
}
truncateLongMessage() {
- let $messageCellElement = $(this);
- let reportMessage = $messageCellElement.text();
+ const $messageCellElement = $(this);
+ const reportMessage = $messageCellElement.text();
if (reportMessage.length > MAX_MESSAGE_LENGTH) {
$messageCellElement.data('original-message', reportMessage);
$messageCellElement.data('message-truncated', 'true');
@@ -22,8 +22,8 @@ window.gl = window.gl || {};
}
toggleMessageTruncation() {
- let $messageCellElement = $(this);
- let originalMessage = $messageCellElement.data('original-message');
+ const $messageCellElement = $(this);
+ const originalMessage = $messageCellElement.data('original-message');
if (!originalMessage) return;
if ($messageCellElement.data('message-truncated') === 'true') {
$messageCellElement.data('message-truncated', 'false');
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss
index 265ca3da3e6..c9cdfdcd29c 100644
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
@@ -108,7 +108,10 @@
.message {
word-wrap: break-word;
}
-
+ .btn {
+ white-space: normal;
+ padding: $gl-btn-padding;
+ }
th {
width: 15%;
&.wide {