Resolve #152: Don't elide pick 1 where slot repetition is used.

This commit is contained in:
Gareth Latty
2020-05-30 17:24:49 +01:00
parent e5cfdb16cd
commit a8cd92fec7
2 changed files with 8 additions and 5 deletions
+7 -4
View File
@@ -82,7 +82,10 @@ instructions shared rules parts =
Parts.slotCount parts
instructionViews =
List.concat [ extraCardsInstruction shared rules slots, pickInstruction shared slots ]
List.concat
[ extraCardsInstruction shared rules slots
, pickInstruction shared slots (Parts.nonObviousSlotIndices parts)
]
in
[ Html.ol [ HtmlA.class "instructions" ] instructionViews ]
|> Maybe.justIf (List.length instructionViews > 0)
@@ -104,8 +107,8 @@ extraCardsInstruction shared rules slots =
[]
pickInstruction : Shared -> Int -> List (Html msg)
pickInstruction shared slots =
pickInstruction : Shared -> Int -> Bool -> List (Html msg)
pickInstruction shared slots nonObviousSlotIndices =
[ Html.li [] [ Pick { numberOfCards = slots } |> Lang.html shared ] ]
|> Maybe.justIf (slots > 1)
|> Maybe.justIf (slots > 1 || nonObviousSlotIndices)
|> Maybe.withDefault []
+1 -1
View File
@@ -35,7 +35,7 @@ $response-background: $call-color;
margin: 0;
}
.capitalize::first-letter {
.capitalize:first-child {
text-transform: capitalize;
}