From f68dc5ca23cbd4019a84295c64c55b46f80484e4 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 15 Aug 2017 09:48:31 +0200 Subject: [PATCH] Starting to play with new form styles --- .gitignore | 3 +++ public/sass/_variables.dark.scss | 2 +- public/sass/components/_gf-form.scss | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0e6affc6120..cfa3a68c057 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ profile.cov /examples/*/dist /packaging/**/*.rpm /packaging/**/*.deb + +# Ignore OSX indexing +.DS_Store diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss index 8179d105690..9f9b508c141 100644 --- a/public/sass/_variables.dark.scss +++ b/public/sass/_variables.dark.scss @@ -166,7 +166,7 @@ $input-bg: $black; $input-bg-disabled: $dark-3; $input-color: $gray-4; -$input-border-color: $dark-4; +$input-border-color: $dark-3; $input-box-shadow: inset 1px 0px 0.3rem 0px rgba(150, 150, 150, 0.10); $input-border-focus: $input-border-color !default; $input-box-shadow-focus: rgba(102,175,233,.6) !default; diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss index c8d5f4d7315..bbf9d72084d 100644 --- a/public/sass/components/_gf-form.scss +++ b/public/sass/components/_gf-form.scss @@ -51,14 +51,13 @@ $gf-form-margin: 0.25rem; .gf-form-label { padding: $input-padding-y $input-padding-x; - margin-right: $gf-form-margin; flex-shrink: 0; font-weight: $font-weight-semi-bold; background-color: $input-label-bg; display: block; font-size: $font-size-sm; - margin-right: $gf-form-margin; + margin-right: 0; border: $input-btn-border-width solid transparent; @include border-radius($label-border-radius-sm); @@ -112,7 +111,8 @@ $gf-form-margin: 0.25rem; background-color: $input-bg; background-image: none; background-clip: padding-box; - border: $input-btn-border-width solid $input-border-color; + border: 1px solid $input-border-color; + border-bottom: 0px; @include border-radius($input-border-radius-sm); @include box-shadow($input-box-shadow); transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;