diff --git a/source/components/Simulateur.css b/source/components/Simulateur.css
index f317fd875..b6e8d3711 100644
--- a/source/components/Simulateur.css
+++ b/source/components/Simulateur.css
@@ -99,7 +99,7 @@
}
#foldedSteps .header button {
font-size: 80%;
- color: #4A89DC;
+ color: #2975D1;
border: none;
}
#foldedSteps .header button i {
diff --git a/source/components/Simulateur.js b/source/components/Simulateur.js
index 3d6e92165..335355d3e 100644
--- a/source/components/Simulateur.js
+++ b/source/components/Simulateur.js
@@ -62,7 +62,7 @@ export default class extends Component {
let
{started} = this.state,
- {foldedSteps, extraSteps, unfoldedSteps, situation, situationGate} = this.props,
+ {foldedSteps, extraSteps, unfoldedSteps, situation, situationGate, themeColours} = this.props,
sim = path =>
R.path(R.unless(R.is(Array), R.of)(path))(this.rule.simulateur || {}),
reinitalise = () => {
@@ -97,7 +97,8 @@ export default class extends Component {
}
{ (started || !sim(['introduction', 'notes'])) &&
-
+
}
diff --git a/source/components/conversation/Conversation.js b/source/components/conversation/Conversation.js
index fdb5f6d40..1818956df 100644
--- a/source/components/conversation/Conversation.js
+++ b/source/components/conversation/Conversation.js
@@ -11,7 +11,7 @@ import Scroll from 'react-scroll'
})
export default class Conversation extends Component {
render() {
- let {foldedSteps, unfoldedSteps, extraSteps, reinitalise, situation, situationGate} = this.props
+ let {foldedSteps, unfoldedSteps, extraSteps, reinitalise, situation, situationGate, textColourOnWhite} = this.props
Scroll.animateScroll.scrollToBottom()
return (
@@ -21,7 +21,7 @@ export default class Conversation extends Component {
Vos réponses
-
- {this.renderSuggestions()}
+ {this.renderSuggestions(themeColours)}
{inputError &&
{error}}
)
}
- renderSuggestions(){
+ renderSuggestions(themeColours){
let {setFormValue, submit, suggestions} = this.props.stepProps
if (!suggestions) return null
return (
@@ -69,7 +69,8 @@ export default class Input extends Component {
setFormValue('' + value) && submit() && e.preventDefault()}
onMouseOver={() => setFormValue('' + value) && this.setState({suggestedInput: true})}
- onMouseOut={() => setFormValue('') && this.setState({suggestedInput: false})}>
+ onMouseOut={() => setFormValue('') && this.setState({suggestedInput: false})}
+ style={{color: themeColours.colour}}>
{text}
)}
diff --git a/source/components/conversation/conversation.css b/source/components/conversation/conversation.css
index 0bc712968..d95880a89 100644
--- a/source/components/conversation/conversation.css
+++ b/source/components/conversation/conversation.css
@@ -305,13 +305,10 @@ fieldset > .ignore {
margin-left: .6em;
}
.step .inputSuggestions a {
- color: #4A89DC;
padding: .1em .6em;
font-weight: 600;
}
.step .inputSuggestions a:hover {
- background: #4A89DC;
- color: white;
text-decoration: none;
}
diff --git a/source/components/themeColours.js b/source/components/themeColours.js
index 612d3e698..77d708dc2 100644
--- a/source/components/themeColours.js
+++ b/source/components/themeColours.js
@@ -7,7 +7,7 @@ export default forcedThemeColour => {
return script && script.getAttribute('couleur')
},
// Use the default theme colour if the host page hasn't made a choice
- defaultColour = '#4A89DC',
+ defaultColour = '#2975D1',
colour = forcedThemeColour || scriptColour() || defaultColour,
textColour = findContrastedTextColour(colour, true), // the 'simple' version feels better...
inverseTextColour = textColour === '#ffffff' ? '#000' : '#fff',