From 07cd6a8b887cf39ed91b82ec4cf452357810f182 Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Tue, 11 Apr 2017 10:30:14 -0700 Subject: [PATCH] fix: set button font-size for modals Atlaskit at times will have localized styling for font-size and sometimes will not. The button component will inherit its font-size whereas selectors have localized font-size of 14px. For consistency, the cancel/submit buttons on the atlaskit modals will also have 14px. The atlaskit story book examples also use buttons with 14px font-size. --- css/_variables.scss | 5 +++++ css/modals/_dialog.scss | 4 ++++ react/features/base/dialog/components/Dialog.web.js | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/css/_variables.scss b/css/_variables.scss index ea480c8c1..e1e723382 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -79,6 +79,11 @@ $rateStarDefault: #ccc; $rateStarActivity: #165ecc; $rateStarSize: 34px; +/** + * Modals + */ +$modalButtonFontSize: 14px; + /** * Notifications */ diff --git a/css/modals/_dialog.scss b/css/modals/_dialog.scss index 4aa346a9f..264f09020 100644 --- a/css/modals/_dialog.scss +++ b/css/modals/_dialog.scss @@ -76,3 +76,7 @@ border-bottom: 1px solid $auiBorderColor; } } + +.modal-dialog-footer { + font-size: $modalButtonFontSize; +} diff --git a/react/features/base/dialog/components/Dialog.web.js b/react/features/base/dialog/components/Dialog.web.js index 9d53efe9f..ba67dbd09 100644 --- a/react/features/base/dialog/components/Dialog.web.js +++ b/react/features/base/dialog/components/Dialog.web.js @@ -93,7 +93,7 @@ class Dialog extends AbstractDialog { */ _renderFooter() { return ( -