Merge remote-tracking branch 'origin/develop' into develop

2017-09-17 21:38:35 +00:00 · 2017-09-17 21:38:35 +00:00 · aa6e68776c
parent c8ced6e360 662431043e
commit aa6e68776c
1 changed files with 10 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_UserSettings.scss
@ -80,6 +80,16 @@ limitations under the License.
    cursor: pointer;
 }

+.mx_UserSettings_button.mx_UserSettings_buttonSmall {
+    height: 36px;
+    padding: 4px;
+    padding-left: 7px;
+    padding-right: 7px;
+    font-size: 12px;
+    margin-right: 5px;
+    line-height: 12px;
+}
+
 .mx_UserSettings_button.danger {
    background-color: $warning-color;
 }