Merge branch 'broadcast' of github.com:xwiki-labs/cryptpad into broadcast

customize.dist/src/less2/include/alertify.less

@@ -64,6 +64,10 @@
             color: @cryptpad_text_col;
         }
 
+        .cp-admin-message {
+            color: @cryptpad_text_col;
+        }
+
         .cp-inline-alert-text {
             flex: 1;
         }

customize.dist/src/less2/include/colortheme.less

@@ -190,7 +190,7 @@
 // Dropdown
 @cp_dropdown-fg: @cryptpad_text_col;
 @cp_dropdown-bg: @cryptpad_color_grey_100;
-@cp_dropdown-bg-hover: @cryptpad_color_grey_100;
+@cp_dropdown-bg-hover: @cryptpad_color_grey_200;
 @cp_dropdown-bg-active: @cryptpad_color_grey_300;
 
 // Rendered Markdown

customize.dist/src/less2/include/notifications.less

@@ -24,7 +24,7 @@
                 padding: 0 5px;
                 color: @cp_dropdown-fg;
                 &.preview {
-                    color: red; // XXX
+                    color: @cryptpad_color_red;
                 }
             }
             .cp-avatar {

www/admin/app-admin.less

@@ -201,8 +201,11 @@
 
     .cp-admin-broadcast-form {
         margin-top: 30px;
-        & > button:last-child {
+        .cp-broadcast-form-submit {
-            margin-top: 30px !important;
+            margin-top: 30px;
+            button {
+                margin-bottom: 10px !important;
+            }
         }
         .cp-broadcast-container {
             display: flex;
@@ -230,7 +233,20 @@
             width: 100%;
             min-width: 600px;
             .empty {
-                font-style: italic;
+                background-color: transparent;
+            }
+            tbody {
+                tr {
+                    background-color: @cp_support-msg-bg;
+                    border-bottom: 5px solid @cp_sidebar-right-bg;
+                    padding: 5px;
+                    td {
+                        padding: 5px;
+                        button {
+                            margin: 0 !important;
+                        }
+                    }
+                }
             }
             .cp-notification {
                 display: flex;

www/admin/inner.js

@@ -1161,8 +1161,11 @@ define([
                     h('label', Messages.broadcast_translations),
                     h('div.cp-broadcast-languages', boxes),
                     container,
-                    button,
+                    h('div.cp-broadcast-form-submit', [
-                    noFallbackBtn
+                        noFallbackBtn,
+                        h('br'),
+                        button
+                    ])
                 ]);
             })();
             return;
@@ -1213,8 +1216,10 @@ define([
                     h('label', Messages.broadcast_end),
                     end,
                     h('br'),
-                    button,
+                    h('div.cp-broadcast-form-submit', [
-                    preview
+                        button,
+                        preview
+                    ])
                 ]);
             })();
             return;
@@ -1242,8 +1247,10 @@ define([
                 $form.append([
                     $cbox[0],
                     h('br'),
-                    button,
+                    h('div.cp-broadcast-form-submit', [
-                    preview
+                        button,
+                        preview
+                    ])
                 ]);
             })();
             return;
@@ -1272,8 +1279,10 @@ define([
                     label,
                     input,
                     h('br'),
-                    button,
+                    h('div.cp-broadcast-form-submit', [
-                    preview
+                        button,
+                        preview
+                    ])
                 ]);
             })();
             return;
@@ -1291,7 +1300,7 @@ define([
 
                 // Empty history
                 if (!msgs.length) {
-                    $table.append(h('tr', h('td.empty', Messages.broadcast_empty)));
+                    $table.append(h('tr.empty', h('td', Messages.broadcast_empty)));
                 }
 
                 // Build the table

www/common/notifications.js

@@ -477,7 +477,7 @@ define([
                 // XXX Allow markdown (sanitized)?
                 var content = h('div', [
                     h('h4', Messages.broadcast_newCustom),
-                    h('div', toShow)
+                    h('div.cp-admin-message', toShow)
                 ]);
                 UI.alert(content);
                 // XXX Dismiss on click?