From 86b296a5f19c294c3c048cc203c7ab1e9b718ef2 Mon Sep 17 00:00:00 2001 From: Nikolaev Tomov Date: Wed, 7 Oct 2020 11:12:17 +0100 Subject: [PATCH 1/2] Add variables for custom form-group and label spacings --- src/less/inputs.less | 6 +++--- src/less/variables.less | 3 +++ src/ts/components/forms/form-group.examples.md | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/less/inputs.less b/src/less/inputs.less index 6c466cfa2..24cb76328 100644 --- a/src/less/inputs.less +++ b/src/less/inputs.less @@ -9,8 +9,8 @@ textarea { .form-group { position: relative; - margin-top: @margin-large; - margin-bottom: @margin-large; + margin-top: @form-group-margin; + margin-bottom: @form-group-margin; min-height: @checkbox-size; & > label, @@ -125,7 +125,7 @@ textarea { & > label:first-child, & > .label:first-child { - margin-bottom: @margin-base; + margin-bottom: @form-group-label-margin; } } } diff --git a/src/less/variables.less b/src/less/variables.less index b2773d3f5..196a47b8d 100644 --- a/src/less/variables.less +++ b/src/less/variables.less @@ -165,6 +165,9 @@ @code-block-name-background: contrast(@code-block-background, darken(@code-block-background, 5%), lighten(@code-block-background, 5%)); // lesshint maxCharPerLine: false @code-block-border: @border-base; +@form-group-margin: @margin-large; +@form-group-label-margin: @margin-base; + @input-group-addon-background: @grey-lightest; @input-border: @border-dark; diff --git a/src/ts/components/forms/form-group.examples.md b/src/ts/components/forms/form-group.examples.md index 4cf26e5b8..c7f2da7d2 100644 --- a/src/ts/components/forms/form-group.examples.md +++ b/src/ts/components/forms/form-group.examples.md @@ -56,6 +56,9 @@ #### Less variables ```less +@form-group-margin: @margin-large; +@form-group-label-margin: @margin-base; + @input-border: @border-dark; @input-width: 200px; @input-height: 32px; From b2eb8757cc57f493396afd79017c9511cf9ee0e9 Mon Sep 17 00:00:00 2001 From: Nikolaev Tomov Date: Wed, 7 Oct 2020 11:29:55 +0100 Subject: [PATCH 2/2] 0.11.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e165c89b..c844ea651 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@dabapps/roe", - "version": "0.11.2", + "version": "0.11.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b7f452e8a..9a9635b02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dabapps/roe", - "version": "0.11.2", + "version": "0.11.3", "description": "A collection of React components, styles, mixins, and atomic CSS classes to aid with the development of web applications.", "main": "dist/js/index.js", "types": "dist/js/index.d.ts",