Merge branch 'master' into resize-header

_locales/en/messages.json

@@ -375,9 +375,6 @@
     },
     "description": "Title of the page for editing styles"
   },
-  "editorCodeLabel": {
-    "message": "Code"
-  },
   "editorSettings": {
     "message": "Editor settings"
   },
@@ -1661,9 +1658,6 @@
     "message": "As a security precaution, the browser prohibits extensions from affecting its built-in pages (like chrome://version, the standard new tab page as of Chrome 61, about:addons, and so on) as well as other extensions' pages. Each browser also restricts access to its own extensions gallery (like Chrome Web Store or AMO).",
     "description": "Sub-note in the toolbar pop-up when on a URL Stylus can't affect"
   },
-  "styleOriginLabel": {
-    "message": "Style origin"
-  },
   "styleUpdateUrlLabel": {
     "message": "Update URL"
   },

js/csslint/parserlib.js

@@ -4127,8 +4127,8 @@ self.parserlib = (() => {
       this.fire(event, property);
       if (consumeSemicolon) {
         while (stream.match(TT.semiS)) {/*NOP*/}
+        this._ws();
       }
-      this._ws();
       return true;
     }
 
@@ -4392,7 +4392,7 @@ self.parserlib = (() => {
               readMargins && this._margin() ||
               (tt && stream.unget(), this._declaration(true, Props)) ||
               (next = stream.LT(1)).value === ';' ||
-              this._ws(next, true)) {
+              this._ws(null, true)) {
             continue;
           }
           break;