Merging master
This commit is contained in:
commit
b329bbbdb3
4 changed files with 9 additions and 3 deletions
2
State.ts
2
State.ts
|
@ -22,7 +22,7 @@ export default class State {
|
|||
// The singleton of the global state
|
||||
public static state: State;
|
||||
|
||||
public static vNumber = "0.1.2e";
|
||||
public static vNumber = "0.1.2f";
|
||||
|
||||
// The user journey states thresholds when a new feature gets unlocked
|
||||
public static userJourney = {
|
||||
|
|
|
@ -35,11 +35,14 @@ export default class EditableTagRendering extends UIElement {
|
|||
|
||||
if (this._configuration.question !== undefined) {
|
||||
// 2.3em total width
|
||||
if(State.state.featureSwitchUserbadge.data){
|
||||
|
||||
this._editButton =
|
||||
Svg.pencil_ui().SetClass("edit-button")
|
||||
.onClick(() => {
|
||||
self._editMode.setData(true);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
// And at last, set up the skip button
|
||||
|
|
|
@ -34,6 +34,9 @@ export class FeatureInfoBox extends UIElement {
|
|||
layerConfig.titleIcons.map(icon => new TagRenderingAnswer(tags, icon)))
|
||||
.SetClass("featureinfobox-icons");
|
||||
this._renderings = layerConfig.tagRenderings.map(tr => new EditableTagRendering(tags, tr));
|
||||
if (State.state.featureSwitchUserbadge.data) {
|
||||
this._questionBox = new QuestionBox(tags, layerConfig.tagRenderings);
|
||||
}
|
||||
}
|
||||
|
||||
InnerRender(): string {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14">
|
||||
<g id="hbars">
|
||||
<rect x="1" y="6" width="11" height="0.5" style="fill:#ac39ac"/>
|
||||
|
@ -13,4 +13,4 @@
|
|||
<path id="handle" d="M5.9,4 L7.9,1 A 0.5,0.5 0 0,1 8.83,1.4 L 7.1,4 Z" style="fill:#ac39ac;stroke:none"/>
|
||||
<path id="body" fill-rule="evenodd" d="M 0,4 L 13,4 11,11 2,11 Z
|
||||
M 1.25,5 L 11.75,5 10.25,10 2.75,10 Z" style="fill:#ac39ac;stroke:none"/>
|
||||
</svg>
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 838 B |
Loading…
Reference in a new issue