From 3a9c1c782d538b190fa59b54515c8bc3c129cbc1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 1 Feb 2017 15:21:59 +0100 Subject: [PATCH 1/2] remove dead code from cryptpad.less --- customize.dist/src/less/cryptpad.less | 32 --------------------------- 1 file changed, 32 deletions(-) diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 6ff1d8eb0..4dd9e70ea 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -16,16 +16,6 @@ html.cp, .cp body { height: 100%; } -.cp:not(.poll) { - /*#language-selector { - position: absolute; - top: @topbar-height; - right: 0px; - display: inline-block; - z-index: 2; - }*/ -} - .cp { body { @@ -340,8 +330,6 @@ body.html { top: 50%; left: 0; transform: translateY(-50%); - //width: ~"calc(100% - 450px - 30vw)"; - //background-color: @main-block-bg; #tryit { margin-top: 20px; @@ -358,7 +346,6 @@ body.html { display: inline-block; width: 350px; max-width: 35%; - //background-color: @main-block-bg; padding: 10px; box-sizing: border-box; font-family: lato, Helvetica, sans-serif; @@ -375,7 +362,6 @@ body.html { label { margin-bottom: 0; - //margin-top: 0.5em; } /*.remember { vertical-align: middle; @@ -438,7 +424,6 @@ body.html { @media screen and (max-width: @media-not-big) { position: relative; height: auto; - //background: #aaa; top: -10px; } @@ -466,7 +451,6 @@ p.buttons, div.buttons { .create, .action { display: inline-block; @thick: 2px; - //border: @thick solid @cp-darkblue; border: 0; background-color: @cp-darkblue; color: @topbar-button-color; @@ -477,23 +461,9 @@ p.buttons, div.buttons { margin-left: 5px; &:hover { color: darken(@topbar-button-color, 20%); - //border: @thick solid @cp-accent2; - //color: @cp-darkblue; } } -.button { - @hpad: 2 * 6px; - @vpad: 2 * 2px; - padding: @vpad @hpad @vpad @hpad; - - //margin-top: 2 * 6px; - //margin-bottom: 2 * 6px; - margin: 2px 0; - display: inline-block; - line-height: 1.5em; -} - // currently only used in /user/ .panel { background-color: @dark-base; @@ -558,7 +528,6 @@ tbody { } // form things - .bottom-left { .bottom-left; } @@ -863,7 +832,6 @@ div.modal, div#modal { width: 100vw; height: 56.25vw; // height:width ratio = 9/16 = .5625 - //background: pink; max-height: 100vh; max-width: 177.78vh; // 16/9 = 1.778 margin: auto; From 1a061c22a0f5a904c06b6adb8057f1a3795b3ebe Mon Sep 17 00:00:00 2001 From: ansuz Date: Wed, 1 Feb 2017 15:47:50 +0100 Subject: [PATCH 2/2] more consistent styles and improved SEO --- customize.dist/main.css | 28 +++++++++---------------- customize.dist/src/less/cryptpad.less | 15 +++++++++---- customize.dist/src/less/topbar.less | 7 +++---- customize.dist/src/less/variables.less | 2 ++ customize.dist/translations/messages.js | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/customize.dist/main.css b/customize.dist/main.css index 23f3d0e10..176eeebe7 100644 --- a/customize.dist/main.css +++ b/customize.dist/main.css @@ -452,8 +452,7 @@ color: #558; } #cryptpadTopBar .right a:hover { - text-decoration: none; - color: #000; + text-decoration: underline; } html.cp, .cp body { @@ -463,15 +462,6 @@ html.cp, font-family: Georgia,Cambria,serif; height: 100%; } -.cp:not(.poll) { - /*#language-selector { - position: absolute; - top: @topbar-height; - right: 0px; - display: inline-block; - z-index: 2; - }*/ -} .cp { /* buttons */ /* Tables @@ -580,6 +570,7 @@ html.cp, position: relative; } .cp .page .info-container { + color: #121212; width: 900px; max-width: 100%; margin: 0 auto; @@ -715,16 +706,21 @@ html.cp, .cp #main { background: url('/customize/bg3.jpg') no-repeat center center; background-size: cover; + background-attachment: fixed; + background-position: center; } .cp #main_other { padding: 0 15vw; } +.cp .category { + margin-top: 5px; +} .cp #main, .cp #main_other { position: relative; left: 0; right: 0; - height: calc(100vh - 150px); + height: calc(100vh - 115px); min-height: 450px; margin: auto; z-index: 1; @@ -762,6 +758,8 @@ html.cp, font-size: 20px; line-height: 1.5em; } +.cp #main #data h1, +.cp #main_other #data h1, .cp #main #data h2, .cp #main_other #data h2 { font-weight: normal; @@ -916,12 +914,6 @@ html.cp, .cp .action:hover { color: #cccccc; } -.cp .button { - padding: 4px 12px 4px 12px; - margin: 2px 0; - display: inline-block; - line-height: 1.5em; -} .cp .panel { background-color: #cccccc; } diff --git a/customize.dist/src/less/cryptpad.less b/customize.dist/src/less/cryptpad.less index 4dd9e70ea..3559f2d99 100644 --- a/customize.dist/src/less/cryptpad.less +++ b/customize.dist/src/less/cryptpad.less @@ -129,6 +129,7 @@ body.html { position: relative; .info-container { + color: #121212; width: 900px; max-width: 100%; margin: 0 auto; @@ -274,19 +275,24 @@ body.html { #main { background: @main-bg; background-size: cover; + background-attachment: fixed; + background-position: center; } #main_other { padding: 0 @main-border-width; } + +.category { + margin-top: 5px; +} + #main, #main_other { position: relative; left: 0; right: 0; - //padding: 0; - height: ~"calc(100vh - 150px)"; + height: ~"calc(100vh - 115px)"; min-height: 450px; margin: auto; - //margin-top: 100px; z-index: 1; font-size: medium; @@ -310,12 +316,13 @@ body.html { font-size: 20px; line-height: 1.5em; } - h2 { + h1, h2 { font-weight: normal; font-size: 48px; line-height: 1.2em; color: @main-color; } + h5 { font-size: 1em; color: @main-color; diff --git a/customize.dist/src/less/topbar.less b/customize.dist/src/less/topbar.less index 6caf0881c..a5d4addc4 100644 --- a/customize.dist/src/less/topbar.less +++ b/customize.dist/src/less/topbar.less @@ -35,7 +35,7 @@ line-height: 40px; &:hover { text-decoration: none; - color: #558; + color: @cp-purple; } } @@ -48,11 +48,10 @@ a { font-weight: 500; font-size: 0.75em; - color: #558; + color: @cp-purple; &:hover { - text-decoration: none; - color: #000; + text-decoration: underline; } } } diff --git a/customize.dist/src/less/variables.less b/customize.dist/src/less/variables.less index dae65b0ca..ef83f944e 100644 --- a/customize.dist/src/less/variables.less +++ b/customize.dist/src/less/variables.less @@ -20,6 +20,8 @@ @cp-blue: #00ADEE; @cp-light-blue: lighten(@cp-blue, 20%); +@cp-purple: #558; + // alertify things @box-shadow: 0 2px 5px 0 rgba(0,0,0,.2); diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index 1f81836dc..2c3f1d719 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -279,7 +279,7 @@ define(function () { //out.main_p1 = 'CryptPad is the zero knowledge realtime collaborative editor. Encryption carried out in your web browser protects the data from the server, the cloud, and the NSA. The secret encryption key is stored in the URL fragment identifier which is never sent to the server but is available to javascript so by sharing the URL, you give authorization to others who want to participate.'; //out.main_p1 = "Type quick documents with friends and colleagues.
With Zero Knowledge technology, the server doesn't know what you're doing."; - out.main_p1 = "

Collaborate in Confidence


Grow your ideas together with shared documents while Zero Knowledge technology secures your privacy; even from us."; + out.main_p1 = "

Collaborate in Confidence


Grow your ideas together with shared documents while Zero Knowledge technology secures your privacy; even from us."; out.main_p2 = 'This project uses the CKEditor Visual Editor, CodeMirror, and the ChainPad realtime engine.'; out.main_howitworks = 'How It Works';