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

.lesshintrc

@@ -13,29 +13,29 @@
     "decimalZero": { "enabled": false }, // disallow .5em
     "borderZero": { "enabled": false }, // disallow border: none;
     "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 },
-    "spaceAroundComma": { "enabled": false },
     "singleLinePerProperty": { "enabled": false },
     "_singleLinePerProperty": {
         "enabled": true,
         "allowSingleLineRules": true
     },
+    "spaceAroundComma": { "enabled": false },
     "importantRule": { "enabled": false },
+    "universalSelector": { "enabled": false },
     "idSelector": { "enabled": false },
     "singleLinePerSelector": { "enabled": false },
-    "spaceAfterPropertyColon": { "enabled": false },
     "spaceBetweenParens": { "enabled": false },
-    "universalSelector": { "enabled": false },
     "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 ?
+
+    // 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?
-    "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
+    "spaceAfterPropertyColon": { "enabled": true },
+    "finalNewline": { "enabled": true }, // require an empty line at the end of the file (enabled for now)
     "attributeQuotes": { "enabled": true },
     "depthLevel": {
         "depth": 1 // TODO(cjd) This is obviously not triggering, even with 1

customize.dist/src/less2/include/toolbar.less

@@ -310,7 +310,7 @@
         }
 
         &.cp-toolbar-notitle {
-            .cp-toolbar-top-filler {
+            .cp-toolbar-top-filler {
                 flex: 1;
             }
         }
@@ -319,7 +319,7 @@
                 @media screen and (max-width: @browser_media-medium-screen) {
                     flex-wrap: wrap;
                     height: auto;
-                    .cp-toolbar-top-filler {
+                    .cp-toolbar-top-filler {
                         flex: 1;
                     }
                     .cp-toolbar-title {

package.json

@@ -22,6 +22,8 @@
     "dev": "DEV=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: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",
     "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;"