Commit 70f28cf3 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/377-dev-fonts-terms-rc0.x' into dev

parents 2ba8fd1a 6d4781c5
Pipeline #2908 failed with stage
in 0 seconds
...@@ -9000,7 +9000,7 @@ select.form-control { ...@@ -9000,7 +9000,7 @@ select.form-control {
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.candidate-term { .b-icon.candidate-term {
color: #5a90b6; color: #5A90B6;
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.stop-term { .b-icon.stop-term {
......
...@@ -8953,7 +8953,7 @@ select.form-control { ...@@ -8953,7 +8953,7 @@ select.form-control {
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.candidate-term { .b-icon.candidate-term {
color: #5a90b6; color: #5A90B6;
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.stop-term { .b-icon.stop-term {
......
...@@ -8709,7 +8709,7 @@ select.form-control { ...@@ -8709,7 +8709,7 @@ select.form-control {
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.candidate-term { .b-icon.candidate-term {
color: #5a90b6; color: #5A90B6;
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.stop-term { .b-icon.stop-term {
......
...@@ -8957,7 +8957,7 @@ select.form-control { ...@@ -8957,7 +8957,7 @@ select.form-control {
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.candidate-term { .b-icon.candidate-term {
color: #5a90b6; color: #5A90B6;
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.stop-term { .b-icon.stop-term {
......
...@@ -8958,7 +8958,7 @@ select.form-control { ...@@ -8958,7 +8958,7 @@ select.form-control {
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.candidate-term { .b-icon.candidate-term {
color: #5a90b6; color: #5A90B6;
text-shadow: 0 0 4px; text-shadow: 0 0 4px;
} }
.b-icon.stop-term { .b-icon.stop-term {
......
...@@ -299,10 +299,20 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt ...@@ -299,10 +299,20 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
termStyle :: GT.TermList -> Number -> DOM.Props termStyle :: GT.TermList -> Number -> DOM.Props
termStyle GT.MapTerm opacity = DOM.style { color: "green", opacity } termStyle GT.MapTerm opacity = DOM.style
termStyle GT.StopTerm opacity = DOM.style { color: "red", opacity { color: "#11AA11"
, textDecoration: "line-through" } , opacity
termStyle GT.CandidateTerm opacity = DOM.style { color: "#767676", opacity } }
termStyle GT.StopTerm opacity = DOM.style
{ color: "#EE3311"
, opacity
, textDecoration: "line-through"
}
termStyle GT.CandidateTerm opacity = DOM.style
{ color: "#5A90B6"
, fontStyle: "italic"
, opacity
}
tablePatchHasNgrams :: NgramsTablePatch -> NgramsTerm -> Boolean tablePatchHasNgrams :: NgramsTablePatch -> NgramsTerm -> Boolean
tablePatchHasNgrams ngramsTablePatch ngrams = tablePatchHasNgrams ngramsTablePatch ngrams =
......
$annotation-graph-color : #11AA11; $annotation-graph-color : #11AA11;
// $annotation-candidate-color : #33AAEE; // $annotation-candidate-color : #33AAEE;
$annotation-candidate-color : rgb(90, 144, 182); $annotation-candidate-color : #5A90B6;
$annotation-stop-color : #EE3311; $annotation-stop-color : #EE3311;
$annotation-field-base-alpha: 17.5%; $annotation-field-base-alpha: 17.5%;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment