Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging

customize.dist/pages.js

@@ -428,8 +428,8 @@ define([
                 }
             }, [
                 h('button#clear.btn.btn-danger', Msg.canvas_clear), ' ',
-                h('button#toggleDraw.btn.btn-default', Msg.canvas_disable),
-                h('button#delete.btn.btn-default', {
+                h('button#toggleDraw.btn.btn-secondary', Msg.canvas_disable),
+                h('button#delete.btn.btn-secondary', {
                     style: {
                         display: 'none',
                     }
@@ -497,7 +497,7 @@ define([
                             style: { display: 'none' },
                             title: Msg.poll_admin_button
                         }, Msg.poll_admin_button),
-                        h('button#help.btn.btn-default', {
+                        h('button#help.btn.btn-secondary', {
                             title: Msg.poll_show_help_button
                         }, Msg.poll_show_help_button)
                     ]),
@@ -513,13 +513,13 @@ define([
                         ]),
                         h('div#tableContainer', [
                             h('div#tableScroll'),
-                            h('button#create-user.btn.btn-default', {
+                            h('button#create-user.btn.btn-secondary', {
                                 title: Msg.poll_create_user
                             }, h('span.fa.fa-plus')),
-                            h('button#create-option.btn.btn-default', {
+                            h('button#create-option.btn.btn-secondary', {
                                 title: Msg.poll_create_option
                             }, h('span.fa.fa-plus')),
-                            h('button#commit.btn.btn-default', {
+                            h('button#commit.btn.btn-secondary', {
                                 title: Msg.poll_commit
                             }, h('span.fa.fa-check'))
                         ])

www/common/toolbar2.js

@@ -629,7 +629,7 @@ define([
             title: Messages.header_logoTitle,
             'class': "cryptpad-logo"
         }).append($('<img>', {
-            src: '/customize/images/logo_white.svg'
+            src: '/customize/images/logo_white.png'
         }));
         var onClick = function (e) {
             e.preventDefault();

www/poll/poll.less

@@ -475,14 +475,5 @@ form.realtime, div.realtime {
     display: inline-flex;
     align-items: center;
     justify-content: center;
-
-    &.btn-default {
-        background-color: #BBB;
-        color: black;
-
-        &:hover {
-            background-color: #DDD;
-        }
-    }
 }
 

www/whiteboard/whiteboard.less

@@ -133,12 +133,3 @@ body {
     height: 0;
     z-index: -5;
 }
-
-.btn.btn-default {
-    background-color: #BBB;
-    color: black;
-
-    &:hover {
-        background-color: #DDD;
-    }
-}