Merge branch 'master' into gdpr-username

This commit is contained in:
Kim Gardner authored and GitHub committed 2018-04-26 18:02:13 -04:00
commit 12d48d6248
2 files changed
+3 -3

No files matched your search

+2 -2
View File
@@ -177,8 +177,8 @@ button.comment__action-button[disabled],
}
.talk-plugin-flags-popup-header {
font-weight: bolder;
font-size: 1.33rem;
font-weight: bold;
font-size: 1rem;
margin-bottom: 10px;
}
+1 -1
View File
@@ -9,7 +9,7 @@
box-sizing: border-box;
background: white;
border-radius: 3px;
padding: 20px 10px;
padding: 10px 10px;
z-index: 300;
right: 1%;
}