merge: merge master

2017-03-22 17:08:28 +08:00
parent 6728837bb2 597d981f53
commit befabdcad1
50 changed files with 871 additions and 255 deletions
@@ -29,7 +29,7 @@
      padding: 45px;
    }

-    @m text {
+    @m text, html {
      padding: 12px;
      min-width: 200px;
    }