From 3f12c65efcaa678e6e8721461387ca5f497caf89 Mon Sep 17 00:00:00 2001 From: Thomas JUND Date: Fri, 17 Jan 2020 15:55:30 +0100 Subject: [PATCH] scss: remove duplicate $border-radius declaration (#39073) --- help/fr/misc-scss.page | 2 +- static/alpes-maritimes-2018/_vars.scss | 1 + static/bouches-du-rhone/_vars.scss | 1 + static/clermont-metropole/_vars.scss | 1 + static/fontenay-sous-bois-2018/_vars.scss | 1 + static/gers-cd32/_vars.scss | 1 + static/hellemmes/_vars.scss | 1 + static/includes/_general.scss | 2 +- static/includes/_nav.scss | 1 - static/lille/_vars.scss | 1 + static/lomme/_vars.scss | 1 + static/metz-metropole-2019/_vars.scss | 1 + static/montreuil/_vars.scss | 1 + static/nancy-en-direct/_vars.scss | 1 + static/quimper/_vars.scss | 2 +- static/saint-denis/_vars.scss | 1 + static/saone-et-loire-cd71-2019/_vars.scss | 1 + static/sens/_vars.scss | 1 + static/thonon-agglomeration/_vars.scss | 2 +- static/toulouse-metropole/_vars.scss | 1 + static/toulouse/_vars.scss | 1 + static/tours-metropole/_vars.scss | 1 + static/vendargues/_vars.scss | 1 + static/venissieux/_vars.scss | 1 + 24 files changed, 23 insertions(+), 5 deletions(-) diff --git a/help/fr/misc-scss.page b/help/fr/misc-scss.page index 60cfa71d..740dd75c 100644 --- a/help/fr/misc-scss.page +++ b/help/fr/misc-scss.page @@ -65,7 +65,7 @@ paramètre, la deuxième sa description et la troisième la valeur par défaut.

$border-radius

Taille de l'arrondi à appliquer à différents éléments

-

0

+

null

$sidebar-position

diff --git a/static/alpes-maritimes-2018/_vars.scss b/static/alpes-maritimes-2018/_vars.scss index 41a9efbc..3d3ce851 100644 --- a/static/alpes-maritimes-2018/_vars.scss +++ b/static/alpes-maritimes-2018/_vars.scss @@ -1,3 +1,4 @@ +$border-radius: 3px; $width: 1280px; $font-family: Roboto, sans-serif; $font-size: 16px; diff --git a/static/bouches-du-rhone/_vars.scss b/static/bouches-du-rhone/_vars.scss index ba5a57e0..8223b367 100644 --- a/static/bouches-du-rhone/_vars.scss +++ b/static/bouches-du-rhone/_vars.scss @@ -7,6 +7,7 @@ $font-color: black; $second-blue: #0a52ab; $blue-grey: #778ab4; +$border-radius: 3px; $link-color: $primary-color; $width: 1400px; diff --git a/static/clermont-metropole/_vars.scss b/static/clermont-metropole/_vars.scss index 8954de08..9124b006 100644 --- a/static/clermont-metropole/_vars.scss +++ b/static/clermont-metropole/_vars.scss @@ -1,5 +1,6 @@ @import '../includes/font-cabin'; +$border-radius: 3px; $body-background: transparent; $font-family: Cabin, sans-serif; $font-size: 16px; diff --git a/static/fontenay-sous-bois-2018/_vars.scss b/static/fontenay-sous-bois-2018/_vars.scss index 19489922..aa3e3f86 100644 --- a/static/fontenay-sous-bois-2018/_vars.scss +++ b/static/fontenay-sous-bois-2018/_vars.scss @@ -1,3 +1,4 @@ +$border-radius: 3px; $primary-color: #da3838; $font-size: 20px; $font-family: "Barlow Condensed", sans-serif; diff --git a/static/gers-cd32/_vars.scss b/static/gers-cd32/_vars.scss index fac6677f..65514e4e 100644 --- a/static/gers-cd32/_vars.scss +++ b/static/gers-cd32/_vars.scss @@ -2,6 +2,7 @@ $primary-color: #ae2217; $secondary-color: #f4f4f4; $tertiary-color: #0f183b; +$border-radius: 3px; $font-size: 20px; $font-family: Montserrat, sans-serif; $link-color: $primary-color; diff --git a/static/hellemmes/_vars.scss b/static/hellemmes/_vars.scss index abeab7da..e50e1942 100644 --- a/static/hellemmes/_vars.scss +++ b/static/hellemmes/_vars.scss @@ -2,6 +2,7 @@ $primary-color: #97c038; +$border-radius: 3px; $link-color: $primary-color; $nav-active-color: $primary-color; $carrousel-navigation-bullet-color: $primary-color; diff --git a/static/includes/_general.scss b/static/includes/_general.scss index ac5ef195..db491e25 100644 --- a/static/includes/_general.scss +++ b/static/includes/_general.scss @@ -1,4 +1,4 @@ -$border-radius: 3px !default; +$border-radius: null !default; $font-color: #333 !default; $font-family: sans-serif !default; $font-size: 100% !default; diff --git a/static/includes/_nav.scss b/static/includes/_nav.scss index eb5bf977..57b8869b 100644 --- a/static/includes/_nav.scss +++ b/static/includes/_nav.scss @@ -33,7 +33,6 @@ $nav-mobile-menu-item-color: black !default; $nav-mobile-menu-item-hover-background: $nav-item-hover-background !default; $nav-mobile-menu-item-hover-color: $nav-item-hover-color !default; $nav-item-spacing: 0px !default; -$border-radius: 0 !default; $responsive-menu: top-to-bottom !default; // or left-to-right $nav-after-image: true !default; diff --git a/static/lille/_vars.scss b/static/lille/_vars.scss index d554fbc3..7a85458b 100644 --- a/static/lille/_vars.scss +++ b/static/lille/_vars.scss @@ -1,5 +1,6 @@ @import '../includes/font-lato'; +$border-radius: 3px; $primary-color: #e1001a; $font-color: #1a1a1a; $font-size: 20px; diff --git a/static/lomme/_vars.scss b/static/lomme/_vars.scss index 3e1a21b1..57045176 100644 --- a/static/lomme/_vars.scss +++ b/static/lomme/_vars.scss @@ -2,6 +2,7 @@ $primary-color: #009ead; +$border-radius: 3px; $link-color: $primary-color; $nav-active-color: $primary-color; $carrousel-navigation-bullet-color: $primary-color; diff --git a/static/metz-metropole-2019/_vars.scss b/static/metz-metropole-2019/_vars.scss index c139b442..acd3a93d 100644 --- a/static/metz-metropole-2019/_vars.scss +++ b/static/metz-metropole-2019/_vars.scss @@ -6,6 +6,7 @@ $yellow: #fcc14b; $green: #37bd9c; +$border-radius: 3px; $font-family: "Now Alt", sans-serif; $primary-color: $darkblue; $link-color: $blue; diff --git a/static/montreuil/_vars.scss b/static/montreuil/_vars.scss index 82e6d286..abc6391c 100644 --- a/static/montreuil/_vars.scss +++ b/static/montreuil/_vars.scss @@ -1,5 +1,6 @@ $primary-color: #243b48; $secondary-color: #d8a040; +$border-radius: 3px; $width: 1200px; $white: #ffffff; $font-family: 'Montserrat', sans-serif; diff --git a/static/nancy-en-direct/_vars.scss b/static/nancy-en-direct/_vars.scss index 3140bd0d..cbb6ae6a 100644 --- a/static/nancy-en-direct/_vars.scss +++ b/static/nancy-en-direct/_vars.scss @@ -1,3 +1,4 @@ +$border-radius: 3px; $primary-color: #f15252; $width: 960px; $font-family: Poppins, sans-serif; diff --git a/static/quimper/_vars.scss b/static/quimper/_vars.scss index 22751e24..5c5bdc1e 100644 --- a/static/quimper/_vars.scss +++ b/static/quimper/_vars.scss @@ -8,7 +8,7 @@ $mauve: #3c4393; $altgreen: #16c4b3; - +$border-radius: 3px; $font-family: Roboto, sans-serif; $primary-color: $green; $mobile-limit: 800px; diff --git a/static/saint-denis/_vars.scss b/static/saint-denis/_vars.scss index 62f22552..e0514062 100644 --- a/static/saint-denis/_vars.scss +++ b/static/saint-denis/_vars.scss @@ -1,3 +1,4 @@ +$border-radius: 3px; $primary-color: #ff6633; $secondary-color: #ff9966; $tertiary-color: #ecebe7; diff --git a/static/saone-et-loire-cd71-2019/_vars.scss b/static/saone-et-loire-cd71-2019/_vars.scss index 97fab0a3..0c6efaf8 100644 --- a/static/saone-et-loire-cd71-2019/_vars.scss +++ b/static/saone-et-loire-cd71-2019/_vars.scss @@ -5,6 +5,7 @@ $blue: #179ad6; $green: #90c641; $primary-color: #179ad6; +$border-radius: 3px; $font-size: 20px; $font-family: "Roboto", sans-serif; $link-color: $primary-color; diff --git a/static/sens/_vars.scss b/static/sens/_vars.scss index c936e263..d1d66278 100644 --- a/static/sens/_vars.scss +++ b/static/sens/_vars.scss @@ -3,6 +3,7 @@ $primary-color: #008cd1; $secondary-color: #f8db1c; $tertiary-color: #006597; +$border-radius: 3px; $cell-border: none; $width: 960px; diff --git a/static/thonon-agglomeration/_vars.scss b/static/thonon-agglomeration/_vars.scss index cafdee62..4b0a3b7d 100644 --- a/static/thonon-agglomeration/_vars.scss +++ b/static/thonon-agglomeration/_vars.scss @@ -2,7 +2,7 @@ $font-color: #222; $link-color: #253a8e; $font-family: "Roboto", sans-serif; // "Roboto", Gill Sans, sans-serif; $footer-background: #1c1b19; -// $border-radius: 8px; +$border-radius: 3px; $title-background: #fec307; $title-color: #222; diff --git a/static/toulouse-metropole/_vars.scss b/static/toulouse-metropole/_vars.scss index 3c9f2cae..670a4972 100644 --- a/static/toulouse-metropole/_vars.scss +++ b/static/toulouse-metropole/_vars.scss @@ -2,6 +2,7 @@ $orange: #ff6900; $violet: #da0068; $primary-color: $orange; +$border-radius: 3px; $font-family: AauxPro, Arial, Helvetica, sans-serif; $width: auto; $font-color: #666; diff --git a/static/toulouse/_vars.scss b/static/toulouse/_vars.scss index 03570c01..64a8e136 100644 --- a/static/toulouse/_vars.scss +++ b/static/toulouse/_vars.scss @@ -1,5 +1,6 @@ $primary-color: #de3559; +$border-radius: 3px; $font-family: Montserrat, Arial, sans-serif; $width: auto; $font-color: #666; diff --git a/static/tours-metropole/_vars.scss b/static/tours-metropole/_vars.scss index b1089bc2..b7999b39 100644 --- a/static/tours-metropole/_vars.scss +++ b/static/tours-metropole/_vars.scss @@ -1,4 +1,5 @@ $primary-color: #08fe00; +$border-radius: 3px; $width: 1170px; $font-color: black; diff --git a/static/vendargues/_vars.scss b/static/vendargues/_vars.scss index aa9c9a00..f6d8c0ee 100644 --- a/static/vendargues/_vars.scss +++ b/static/vendargues/_vars.scss @@ -1,5 +1,6 @@ $yellow: #ffba00; $primary-color: $yellow; +$border-radius: 3px; $font-family: Arial, sans-serif; $font-size: 15px; $width: 1200px; diff --git a/static/venissieux/_vars.scss b/static/venissieux/_vars.scss index f115b24f..46a952dc 100644 --- a/static/venissieux/_vars.scss +++ b/static/venissieux/_vars.scss @@ -1,3 +1,4 @@ +$border-radius: 3px; $primary-color: #3795b2; $secondary-color: #ed0f53; $font-size: 16px;