From 714a52f232252aacc7e7b3ce5c8139bd1bf73211 Mon Sep 17 00:00:00 2001 From: codecalm Date: Sun, 15 Dec 2019 23:03:56 +0100 Subject: [PATCH] forms fixes --- scss/_variables.scss | 10 +++++----- scss/layout/_core.scss | 6 ------ scss/ui/forms/_form-custom.scss | 11 +++++++++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 03e1dc21..1942b420 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -5,7 +5,7 @@ $enable-extra-colors: true !default; $enable-gradients: false !default; // FONTS -$google-font: "Source Sans Pro" !default; +$google-font: "Nunito" !default; $font-family-sans-serif: $google-font, -apple-system, blinkmacsystemfont, segoe ui, helvetica, arial, sans-serif, apple color emoji, segoe ui emoji, segoe ui symbol !default; $font-family-serif: "Georgia", "Times New Roman", times, serif !default; @@ -317,15 +317,15 @@ $input-border-radius: $border-radius !default; //Forms -$form-check-input-width: (16em/15) !default; -$form-check-padding-left: $form-check-input-width + .5em !default; +$form-check-input-width: 1rem !default; +$form-check-padding-left: $form-check-input-width + .5rem !default; $form-check-input-bg: $white !default; $form-check-input-border: 1px solid $border-color !default; $form-check-input-border-radius: $border-radius !default; $form-check-input-checked-bg-size: .75rem !default; -$form-switch-width: (28em/15) !default; -$form-switch-padding-left: $form-switch-width + .5em !default; +$form-switch-width: 1.75rem !default; +$form-switch-padding-left: $form-switch-width + .5rem !default; $form-range-track-height: .25rem !default; diff --git a/scss/layout/_core.scss b/scss/layout/_core.scss index 3507defe..4b95dfc6 100644 --- a/scss/layout/_core.scss +++ b/scss/layout/_core.scss @@ -21,9 +21,3 @@ body { } } -/** -Remove the cancel buttons in Chrome and Safari on macOS. - */ -[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} diff --git a/scss/ui/forms/_form-custom.scss b/scss/ui/forms/_form-custom.scss index cde59059..8f6abf71 100644 --- a/scss/ui/forms/_form-custom.scss +++ b/scss/ui/forms/_form-custom.scss @@ -1,14 +1,21 @@ - /** Bootstrap color input */ - .form-control-color { &::-webkit-color-swatch { border: none; } } +/** +Remove the cancel buttons in Chrome and Safari on macOS. + */ +[type="search"]::-webkit-search-cancel-button { + -webkit-appearance: none; +} + + .form-check-input { + margin-top: .25rem; transition: .3s background-position, .3s background-color; } -- GitLab