infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

Browse Source
pull/1/head
yflory 7 years ago
parent c269929319 16388a839c
commit 34315b4500
13 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

16
.lesshintrc
Unescape Escape View File

@ -13,29 +13,29 @@
"decimalZero": { "enabled": false }, // disallow .5em "decimalZero": { "enabled": false }, // disallow .5em
"borderZero": { "enabled": false }, // disallow border: none; "borderZero": { "enabled": false }, // disallow border: none;
"selectorNaming": { "enabled": false }, // this would be crap because classes are what they are. "selectorNaming": { "enabled": false }, // this would be crap because classes are what they are.
// These rules should be discussed, if they're crap then they should be moved up.
"zeroUnit": { "enabled": false }, "zeroUnit": { "enabled": false },
"spaceAroundComma": { "enabled": false },
"singleLinePerProperty": { "enabled": false }, "singleLinePerProperty": { "enabled": false },
"_singleLinePerProperty": { "_singleLinePerProperty": {
"enabled": true, "enabled": true,
"allowSingleLineRules": true "allowSingleLineRules": true
}, },
"spaceAroundComma": { "enabled": false },
"importantRule": { "enabled": false }, "importantRule": { "enabled": false },
"universalSelector": { "enabled": false },
"idSelector": { "enabled": false }, "idSelector": { "enabled": false },
"singleLinePerSelector": { "enabled": false }, "singleLinePerSelector": { "enabled": false },
"spaceAfterPropertyColon": { "enabled": false },
"spaceBetweenParens": { "enabled": false }, "spaceBetweenParens": { "enabled": false },
"universalSelector": { "enabled": false },
"maxCharPerLine": { "enabled": false }, // using lesshint flags can cause long lines "maxCharPerLine": { "enabled": false }, // using lesshint flags can cause long lines
"colorVariables": { "enabled": false }, // require all colors to be stored as variables first...
"comment": { "enabled": false }, // ban multi-line comments ? "comment": { "enabled": false }, // ban multi-line comments ?
// These rules should be discussed, if they're crap then they should be moved up.
"colorVariables": { "enabled": false }, // require all colors to be stored as variables first...
"variableValue": { "enabled": false }, // any attribute types which should always be variables ? color? "variableValue": { "enabled": false }, // any attribute types which should always be variables ? color?
"finalNewline": { "enabled": true }, // require an emprty line at the end of the file (enabled for now) "spaceBeforeBrace": { "enabled": true },//{ "enabled": true, "style": "one_space" },
"spaceBeforeBrace": { "enabled": false },//{ "enabled": true, "style": "one_space" },
// Turn everything else on // Turn everything else on
"spaceAfterPropertyColon": { "enabled": true },
"finalNewline": { "enabled": true }, // require an empty line at the end of the file (enabled for now)
"attributeQuotes": { "enabled": true }, "attributeQuotes": { "enabled": true },
"depthLevel": { "depthLevel": {
"depth": 1 // TODO(cjd) This is obviously not triggering, even with 1 "depth": 1 // TODO(cjd) This is obviously not triggering, even with 1

2
customize.dist/src/less2/404.less
Unescape Escape View File

@ -22,7 +22,7 @@ html.cp-app-print {
.app-print_main(); .app-print_main();
} }
body.cp-readonly .cp-hidden-if-readonly { display:none !important; } body.cp-readonly .cp-hidden-if-readonly { display: none !important; }
body.cp-app-drive { @import "../../../drive/app-drive.less"; } body.cp-app-drive { @import "../../../drive/app-drive.less"; }
body.cp-app-pad { @import "../../../pad/app-pad.less"; } body.cp-app-pad { @import "../../../pad/app-pad.less"; }

4
customize.dist/src/less2/include/alertify.less
Unescape Escape View File

@ -28,7 +28,7 @@
// These show only once // These show only once
.alertify-logs { .alertify-logs {
z-index:10000; // alertify logs z-index: 10000; // alertify logs
@media print { @media print {
visibility: hidden; visibility: hidden;
} }
@ -222,7 +222,7 @@
border: 1px dotted @alertify-base; border: 1px dotted @alertify-base;
} }
&::-moz-focus-inner { &::-moz-focus-inner {
border:0; border: 0;
} }
} }

