From 2e99d8be85c54c90afc1a385d8748a3c2d8bb573 Mon Sep 17 00:00:00 2001 From: Tony Air Date: Wed, 29 Apr 2020 14:48:09 +0700 Subject: [PATCH] Minor improvements --- src/scss/_components/_ui.main.scss | 37 +++++++++++++++--------------- src/scss/_variables.scss | 8 ++++++- src/scss/types/editor.scss | 4 ++++ 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/scss/_components/_ui.main.scss b/src/scss/_components/_ui.main.scss index 99903a6..5407d4c 100755 --- a/src/scss/_components/_ui.main.scss +++ b/src/scss/_components/_ui.main.scss @@ -1,6 +1,8 @@ /* * some basic styles */ + +@import '../_variables'; @import '../_animations'; .pulse { @@ -153,24 +155,6 @@ textarea, width: 100%; } } - -.message { - @extend .alert; - - @extend .alert-info; - - display: block; - margin: 0.5rem 0; -} - -.message.validation, -.message.required, -.message.error { - @extend .alert; - - @extend .alert-danger; -} - // element col paddings .col-block { padding-top: $col-block-gutter-height; @@ -187,10 +171,27 @@ textarea, } // SS-messages +.alert, +.alert-info, +.alert-danger { + display: block; +} + .message { @extend .alert; @extend .alert-info; + + display: block; + margin: 0.5rem 0; +} + +.message.validation, +.message.required, +.message.error { + @extend .alert; + + @extend .alert-danger; } .message.required, diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index c31f599..f3cce7a 100755 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -23,7 +23,13 @@ $container-max-widths: ( xxxxl: 1836px ) !default; -$font-family-base: 'Lato', sans-serif !default; +$font-family-sans-serif: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, + 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', + 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji' !default; +$font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, + 'Liberation Mono', 'Courier New', monospace !default; + +$font-family-base: 'Lato', $font-family-sans-serif !default; $font-size-base: 1rem !default; diff --git a/src/scss/types/editor.scss b/src/scss/types/editor.scss index 5552263..cfab728 100755 --- a/src/scss/types/editor.scss +++ b/src/scss/types/editor.scss @@ -4,6 +4,10 @@ $typography-breakpoint: map-get($grid-breakpoints, 'sm') - 1 !default; +a { + color: $link-color; +} + img, .captionImage, .image,