diff --git a/customize.dist/index.html b/customize.dist/index.html index 3719b0c78..8d5c589f2 100644 --- a/customize.dist/index.html +++ b/customize.dist/index.html @@ -68,6 +68,7 @@
CREATE NEW WYSIWYG PAD CREATE NEW CODE PAD + CREATE NEW POLL
diff --git a/customize.dist/main.css b/customize.dist/main.css index 863559f45..403c78568 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -136,6 +136,10 @@ tr { .button { padding: 4px 12px 4px 12px; border-radius: 5px; + margin-top: 12px; + margin-bottom: 12px; + white-space: nowrap; + display: inline-block; } /* Tables */ table { @@ -239,3 +243,36 @@ tbody td:last-child { top: 3px; max-width: 100px; } +form.realtime { + padding: 0px; + margin: 0px; +} +form.realtime > textarea { + width: 50%; + height: 15vh; +} +form.realtime table { + border-collapse: collapse; +} +form.realtime table input { + height: 100%; + width: 100%; + border: 3px solid #302B28; + display: table-cell; +} +form.realtime table tfoot tr td { + z-index: 4000; + cursor: pointer; +} +form.realtime #adduser, +form.realtime #addoption { + color: #46E981; + border: 1px solid #46E981; + padding: 15px; +} +form.realtime #addoption { + border-bottom-left-radius: 5px; +} +form.realtime #adduser { + border-top-left-radius: 5px; +} diff --git a/customize.dist/main.js b/customize.dist/main.js index beaa40c55..a222aad16 100644 --- a/customize.dist/main.js +++ b/customize.dist/main.js @@ -34,7 +34,8 @@ define([ var padTypes = { '/pad/': 'Pad', - '/code/': 'Code' + '/code/': 'Code', + '/poll/': 'Poll', }; var truncateTitle = function (title, len) { diff --git a/customize.dist/src/cryptpad.less b/customize.dist/src/cryptpad.less index bd6b6a435..0b077cd42 100644 --- a/customize.dist/src/cryptpad.less +++ b/customize.dist/src/cryptpad.less @@ -170,6 +170,10 @@ p, pre, td, a, table, tr { padding: @vpad @hpad @vpad @hpad; border-radius: 5px; + margin-top: 2 * 6px; + margin-bottom: 2 * 6px; + white-space: nowrap; + display: inline-block; } /* Tables */ @@ -283,3 +287,81 @@ tbody { } +// form things +form.realtime { + > input { + &[type="text"] { + + } + } + > textarea { + width: 50%; + height: 15vh; + } + + padding: 0px; + margin: 0px; + + table { + border-collapse: collapse; + tr { + td { + //border: 1px solid white; + } + } + + input { + height: 100%; + width: 100%; + border: 3px solid @base; + display: table-cell; + } + + + thead { + tr { + td { + + } + } + } + tbody { + tr { + td { + + } + } + } + tfoot { + tr { + td { + + z-index: 4000; + cursor: pointer; + } + } + } + } + + #adduser, + #addoption { + color: @cp-green; + border: 1px solid @cp-green; + padding: 15px; + } + + .corner (@tl: 0px, @tr: 0px, @br: 0px, @bl: 0px) { + border-radius: @tl @tr @br @bl; + } + + #addoption { + //.corner(0px, 0px, + border-bottom-left-radius: 5px; + } + + #adduser { + border-top-left-radius: 5px; + } + +} +