From 7facc93205cd4d81a89034678be133eb6e345e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 20 Jun 2018 14:05:09 +0200 Subject: [PATCH] scss: add variables to control widget borders (#24667) --- help/fr/misc-scss.page | 10 ++++++++++ static/groupe-up/_custom.scss | 12 ------------ static/groupe-up/_vars.scss | 3 +++ static/includes/_forms.scss | 8 ++++++-- static/seine-et-marne-apa/_custom.scss | 12 ------------ static/seine-et-marne-apa/_vars.scss | 3 +++ static/tournai/_custom.scss | 1 - static/tournai/_vars.scss | 1 + 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/help/fr/misc-scss.page b/help/fr/misc-scss.page index e69b2e7..256dcb3 100644 --- a/help/fr/misc-scss.page +++ b/help/fr/misc-scss.page @@ -333,6 +333,16 @@ paramètre, la deuxième sa description et la troisième la valeur par défaut.

Taille de l'arrondi à appliquer aux boutons

$border-radius

+ +

$widget-border

+

Style de bordure des champs de formulaire (texte, liste…)

+

1px solid #AAA

+ + +

$widget-border-radius

+

Taille de l'arrondi à appliquer aux champs de formulaire (texte, liste…)

+

0

+ diff --git a/static/groupe-up/_custom.scss b/static/groupe-up/_custom.scss index a309915..04c8d51 100644 --- a/static/groupe-up/_custom.scss +++ b/static/groupe-up/_custom.scss @@ -404,18 +404,6 @@ div#content #disclose-dataview { margin-left: 0.5rem; } -input, input[type="text"], input[type="email"], input[type="password"], -input[type="url"], input[type="tel"], input[type="number"], -input[type="search"], input[type="file"], input[type="date"], -input[type="datetime-local"], input[type="month"], input[type="time"], -input[type="week"], textarea, select { - border-color: $lightblue; - border-radius: $button-border-radius; - &[readonly] { - border-radius: 0; - } -} - span.required { color: red; } diff --git a/static/groupe-up/_vars.scss b/static/groupe-up/_vars.scss index 804f393..f06a074 100644 --- a/static/groupe-up/_vars.scss +++ b/static/groupe-up/_vars.scss @@ -35,3 +35,6 @@ $table-headers-background: #1e7590; $table-headers-color: white; $very-small-limit: 800px; + +$widget-border: 1px solid $lightblue; +$widget-border-radius: $button-border-radius; diff --git a/static/includes/_forms.scss b/static/includes/_forms.scss index 0c1ea6f..783f0ea 100644 --- a/static/includes/_forms.scss +++ b/static/includes/_forms.scss @@ -8,6 +8,9 @@ $button-hover-background: $button-background !default; $button-hover-color: $button-color !default; $button-border-radius: $border-radius !default; +$widget-border: 1px solid #AAA !default; +$widget-border-radius: 0 !default; + /* $form-style: global style of form elements; possible values * are: * classic: nothing special. @@ -107,8 +110,8 @@ input[type=submit]:disabled { } input, input[type="text"], input[type="email"], input[type="password"], input[type="url"], input[type="tel"], input[type="number"], input[type="search"], input[type="file"], input[type="date"], input[type="datetime-local"], input[type="month"], input[type="time"], input[type="week"], textarea, select { - border: 1px solid #AAA; - border-radius: 0px; + border: $widget-border; + border-radius: $widget-border-radius; box-sizing: border-box; margin: 0.2em 0px; outline: medium none; @@ -118,6 +121,7 @@ input, input[type="text"], input[type="email"], input[type="password"], input[ty input[readonly], select[readonly], textarea[readonly] { border-width: 0 0 1px 0; + border-radius: 0; } select[readonly] { diff --git a/static/seine-et-marne-apa/_custom.scss b/static/seine-et-marne-apa/_custom.scss index a4507a8..edf4b3b 100644 --- a/static/seine-et-marne-apa/_custom.scss +++ b/static/seine-et-marne-apa/_custom.scss @@ -462,18 +462,6 @@ div#content #disclose-dataview { margin-left: 0.5rem; } -input, input[type="text"], input[type="email"], input[type="password"], -input[type="url"], input[type="tel"], input[type="number"], -input[type="search"], input[type="file"], input[type="date"], -input[type="datetime-local"], input[type="month"], input[type="time"], -input[type="week"], textarea, select { - border-color: $lightblue; - border-radius: $button-border-radius; - &[readonly] { - border-radius: 0; - } -} - span.required { color: red; } diff --git a/static/seine-et-marne-apa/_vars.scss b/static/seine-et-marne-apa/_vars.scss index cc0615c..29a7d7b 100644 --- a/static/seine-et-marne-apa/_vars.scss +++ b/static/seine-et-marne-apa/_vars.scss @@ -35,3 +35,6 @@ $table-headers-color: white; $very-small-limit: 800px; $grid-gutter: 0px; + +$widget-border: 1px solid $lightblue; +$widget-border-radius: $button-border-radius; diff --git a/static/tournai/_custom.scss b/static/tournai/_custom.scss index e13c994..8a27452 100644 --- a/static/tournai/_custom.scss +++ b/static/tournai/_custom.scss @@ -296,7 +296,6 @@ div#content div.cancel-button input { } input, input[type="text"], input[type="email"], input[type="password"], input[type="url"], input[type="tel"], input[type="number"], input[type="search"], input[type="date"], input[type="datetime-local"], input[type="month"], input[type="time"], input[type="week"], textarea, select { - border: 2px solid #b4b4b4; &:focus, &:active { border-color: $primary-color; diff --git a/static/tournai/_vars.scss b/static/tournai/_vars.scss index 67dcd22..8ef15b9 100644 --- a/static/tournai/_vars.scss +++ b/static/tournai/_vars.scss @@ -27,3 +27,4 @@ $category-toggled-background: $primary-color; $cell-border: none; $sidebar-width: 240px; $grid-gutter: 0px; +$widget-border: 2px solid #b4b4b4; -- 2.17.1