From 271855d377b15ddd3058cc2b3029780080c0afde Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Wed, 12 Jun 2019 17:56:30 +0200 Subject: [PATCH] :art: meilleur gestion des textes couleur claire --- source/components/ui/Typography.css | 4 ++-- source/components/ui/index.css | 5 ----- source/components/utils/withColours.js | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source/components/ui/Typography.css b/source/components/ui/Typography.css index bc62be1af..c15e30b91 100644 --- a/source/components/ui/Typography.css +++ b/source/components/ui/Typography.css @@ -121,6 +121,6 @@ textarea { small, .ui__.notice { color: rgba(0, 0, 0, 0.6); - color: var(--darkerColour); - opacity: 0.7; + color: var(--lighterTextColour); + font-size: 85%; } diff --git a/source/components/ui/index.css b/source/components/ui/index.css index de2a7f861..9a0e67bba 100644 --- a/source/components/ui/index.css +++ b/source/components/ui/index.css @@ -72,11 +72,6 @@ section.ui__:not(:first-of-type) { } } -.ui__.notice { - font-size: 85%; - color: rgba(0, 0, 0, 0.6); - color: var(--darkColour); -} .ui__ .colored-bg { background: var(--lightestColour); } diff --git a/source/components/utils/withColours.js b/source/components/utils/withColours.js index f1cc85d18..17822c1a4 100644 --- a/source/components/utils/withColours.js +++ b/source/components/utils/withColours.js @@ -68,7 +68,7 @@ const generateTheme = (themeColour?: ?string): ThemeColours => { textColour === '#ffffff' ? 'rgba(255, 255, 255, .6)' : 'rgba(0, 0, 0, .6)', - lighterTextColour = lightenTextColour(textColour), + lighterTextColour = darkColour + '99', lighterInverseTextColour = lightenTextColour(inverseTextColour), textColourOnWhite = textColour === '#ffffff' ? colour : '#333'