2
customize.dist/src/less2/include/app-print.less
Unescape Escape View File

@ -4,7 +4,7 @@
height: auto; height: auto;
max-height: none; max-height: none;
overflow: visible; overflow: visible;
display:block; display: block;
@page { @page {
margin: 0; margin: 0;
size: landscape; size: landscape;

2
customize.dist/src/less2/include/dropdown.less
Unescape Escape View File

@ -13,7 +13,7 @@
} }
button { button {
.fa-caret-down{ .fa-caret-down {
margin-right: 0px; margin-right: 0px;
margin-left: 5px; margin-left: 5px;
} }

4
customize.dist/src/less2/include/icon-colors.less
Unescape Escape View File

@ -12,7 +12,7 @@
.cp-icon-color-settings { color: @colortheme_settings-bg; } .cp-icon-color-settings { color: @colortheme_settings-bg; }
.cp-icon-color-profile { color: @colortheme_settings-bg; } .cp-icon-color-profile { color: @colortheme_settings-bg; }
.cp-icon-color-default { color: @colortheme_default-bg; } .cp-icon-color-default { color: @colortheme_default-bg; }
.cp-icon-color-todo { color:@colortheme_todo-bg; } .cp-icon-color-todo { color: @colortheme_todo-bg; }
.cp-border-color-pad { border-color: @colortheme_pad-bg !important; } .cp-border-color-pad { border-color: @colortheme_pad-bg !important; }
.cp-border-color-code { border-color: @colortheme_code-bg !important; } .cp-border-color-code { border-color: @colortheme_code-bg !important; }
@ -25,6 +25,6 @@
.cp-border-color-settings { border-color: @colortheme_settings-bg !important; } .cp-border-color-settings { border-color: @colortheme_settings-bg !important; }
.cp-border-color-profile { border-color: @colortheme_settings-bg !important; } .cp-border-color-profile { border-color: @colortheme_settings-bg !important; }
.cp-border-color-default { border-color: @colortheme_default-bg !important; } .cp-border-color-default { border-color: @colortheme_default-bg !important; }
.cp-border-color-todo { border-color:@colortheme_todo-bg !important; } .cp-border-color-todo { border-color: @colortheme_todo-bg !important; }
} }

2
customize.dist/src/less2/include/limit-bar.less
Unescape Escape View File

@ -27,7 +27,7 @@
background: blue; background: blue;
position: absolute; position: absolute;
left: 0; left: 0;
z-index:1; // .usage z-index: 1; // .usage
&.cp-limit-usage-normal { &.cp-limit-usage-normal {
background: @colortheme_green; background: @colortheme_green;
} }

10
customize.dist/src/less2/include/toolbar.less
Unescape Escape View File

