diff --git a/customize.dist/loading.js b/customize.dist/loading.js index 10db051ff..09d2060dc 100644 --- a/customize.dist/loading.js +++ b/customize.dist/loading.js @@ -13,7 +13,8 @@ define([], function () { right: 0px; background: linear-gradient(to right, #326599 0%, #326599 50%, #4591c4 50%, #4591c4 100%); color: #fafafa; - font-size: 1.5em; + font-size: 1.3em; + line-height: 120%; opacity: 1; display: flex; flex-flow: column; @@ -78,12 +79,10 @@ define([], function () { padding: 20px; width: 100%; color: #3F4141; - text-align: center; + text-align: left; display: none; } -#cp-loading-password-prompt { - font-size: 18px; -} + #cp-loading-password-prompt .cp-password-error { color: white; background: #9e0000; @@ -99,22 +98,44 @@ p.cp-password-info{ } #cp-loading-password-prompt .cp-password-form { display: flex; - justify-content: space-around; flex-wrap: wrap; } -#cp-loading-password-prompt .cp-password-form button, -#cp-loading-password-prompt .cp-password-form .cp-password-input { +#cp-loading-password-prompt .cp-password-form button{ background-color: #4591c4; color: white; border: 1px solid #4591c4; } + +.cp-password-input{ + font-size:16px; + border: 1px solid #4591c4; + background-color: white; + border-radius 0; +} + +.cp-password-form button{ + padding: 8px 12px; + font-weight: bold; + text-transform: uppercase; +} + +#cp-loading-password-prompt .cp-password-form{ + width: 100%; +} + #cp-loading-password-prompt .cp-password-form .cp-password-container { flex-shrink: 1; min-width: 0; } + +#cp-loading-password-prompt .cp-password-form .cp-password-container .cp-password-reveal{ + color: #4591c4; + padding: 0px 24px; +} + #cp-loading-password-prompt .cp-password-form input { flex: 1; - padding: 0 5px; + padding: 12px; min-width: 0; text-overflow: ellipsis; } @@ -122,7 +143,7 @@ p.cp-password-info{ background-color: #326599; } #cp-loading-password-prompt ::placeholder { - color: #d9d9d9; + color: #999999; opacity: 1; } #cp-loading-password-prompt :-ms-input-placeholder { @@ -157,7 +178,7 @@ p.cp-password-info{ background: #222; color: #fafafa; text-align: center; - font-size: 1.5em; + font-size: 1.3em; opacity: 0.7; font-family: 'Open Sans', 'Helvetica Neue', sans-serif; padding: 15px; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 0ab7586e1..a195a1ba9 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1130,8 +1130,8 @@ define([ Messages.share_linkPresent, false, { mark: {tabindex:1} }) : undefined, UI.createRadio('accessRights', 'cp-share-editable-true', Messages.share_linkEdit, false, { mark: {tabindex:1} })]), - burnAfterReading = hashes.viewHash ? UI.createRadio('accessRights', 'cp-share-bar', - 'View once and self-destruct', false, { mark: {tabindex:1}, label: {style: "display: none;"} }) : undefined // XXX KEY + burnAfterReading = hashes.viewHash ? UI.createRadio('accessRights', 'cp-share-bar', Messages.burnAfterReading_linkBurnAfterReading || + 'View once and self-destruct', false, { mark: {tabindex:1}, label: {style: "display: none;"} }) : undefined // XXX temp KEY ]); // Burn after reading @@ -1140,7 +1140,7 @@ define([ // the options to generate the BAR url var barAlert = h('div.alert.alert-danger.cp-alertify-bar-selected', { style: 'display: none;' - }, " You have set this pad to self-destruct. Once a recipient opens this pad, it will be permanently deleted from the server. "); // XXX KEY + }, Messages.burnAfterReading_warningLink || " You have set this pad to self-destruct. Once a recipient opens this pad, it will be permanently deleted from the server."); // XXX temp KEY var channel = Hash.getSecrets('pad', hash, config.password).channel; common.getPadMetadata({ channel: channel @@ -1182,7 +1182,7 @@ define([ cb(url); }); } - return 'Click on the button below to generate a link'; // XXX KEY + return Messages.burnAfterReading_generateLink || 'Click on the button below to generate a link'; // XXX temp KEY } var hash = (!hashes.viewHash || (edit && hashes.editHash)) ? hashes.editHash : hashes.viewHash; var href = burnAfterReading ? burnAfterReadingUrl : (origin + pathname + '#' + hash); @@ -4048,8 +4048,8 @@ define([ }; UIElements.displayBurnAfterReadingPage = function (common, cb) { - var info = h('p.cp-password-info', 'This document will self-destruct as soon as you open it. It will be removed form the server, once you close this window you will not be able to access it again. If you are not ready to proceed you can close this window and come back later. '); // XXX KEY - var button = h('button.primary', 'Proceed'); // XXX KEY + var info = h('p.cp-password-info', Messages.burnAfterReading_warning || 'This document will self-destruct as soon as you open it. It will be removed form the server, once you close this window you will not be able to access it again. If you are not ready to proceed you can close this window and come back later. '); // XXX temp KEY + var button = h('button.primary', Messages.burnAfterReading_proceed || 'view and delete'); // XXX temp KEY $(button).on('click', function () { cb(); @@ -4064,7 +4064,7 @@ define([ UIElements.getBurnAfterReadingWarning = function (common) { var priv = common.getMetadataMgr().getPrivateData(); if (!priv.burnAfterReading) { return; } - return h('div.alert.alert-danger.cp-burn-after-reading', 'This pad has been deleted from the server, once you close this window you will not be able to access it again.'); // XXX KEY + return h('div.alert.alert-danger.cp-burn-after-reading', Messages.burnAfterReading_warningDeleted || 'This pad has been deleted from the server, once you close this window you will not be able to access it again.'); // XXX temp KEY }; var crowdfundingState = false;