[sling-org-apache-sling-app-cms] branch master updated: Fixing where the editor was taking the web page font over Open-Sans and fixing some box sizing issues

[dklco]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new ce2ad6d  Fixing where the editor was taking the web page font over 
Open-Sans and fixing some box sizing issues
ce2ad6d is described below

commit ce2ad6da17c7cc00260ffda5b9bb44e7bec6148d
Author: Dan Klco <dk...@apache.org>
AuthorDate: Sun Mar 24 10:26:46 2019 -0400

    Fixing where the editor was taking the web page font over Open-Sans and
    fixing some box sizing issues
---
 ui/src/main/frontend/src/scss/editor.scss | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ui/src/main/frontend/src/scss/editor.scss 
b/ui/src/main/frontend/src/scss/editor.scss
index 53517b6..60f9a7c 100644
--- a/ui/src/main/frontend/src/scss/editor.scss
+++ b/ui/src/main/frontend/src/scss/editor.scss
@@ -16,9 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+@import 'fonts';
 .sling-cms-editor {
-    @import 'fonts';
     @import 'overrides';
     @import "../../node_modules/bulma/sass/utilities/_all.sass";
     @import "../../node_modules/bulma/sass/base/_all.sass";
@@ -28,6 +27,10 @@
     @import "../../node_modules/bulma/sass/elements/icon.sass";
     @import "../../node_modules/bulma/sass/components/level.sass";
     @import "../../node_modules/bulma/sass/components/modal.sass";
+    font-family: "Open Sans",sans-serif;
+    * {
+        box-sizing: border-box;
+    }
     .is-draggable {
         position: relative;
     }