@ -86,7 +86,7 @@
white-space: normal; white-space: normal;
line-height: auto; line-height: auto;
} }
text-align:baseline; text-align: baseline;
.cp-toolbar-userlist-viewer { .cp-toolbar-userlist-viewer {
font-style: italic; font-style: italic;
padding: 5px; padding: 5px;
@ -310,7 +310,7 @@
} }
&.cp-toolbar-notitle { &.cp-toolbar-notitle {
.cp-toolbar-top-filler { .cp-toolbar-top-filler {
flex: 1; flex: 1;
} }
} }
@ -319,7 +319,7 @@
@media screen and (max-width: @browser_media-medium-screen) { @media screen and (max-width: @browser_media-medium-screen) {
flex-wrap: wrap; flex-wrap: wrap;
height: auto; height: auto;
.cp-toolbar-top-filler { .cp-toolbar-top-filler {
flex: 1; flex: 1;
} }
.cp-toolbar-title { .cp-toolbar-title {
@ -744,13 +744,13 @@
.cp-toolbar-drawer-content { .cp-toolbar-drawer-content {
box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2); box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
position: absolute; position: absolute;
right:0px; right: 0px;
margin-top: @toolbar_line-height; margin-top: @toolbar_line-height;
min-width: 50px; min-width: 50px;
background: @colortheme_dropdown-bg; background: @colortheme_dropdown-bg;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
z-index:10000; //Z cp-toolbar-drawer-content z-index: 10000; //Z cp-toolbar-drawer-content
color: black; color: black;
.fa { .fa {
font-size: 17px; font-size: 17px;

2
customize.dist/src/less2/main.less
Unescape Escape View File

@ -22,7 +22,7 @@ html.cp-app-print {
.app-print_main(); .app-print_main();
} }
body.cp-readonly .cp-hidden-if-readonly { display:none !important; } body.cp-readonly .cp-hidden-if-readonly { display: none !important; }
body.cp-app-drive { @import "../../../drive/app-drive.less"; } body.cp-app-drive { @import "../../../drive/app-drive.less"; }
body.cp-app-pad { @import "../../../pad/app-pad.less"; } body.cp-app-pad { @import "../../../pad/app-pad.less"; }

2
customize.dist/src/less2/pages/page-about.less
Unescape Escape View File

@ -44,7 +44,7 @@
} }
} }
} }
.cp-bio-avatar-right { .cp-bio-avatar-right {
padding-right: 15px; padding-right: 15px;
padding-left: 0; padding-left: 0;
@media (max-width: 991px) { @media (max-width: 991px) {

4
customize.dist/src/less2/pages/page-contact.less
Unescape Escape View File

@ -12,7 +12,7 @@
} }
.cp-container { .cp-container {
background: #fff; background: #fff;
.cp-iconCont{ .cp-iconCont {
h4 { h4 {
margin-top: 1.5em; margin-top: 1.5em;
margin-bottom: 1.5em; margin-bottom: 1.5em;
@ -31,7 +31,7 @@
@media (max-width: 1200px) and (min-width: 769px) { @media (max-width: 1200px) and (min-width: 769px) {
min-height: 139px; min-height: 139px;
} }
@media (max-width: 768px) and (min-width: 576px){ @media (max-width: 768px) and (min-width: 576px) {
min-height: 164px; min-height: 164px;
} }
@media (max-width: 496px) { @media (max-width: 496px) {

2
customize.dist/src/less2/pages/page-index.less
Unescape Escape View File

@ -99,7 +99,7 @@ a:hover {
display: flex; display: flex;
align-items: stretch; align-items: stretch;
margin: 25px 0; margin: 25px 0;
background:rgba(255,255,255,0.6); background: rgba(255,255,255,0.6);
color: black; color: black;
transition: all .1s ease-in-out; transition: all .1s ease-in-out;
box-sizing: border-box; box-sizing: border-box;

2
package.json
Unescape Escape View File

@ -22,6 +22,8 @@
"dev": "DEV=1 node server.js", "dev": "DEV=1 node server.js",
"fresh": "FRESH=1 node server.js", "fresh": "FRESH=1 node server.js",
"lint": "jshint --config .jshintrc --exclude-path .jshintignore . && ./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/", "lint": "jshint --config .jshintrc --exclude-path .jshintignore . && ./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/",
"lint:js": "jshint --config .jshintrc --exclude-path .jshintignore .",
"lint:less": "./node_modules/lesshint/bin/lesshint -c ./.lesshintrc ./customize.dist/src/less2/",
"flow": "./node_modules/.bin/flow", "flow": "./node_modules/.bin/flow",
"test": "node TestSelenium.js", "test": "node TestSelenium.js",
"template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../what-is-cryptpad.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;" "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../what-is-cryptpad.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;"

Write Preview
Loading…
Cancel
Save