Merge branch 'master' into no-ls

2017-02-18 16:33:39 +09:00 · 2017-02-18 16:33:39 +09:00 · 1feebc6a0b
parent cedeba580e 7f43574679
commit 1feebc6a0b
2 changed files with 2 additions and 1 deletions
--- a/package.json
+++ b/package.json
@ -58,6 +58,7 @@
    "@types/redis": "0.12.36",
    "@types/request": "0.0.40",
    "@types/rimraf": "0.0.28",
+    "@types/riot": "2.6.1",
    "@types/serve-favicon": "2.2.28",
    "@types/twitter": "0.0.28",
    "@types/uuid": "2.0.29",
--- a/src/web/app/desktop/tags/user-preview.tag
+++ b/src/web/app/desktop/tags/user-preview.tag
@ -53,7 +53,7 @@

 			> .title
 				display block
-				padding 8px 0 8px 85px
+				padding 8px 0 8px 82px

 				> .name
 					display block