@@ -16,7 +16,6 @@ module Internal.Model exposing
16 , LayoutContext(..)
16 , LayoutContext(..)
17 , Length(..)
17 , Length(..)
18 , Location(..)
18 , Location(..)
20 , NodeName(..)
19 , NodeName(..)
21 , Option(..)
20 , Option(..)
22 , OptionRecord
21 , OptionRecord
@@ -42,7 +41,7 @@ module Internal.Model exposing
42 , asParagraph
41 , asParagraph
44 , asTextColumn
43 , asTextColumn
45− , boxShadowClass
44+ , boxShadowName
46 , columnClass
45 , columnClass
47 , composeTransformation
46 , composeTransformation
48 , contextClasses
47 , contextClasses
@@ -79,30 +78,31 @@ module Internal.Model exposing
79 , onlyStyles
78 , onlyStyles
80 , optionsToRecord
79 , optionsToRecord
81 , paddingName
80 , paddingName
83 , pageClass
81 , pageClass
84 , paragraphClass
82 , paragraphClass
85 , reduceRecursive
83 , reduceRecursive
86 , reduceStyles
84 , reduceStyles
87 , reduceStylesRecursive
85 , reduceStylesRecursive
88 , removeNever
86 , removeNever
89 , renderFontClassName
90 , renderFontClassName
90 , renderHeight
91 , renderHeight
91 , renderRoot
92 , renderRoot
93 , renderWidth
93 , renderWidth
94 , rootStyle
94 , rootStyle
95 , rowClass
95 , rowClass
96 , singleClass
96 , singleClass
97 , spacingName
97 , spacingName
99− , textShadowClass
100+ , textShadowName
101 , toStyleSheet
102 , toStyleSheet
102 , transformClass
103 , transformClass
103 , unstyled
104 , unstyled
104 , unwrapDecorations
105 , unwrapDecorations
@@ -112,7 +112,7 @@ import Html.Attributes
112import Html.Keyed
112import Html.Keyed
113import Internal.Flag as Flag exposing (Flag)
113import Internal.Flag as Flag exposing (Flag)
114import Internal.Style exposing (classes, dot)
114import Internal.Style exposing (classes, dot)
115−import Json.Encode as Encode
115+import Json.Encode as Json
116import Set exposing (Set)
116import Set exposing (Set)
117import VirtualDom
117import VirtualDom
@@ -174,7 +174,7 @@ type Style
174 | Colored String String Color
174 | Colored String String Color
175 | SpacingStyle String Int Int
175 | SpacingStyle String Int Int
176 | BorderWidth String Int Int Int Int
176 | BorderWidth String Int Int Int Int
177− | PaddingStyle String Float Float Float Float
177+ | PaddingStyle String Int Int Int Int
178 | GridTemplateStyle
178 | GridTemplateStyle
179 { spacing : ( Length, Length )
179 { spacing : ( Length, Length )
180 , columns : List Length
180 , columns : List Length
@@ -222,7 +222,8 @@ type Font
222 | ImportFont String String
222 | ImportFont String String
223 | FontWith
223 | FontWith
224 { name : String
224 { name : String
225+ , url : Maybe String
225− , adjustment : Maybe Adjustment
226+ , adjustment : Adjustment
226 , variants : List Variant
227 , variants : List Variant
@@ -245,46 +246,13 @@ renderVariant var =
245 "\"" ++ name ++ "\" " ++ String.fromInt index
246 "\"" ++ name ++ "\" " ++ String.fromInt index
250− VariantActive name ->
256− VariantIndexed name index ->
257− name ++ "-" ++ String.fromInt index
260renderVariants typeface =
249renderVariants typeface =
261 case typeface of
250 case typeface of
262 FontWith font ->
251 FontWith font ->
263− Just (String.join ", " (List.map renderVariant font.variants))
252+ String.join ", " (List.map renderVariant font.variants)
271− VariantActive name ->
277− VariantIndexed name index ->
278− name == "smcp" && index == 1
281−hasSmallCaps typeface =
284− List.any isSmallCaps font.variants
290type Property
258type Property
@@ -372,13 +340,6 @@ type NodeName
372 | Embedded String String
340 | Embedded String String
375−type NearbyChildren msg
377− | ChildrenBehind (List (Html.Html msg))
378− | ChildrenInFront (List (Html.Html msg))
379− | ChildrenBehindAndInFront (List (Html.Html msg)) (List (Html.Html msg))
@@ -387,7 +348,7 @@ type alias Gathered msg =
387 { node : NodeName
348 { node : NodeName
388 , attributes : List (VirtualDom.Attribute msg)
349 , attributes : List (VirtualDom.Attribute msg)
389 , styles : List Style
350 , styles : List Style
390− , children : NearbyChildren msg
351+ , children : List (VirtualDom.Node msg)
391 , has : Flag.Field
352 , has : Flag.Field
@@ -455,10 +416,7 @@ finalizeNode has node attributes children embedMode parentContext =
455 Embedded nodeName internal ->
416 Embedded nodeName internal ->
456 VirtualDom.node nodeName
417 VirtualDom.node nodeName
457 attributes
418 attributes
458− [ createNode internal
459− [ Html.Attributes.class
460− (classes.any ++ " " ++ classes.single)
419+ [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
464 case parentContext of
422 case parentContext of
@@ -535,45 +493,49 @@ finalizeNode has node attributes children embedMode parentContext =
537embedWith static opts styles children =
495embedWith static opts styles children =
541− |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
543− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
545− |> toStyleSheet opts
547 if static then
496 if static then
548− staticRoot opts
497+ staticRoot
549− :: dynamicStyleSheet
498+ :: (styles
499+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
501+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
503+ |> toStyleSheet opts
550 :: children
505 :: children
553− dynamicStyleSheet
508+ (styles
509+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
511+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
513+ |> toStyleSheet opts
554 :: children
515 :: children
557embedKeyed static opts styles children =
518embedKeyed static opts styles children =
561− |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
563− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
565− |> toStyleSheet opts
567 if static then
519 if static then
568− ( "static-stylesheet", staticRoot opts )
520+ ( "static-stylesheet", staticRoot )
569 :: ( "dynamic-stylesheet"
521 :: ( "dynamic-stylesheet"
570− , dynamicStyleSheet
522+ , styles
523+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
525+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
527+ |> toStyleSheet opts
572 :: children
529 :: children
575 ( "dynamic-stylesheet"
532 ( "dynamic-stylesheet"
576− , dynamicStyleSheet
533+ , styles
534+ |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
536+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
538+ |> toStyleSheet opts
578 :: children
540 :: children
@@ -889,16 +851,7 @@ skippable flag style =
892−gatherAttrRecursive :
854+gatherAttrRecursive : String -> NodeName -> Flag.Field -> Transformation -> List Style -> List (VirtualDom.Attribute msg) -> List (VirtualDom.Node msg) -> List (Attribute aligned msg) -> Gathered msg
898− -> List (VirtualDom.Attribute msg)
899− -> NearbyChildren msg
900− -> List (Attribute aligned msg)
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
855gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
903 case elementAttrs of
856 case elementAttrs of
@@ -1032,7 +985,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
986 gatherAttrRecursive (classes ++ " " ++ newClass)
1035− (Flag.merge addToFlags (Flag.add Flag.width has))
988+ (Flag.merge addToFlags has)
1036 transform
989 transform
1037 (newStyles ++ styles)
990 (newStyles ++ styles)
@@ -1053,7 +1006,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1054 "height-px-" ++ val
1007 "height-px-" ++ val
1056− gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
1009+ gatherAttrRecursive (name ++ " " ++ classes)
1058 (Flag.add Flag.height has)
1011 (Flag.add Flag.height has)
1059 transform
1012 transform
@@ -1110,7 +1063,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
1064 gatherAttrRecursive (classes ++ " " ++ newClass)
1113− (Flag.merge addToFlags (Flag.add Flag.height has))
1066+ (Flag.merge addToFlags has)
1114 transform
1067 transform
1115 (newStyles ++ styles)
1068 (newStyles ++ styles)
@@ -1142,15 +1095,20 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1095 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1144 Paragraph ->
1097 Paragraph ->
1145− -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
1098+ let
1146− -- Since we can't guaranteee that there are no divs, we need another strategy.
1099+ newNode =
1147− -- While it's not documented in many places, there apparently is a paragraph aria role
1100+ case node of
1148− -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
1101+ Generic ->
1149− -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
1102+ NodeName "p"
1150− -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
1103+
1151− gatherAttrRecursive
1110+ gatherAttrRecursive classes
1152− classes
1111+ newNode
1155 transform
1113 transform
@@ -1185,16 +1143,75 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1186 Styled styled ->
1144 Styled styled ->
1187 styles ++ styled.styles
1145 styles ++ styled.styles
1149+ [ Html.Attributes.class <|
1153+ [ Internal.Style.classes.nearby
1154+ , Internal.Style.classes.single
1155+ , Internal.Style.classes.above
1160+ [ Internal.Style.classes.nearby
1161+ , Internal.Style.classes.single
1162+ , Internal.Style.classes.below
1167+ [ Internal.Style.classes.nearby
1168+ , Internal.Style.classes.single
1169+ , Internal.Style.classes.onRight
1174+ [ Internal.Style.classes.nearby
1175+ , Internal.Style.classes.single
1176+ , Internal.Style.classes.onLeft
1181+ [ Internal.Style.classes.nearby
1182+ , Internal.Style.classes.single
1183+ , Internal.Style.classes.inFront
1188+ [ Internal.Style.classes.nearby
1189+ , Internal.Style.classes.single
1190+ , Internal.Style.classes.behind
1204+ styled.html NoStyleSheet asEl
1208+ if location == Behind then
1209+ Internal.Style.classes.hasBehind ++ " " ++ classes
1189− gatherAttrRecursive
1214+ gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1196− (addNearbyElement location elem children)
1199 AlignX x ->
1216 AlignX x ->
1200 if Flag.present Flag.xAlign has then
1217 if Flag.present Flag.xAlign has then
@@ -1250,106 +1267,6 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1250 remaining
1267 remaining
1253−addNearbyElement location elem existing =
1256− nearbyElement location elem
1259− NoNearbyChildren ->
1262− ChildrenBehind [ nearby ]
1265− ChildrenInFront [ nearby ]
1267− ChildrenBehind existingBehind ->
1270− ChildrenBehind (nearby :: existingBehind)
1273− ChildrenBehindAndInFront existingBehind [ nearby ]
1275− ChildrenInFront existingInFront ->
1278− ChildrenBehindAndInFront [ nearby ] existingInFront
1281− ChildrenInFront (nearby :: existingInFront)
1283− ChildrenBehindAndInFront existingBehind existingInFront ->
1286− ChildrenBehindAndInFront (nearby :: existingBehind) existingInFront
1289− ChildrenBehindAndInFront existingBehind (nearby :: existingInFront)
1292−nearbyElement location elem =
1294− [ Html.Attributes.class <|
1298− [ Internal.Style.classes.nearby
1299− , Internal.Style.classes.single
1300− , Internal.Style.classes.above
1305− [ Internal.Style.classes.nearby
1306− , Internal.Style.classes.single
1307− , Internal.Style.classes.below
1312− [ Internal.Style.classes.nearby
1313− , Internal.Style.classes.single
1314− , Internal.Style.classes.onRight
1319− [ Internal.Style.classes.nearby
1320− , Internal.Style.classes.single
1321− , Internal.Style.classes.onLeft
1326− [ Internal.Style.classes.nearby
1327− , Internal.Style.classes.single
1328− , Internal.Style.classes.inFront
1333− [ Internal.Style.classes.nearby
1334− , Internal.Style.classes.single
1335− , Internal.Style.classes.behind
1349− styled.html NoStyleSheet asEl
1353renderWidth w =
1270renderWidth w =
1354 case w of
1271 case w of
1355 Px px ->
1272 Px px ->
@@ -1436,7 +1353,7 @@ renderHeight h =
1436 "height-px-" ++ val
1353 "height-px-" ++ val
1438 ( Flag.none
1355 ( Flag.none
1439− , Internal.Style.classes.heightExact ++ " " ++ name
1356+ , name
1440 , [ Single name "height" (val ++ "px") ]
1357 , [ Single name "height" (val ++ "px") ]
@@ -1459,7 +1376,7 @@ renderHeight h =
1459 , [ Single
1376 , [ Single
1460 (Internal.Style.classes.any
1377 (Internal.Style.classes.any
1462− ++ Internal.Style.classes.column
1379+ ++ Internal.Style.classes.row
1463 ++ " > "
1380 ++ " > "
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1381 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1478,9 +1395,7 @@ renderHeight h =
1480 "min-height"
1397 "min-height"
1481− -- This needs to be !important because we're using `min-height: min-content`
1482− -- to correct for safari's incorrect implementation of flexbox.
1483− (String.fromInt minSize ++ "px !important")
1398+ (String.fromInt minSize ++ "px")
1485 ( newFlag, newAttrs, newStyle ) =
1400 ( newFlag, newAttrs, newStyle ) =
1486 renderHeight len
1401 renderHeight len
@@ -1558,7 +1473,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1558element context node attributes children =
1473element context node attributes children =
1559 attributes
1474 attributes
1560 |> List.reverse
1475 |> List.reverse
1561− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1476+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1562 |> createElement context children
1477 |> createElement context children
@@ -1625,12 +1540,13 @@ createElement context children rendered =
1625 -- , existingStyles
1540 -- , existingStyles
1628− ( (if context == asEl then
1544+ (if context == asParagraph then
1629− textElementFill str
1545+ str
1632− textElement str
1548+ str
1634 :: htmls
1550 :: htmls
1635 , existingStyles
1551 , existingStyles
@@ -1690,11 +1606,8 @@ createElement context children rendered =
1693− , if context == asEl then
1694− textElementFill str
1697− textElement str
1609+ , textElement
1699 :: htmls
1612 :: htmls
1700 , existingStyles
1613 , existingStyles
@@ -1721,8 +1634,13 @@ createElement context children rendered =
1721 (finalizeNode rendered.has
1634 (finalizeNode rendered.has
1722 rendered.node
1635 rendered.node
1723 rendered.attributes
1636 rendered.attributes
1724− (Keyed
1637+ (Keyed <|
1641+ ( "nearby-elements-pls", x )
1725− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1643+ rendered.children
1727 NoStyleSheet
1645 NoStyleSheet
@@ -1736,7 +1654,13 @@ createElement context children rendered =
1736 rendered.node
1654 rendered.node
1737 rendered.attributes
1655 rendered.attributes
1660+ ( "nearby-elements-pls", x )
1739− (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1662+ rendered.children
@@ -1758,7 +1682,7 @@ createElement context children rendered =
1758 rendered.has
1682 rendered.has
1759 rendered.node
1683 rendered.node
1760 rendered.attributes
1684 rendered.attributes
1761− (Unkeyed (addChildren unkeyed rendered.children))
1685+ (Unkeyed <| unkeyed ++ rendered.children)
1762 NoStyleSheet
1686 NoStyleSheet
@@ -1770,42 +1694,10 @@ createElement context children rendered =
1770 rendered.has
1694 rendered.has
1771 rendered.node
1695 rendered.node
1772 rendered.attributes
1696 rendered.attributes
1773− (Unkeyed (addChildren unkeyed rendered.children))
1697+ (Unkeyed (unkeyed ++ rendered.children))
1777−addChildren existing nearbyChildren =
1778− case nearbyChildren of
1779− NoNearbyChildren ->
1782− ChildrenBehind behind ->
1785− ChildrenInFront inFront ->
1786− existing ++ inFront
1788− ChildrenBehindAndInFront behind inFront ->
1789− behind ++ existing ++ inFront
1792−addKeyedChildren key existing nearbyChildren =
1793− case nearbyChildren of
1794− NoNearbyChildren ->
1797− ChildrenBehind behind ->
1798− List.map (\x -> ( key, x )) behind ++ existing
1800− ChildrenInFront inFront ->
1801− existing ++ List.map (\x -> ( key, x )) inFront
1803− ChildrenBehindAndInFront behind inFront ->
1804− List.map (\x -> ( key, x )) behind
1806− ++ List.map (\x -> ( key, x )) inFront
@@ -1817,20 +1709,8 @@ defaultOptions =
1820−staticRoot : OptionRecord -> VirtualDom.Node msg
1712+staticRoot =
1824− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
1825− VirtualDom.node "div"
1827− [ VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ] ]
1713+ VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ]
1829− NoStaticStyleSheet ->
1833− VirtualDom.node "elm-ui-static-rules" [ VirtualDom.property "rules" (Encode.string Internal.Style.rules) ] []
1836addWhen ifThis x to =
1716addWhen ifThis x to =
@@ -1948,7 +1828,7 @@ type Spacing
1950type Padding
1830type Padding
1951− = Padding String Float Float Float Float
1831+ = Padding String Int Int Int Int
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1834extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -2044,44 +1924,35 @@ getHeight attrs =
2047−textElementClasses : String
2048−textElementClasses =
2053− ++ classes.widthContent
2055− ++ classes.heightContent
2058textElement : String -> VirtualDom.Node msg
1927textElement : String -> VirtualDom.Node msg
2059textElement str =
1928textElement str =
2060 Html.div
1929 Html.div
2061 [ Html.Attributes.class
1930 [ Html.Attributes.class
2062− textElementClasses
1931+ (String.join " "
1934+ , classes.widthContent
1935+ , classes.heightContent
2064 [ Html.text str ]
1939 [ Html.text str ]
2067−textElementFillClasses : String
2068−textElementFillClasses =
2073− ++ classes.widthFill
2075− ++ classes.heightFill
2078textElementFill : String -> VirtualDom.Node msg
1942textElementFill : String -> VirtualDom.Node msg
2079textElementFill str =
1943textElementFill str =
2080− Html.div
1944+ VirtualDom.node "div"
2081− [ Html.Attributes.class
1945+ [ VirtualDom.property "className"
2082− textElementFillClasses
1946+ (Json.string <|
1950+ , classes.widthFill
1951+ , classes.heightFill
2084− [ Html.text str ]
1955+ [ VirtualDom.text str ]
2087type Children x
1958type Children x
@@ -2089,6 +1960,10 @@ type Children x
2089 | Keyed (List ( String, x ))
1960 | Keyed (List ( String, x ))
1964+-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
2092toHtml mode el =
1967toHtml mode el =
2093 case el of
1968 case el of
2094 Unstyled html ->
1969 Unstyled html ->
@@ -2124,7 +1999,8 @@ renderRoot optionList attributes child =
2126type RenderMode
2001type RenderMode
2127− = Layout
2003+ | Layout
2128 | NoStaticStyleSheet
2004 | NoStaticStyleSheet
2129 | WithVirtualCss
2005 | WithVirtualCss
@@ -2173,8 +2049,8 @@ rootStyle =
2173 , SansSerif
2049 , SansSerif
2176− [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2052+ [ StyleClass Flag.bgColor (Colored ("bg-color-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2177− , StyleClass Flag.fontColor (Colored ("fc-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2053+ , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2178 , StyleClass Flag.fontSize (FontSize 20)
2054 , StyleClass Flag.fontSize (FontSize 20)
2179 , StyleClass Flag.fontFamily <|
2055 , StyleClass Flag.fontFamily <|
2180 FontFamily (List.foldl renderFontClassName "font-" families)
2056 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2217,38 +2093,9 @@ renderFontClassName font current =
2218renderFocusStyle :
2094renderFocusStyle :
2219 FocusStyle
2095 FocusStyle
2220− -> List Style
2096+ -> Style
2221renderFocusStyle focus =
2097renderFocusStyle focus =
2222− [ Style (Internal.Style.dot classes.focusedWithin ++ ":focus-within")
2223− (List.filterMap identity
2224− [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2225− , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2228− Property "box-shadow"
2230− { color = shadow.color
2233− |> Tuple.mapFirst toFloat
2234− |> Tuple.mapSecond toFloat
2237− toFloat shadow.blur
2239− toFloat shadow.size
2244− , Just <| Property "outline" "none"
2248− ((Internal.Style.dot classes.any ++ ":focus .focusable, ")
2249− ++ (Internal.Style.dot classes.any ++ ".focusable:focus, ")
2098+ Style (Internal.Style.dot classes.any ++ ":focus .focusable, " ++ Internal.Style.dot classes.any ++ ".focusable:focus")
2250− ++ (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb")
2252 (List.filterMap identity
2099 (List.filterMap identity
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2100 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2101 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2271,7 +2118,6 @@ renderFocusStyle focus =
2271 , Just <| Property "outline" "none"
2118 , Just <| Property "outline" "none"
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2123focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2283,7 +2129,7 @@ focusDefaultStyle =
2283 { color =
2129 { color =
2284 Rgba (155 / 255) (203 / 255) 1 1
2130 Rgba (155 / 255) (203 / 255) 1 1
2285 , offset = ( 0, 0 )
2131 , offset = ( 0, 0 )
2286− , blur = 0
2132+ , blur = 3
2287 , size = 3
2133 , size = 3
@@ -2353,31 +2199,7 @@ optionsToRecord options =
2354toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2200toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2355toStyleSheet options styleSheet =
2201toStyleSheet options styleSheet =
2356− case options.mode of
2358− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
2359− VirtualDom.node "div"
2361− [ VirtualDom.node "style"
2363− [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2366− NoStaticStyleSheet ->
2367− -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
2368− VirtualDom.node "div"
2370− [ VirtualDom.node "style"
2372− [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2202+ VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2376− VirtualDom.node "elm-ui-rules"
2377− [ VirtualDom.property "rules"
2378− (encodeStyles options styleSheet)
2383renderTopLevelValues rules =
2205renderTopLevelValues rules =
@@ -2387,12 +2209,14 @@ renderTopLevelValues rules =
2387 ImportFont _ url ->
2209 ImportFont _ url ->
2388 Just ("@import url('" ++ url ++ "');")
2210 Just ("@import url('" ++ url ++ "');")
2390− -- FontWith with ->
2212+ FontWith with ->
2391− -- case with.url of
2213+ case with.url of
2392− -- Just x ->
2214+ Just x ->
2393− -- Just ("@import url('" ++ x ++ "');")
2215+ Just ("@import url('" ++ x ++ "');")
2394− -- Nothing ->
2217+ Nothing ->
2395− -- Nothing
2218+ Nothing
@@ -2463,38 +2287,7 @@ renderNullAdjustmentRule fontToAdjust otherFontName =
2466−fontRule name modifier ( parentAdj, textAdjustment ) =
2485− ++ Internal.Style.classes.text
2491− ++ Internal.Style.classes.text
2497−renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2290+renderFontAdjustmentRule fontToAdjust ( parentAdj, textAdjustment ) otherFontName =
2500 if fontToAdjust == otherFontName then
2293 if fontToAdjust == otherFontName then
@@ -2504,7 +2297,34 @@ renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2504 otherFontName ++ " ." ++ fontToAdjust
2297 otherFontName ++ " ." ++ fontToAdjust
2506 String.join " "
2299 String.join " "
2507− (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2304+ ++ classes.sizeByCapital
2309+ ++ classes.sizeByCapital
2316+ ++ classes.sizeByCapital
2318+ ++ Internal.Style.classes.text
2322+ ++ classes.sizeByCapital
2324+ ++ Internal.Style.classes.text
2510bracket selector rules =
2330bracket selector rules =
@@ -2517,12 +2337,17 @@ bracket selector rules =
2518fontAdjustmentRules converted =
2338fontAdjustmentRules converted =
2519 ( [ ( "display", "block" )
2339 ( [ ( "display", "block" )
2341+ -- , ( "line-height", String.fromFloat converted.height )
2342+ -- , ( "font-size", String.fromFloat (1 + converted.height + converted.vertical) ++ "em" )
2521 , [ ( "display", "inline-block" )
2344 , [ ( "display", "inline-block" )
2522 , ( "line-height", String.fromFloat converted.height )
2345 , ( "line-height", String.fromFloat converted.height )
2523 , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2346 , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2524 , ( "font-size", String.fromFloat converted.size ++ "em" )
2347 , ( "font-size", String.fromFloat converted.size ++ "em" )
2349+ -- , [ ( "font-size", String.fromFloat converted.size ++ "em" )
@@ -2533,17 +2358,10 @@ typefaceAdjustment typefaces =
2533 Nothing ->
2358 Nothing ->
2534 case face of
2359 case face of
2535 FontWith with ->
2360 FontWith with ->
2536− case with.adjustment of
2540− Just adjustment ->
2361+ Just
2542− ( fontAdjustmentRules
2362+ (fontAdjustmentRules
2543− (.full (convertAdjustment adjustment))
2544− , fontAdjustmentRules
2545− (.capital (convertAdjustment adjustment))
2363+ (.capital (convertAdjustment with.adjustment))
@@ -2593,492 +2411,482 @@ renderProps force (Property key val) existing =
2593 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2411 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596−encodeStyles options stylesheet =
2602− renderStyleRule options style Nothing
2604− ( getStyleName style, Encode.list Encode.string styled )
2609toStyleSheetString : OptionRecord -> List Style -> String
2414toStyleSheetString : OptionRecord -> List Style -> String
2610toStyleSheetString options stylesheet =
2415toStyleSheetString options stylesheet =
2612− combine style rendered =
2417+ renderStyle maybePseudo selector props =
2613− { rules = rendered.rules ++ renderStyleRule options style Nothing
2418+ case maybePseudo of
2615− case topLevelValue style of
2616− Nothing ->
2419+ Nothing ->
2617− rendered.topLevel
2420+ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2619− Just topLevel ->
2422+ Just pseudo ->
2620− topLevel :: rendered.topLevel
2423+ case pseudo of
2622− in
2425+ case options.hover of
2623− case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2426+ NoHover ->
2624− { topLevel, rules } ->
2427+ ""
2625− renderTopLevelValues topLevel ++ String.concat rules
2430+ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2628−renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2432+ AllowHover ->
2629−renderStyle options maybePseudo selector props =
2630− case maybePseudo of
2632− [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2433+ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2634− Just pseudo ->
2435+ Focus ->
2635− case pseudo of
2436+ let
2636− Hover ->
2437+ renderedProps =
2637− case options.hover of
2438+ List.foldl (renderProps False) "" props
2449+ ++ "-fs:not(.focus) {"
2459+ , ".focusable-parent:focus ~ "
2641− ForceHover ->
2469+ Active ->
2642− [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2470+ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2644− AllowHover ->
2472+ renderStyleRule rule maybePseudo =
2645− [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2473+ case rule of
2474+ Style selector props ->
2475+ renderStyle maybePseudo selector props
2647− Focus ->
2477+ Shadows name prop ->
2481+ [ Property "box-shadow" prop
2484+ Transparency name transparency ->
2649− renderedProps =
2486+ opacity =
2650− List.foldl (renderProps False) "" props
2487+ (1 - transparency)
2652− [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2491+ renderStyle
2653− , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2492+ maybePseudo
2656− , (selector ++ "-fs:focus-within {")
2659− , (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb" ++ selector ++ "-fs {")
2665− [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2668−renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2669−renderStyleRule options rule maybePseudo =
2671− Style selector props ->
2672− renderStyle options maybePseudo selector props
2674− Shadows name prop ->
2675− renderStyle options
2677− ("." ++ name)
2493+ ("." ++ name)
2678− [ Property "box-shadow" prop
2681− Transparency name transparency ->
2688− renderStyle options
2691− [ Property "opacity" (String.fromFloat opacity)
2494+ [ Property "opacity" (String.fromFloat opacity)
2695− renderStyle options
2697− (".font-size-" ++ String.fromInt i)
2698− [ Property "font-size" (String.fromInt i ++ "px")
2701− FontFamily name typefaces ->
2705− |> List.filterMap renderVariants
2706− |> String.join ", "
2709− [ Property "font-family"
2711− |> List.map fontName
2712− |> String.join ", "
2714− , Property "font-feature-settings" features
2715− , Property "font-variant"
2716− (if List.any hasSmallCaps typefaces then
2724− renderStyle options
2729− Single class prop val ->
2730− renderStyle options
2733− [ Property prop val
2736− Colored class prop color ->
2737− renderStyle options
2740− [ Property prop (formatColor color)
2743− SpacingStyle cls x y ->
2749− String.fromFloat (toFloat x / 2) ++ "px"
2752− String.fromFloat (toFloat y / 2) ++ "px"
2754− xPx =
2497+ FontSize i ->
2500+ (".font-size-" ++ String.fromInt i)
2755− String.fromInt x ++ "px"
2501+ [ Property "font-size" (String.fromInt i ++ "px")
2757− yPx =
2504+ FontFamily name typefaces ->
2508+ |> List.map renderVariants
2509+ |> String.join ", "
2512+ [ Property "font-family"
2514+ |> List.map fontName
2515+ |> String.join ", "
2517+ , Property "font-feature-settings" features
2758− String.fromInt y ++ "px"
2520+ String.join " "
2760− row =
2527+ Single class prop val ->
2761− "." ++ Internal.Style.classes.row
2528+ renderStyle
2531+ [ Property prop val
2763− wrappedRow =
2534+ Colored class prop color ->
2764− "." ++ Internal.Style.classes.wrapped ++ row
2535+ renderStyle
2538+ [ Property prop (formatColor color)
2766− column =
2541+ SpacingStyle cls x y ->
2767− "." ++ Internal.Style.classes.column
2542+ let
2769− page =
2546+ halfX =
2770− "." ++ Internal.Style.classes.page
2547+ String.fromFloat (toFloat x / 2) ++ "px"
2772− paragraph =
2549+ halfY =
2773− "." ++ Internal.Style.classes.paragraph
2550+ String.fromFloat (toFloat y / 2) ++ "px"
2776− "." ++ Internal.Style.classes.alignLeft
2553+ String.fromInt x ++ "px"
2779− "." ++ Internal.Style.classes.alignRight
2556+ String.fromInt y ++ "px"
2782− "." ++ Internal.Style.classes.any
2559+ "." ++ Internal.Style.classes.row
2784− single =
2561+ wrappedRow =
2785− "." ++ Internal.Style.classes.single
2562+ "." ++ Internal.Style.classes.wrapped ++ row
2788− [ renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2790− -- margins don't apply to last element of normal, unwrapped rows
2791− -- , renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2792− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2793− , renderStyle options
2795− (class ++ wrappedRow ++ " > " ++ any)
2796− [ Property "margin" (halfY ++ " " ++ halfX)
2799− -- , renderStyle options maybePseudo
2564+ column =
2800− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2565+ "." ++ Internal.Style.classes.column
2801− -- [ Property "margin-right" "0"
2804− , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2805− , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2806− , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2807− , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2808− , renderStyle options
2810− (class ++ paragraph)
2811− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2813− , renderStyle options
2815− ("textarea" ++ any ++ class)
2816− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2817− , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2820− -- , renderStyle options
2567+ page =
2821− -- maybePseudo
2568+ "." ++ Internal.Style.classes.page
2822− -- (class ++ paragraph ++ " > " ++ any)
2823− -- [ Property "margin-right" xPx
2824− -- , Property "margin-bottom" yPx
2826− , renderStyle options
2828− (class ++ paragraph ++ " > " ++ left)
2829− [ Property "margin-right" xPx
2831− , renderStyle options
2833− (class ++ paragraph ++ " > " ++ right)
2834− [ Property "margin-left" xPx
2836− , renderStyle options
2838− (class ++ paragraph ++ "::after")
2839− [ Property "content" "''"
2840− , Property "display" "block"
2841− , Property "height" "0"
2842− , Property "width" "0"
2843− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2845− , renderStyle options
2847− (class ++ paragraph ++ "::before")
2848− [ Property "content" "''"
2849− , Property "display" "block"
2850− , Property "height" "0"
2851− , Property "width" "0"
2852− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2856− PaddingStyle cls top right bottom left ->
2570+ paragraph =
2857− let
2571+ "." ++ Internal.Style.classes.paragraph
2862− renderStyle options
2865− [ Property "padding"
2866− (String.fromFloat top
2868− ++ String.fromFloat right
2870− ++ String.fromFloat bottom
2872− ++ String.fromFloat left
2877− BorderWidth cls top right bottom left ->
2573+ left =
2878− let
2574+ "." ++ Internal.Style.classes.alignLeft
2883− renderStyle options
2886− [ Property "border-width"
2887− (String.fromInt top
2889− ++ String.fromInt right
2891− ++ String.fromInt bottom
2893− ++ String.fromInt left
2898− GridTemplateStyle template ->
2576+ right =
2899− let
2577+ "." ++ Internal.Style.classes.alignRight
2902− ++ String.join "-" (List.map lengthClassName template.rows)
2904− ++ String.join "-" (List.map lengthClassName template.columns)
2906− ++ lengthClassName (Tuple.first template.spacing)
2908− ++ lengthClassName (Tuple.second template.spacing)
2911− toGridLength (Tuple.second template.spacing)
2914− toGridLength (Tuple.first template.spacing)
2917− toGridLengthHelper Nothing Nothing x
2919− toGridLengthHelper minimum maximum x =
2922− String.fromInt px ++ "px"
2925− case ( minimum, maximum ) of
2926− ( Nothing, Nothing ) ->
2929− ( Just minSize, Nothing ) ->
2930− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2932− ( Nothing, Just maxSize ) ->
2933− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2935− ( Just minSize, Just maxSize ) ->
2936− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2939− case ( minimum, maximum ) of
2940− ( Nothing, Nothing ) ->
2941− String.fromInt i ++ "fr"
2943− ( Just minSize, Nothing ) ->
2944− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2946− ( Nothing, Just maxSize ) ->
2947− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2949− ( Just minSize, Just maxSize ) ->
2950− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2953− toGridLengthHelper (Just m) maximum len
2956− toGridLengthHelper minimum (Just m) len
2960− |> List.map toGridLength
2961− |> String.join ySpacing
2962− |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2966− |> List.map toGridLength
2967− |> String.join ySpacing
2968− |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2971− class ++ "{" ++ msColumns ++ msRows ++ "}"
2975− |> List.map toGridLength
2977− |> (\x -> "grid-template-columns: " ++ x ++ ";")
2980− template.rows
2580+ "." ++ Internal.Style.classes.any
2981− |> List.map toGridLength
2983− |> (\x -> "grid-template-rows: " ++ x ++ ";")
2985− gapX =
2582+ single =
2986− "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2583+ "." ++ Internal.Style.classes.single
2586+ [ renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2588+ -- margins don't apply to last element of normal, unwrapped rows
2589+ -- , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2590+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2591+ , renderStyle maybePseudo
2592+ (class ++ wrappedRow ++ " > " ++ any)
2593+ [ Property "margin" (halfY ++ " " ++ halfX)
2988− gapY =
2596+ -- , renderStyle maybePseudo
2989− "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2597+ -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2598+ -- [ Property "margin-right" "0"
2601+ , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2602+ , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2603+ , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2604+ , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2607+ (class ++ paragraph)
2608+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2612+ ("textarea" ++ class)
2613+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2991− modernGrid =
2616+ -- , renderStyle
2992− class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2617+ -- maybePseudo
2618+ -- (class ++ paragraph ++ " > " ++ any)
2619+ -- [ Property "margin-right" xPx
2620+ -- , Property "margin-bottom" yPx
2624+ (class ++ paragraph ++ " > " ++ left)
2625+ [ Property "margin-right" xPx
2629+ (class ++ paragraph ++ " > " ++ right)
2630+ [ Property "margin-left" xPx
2634+ (class ++ paragraph ++ "::after")
2635+ [ Property "content" "''"
2636+ , Property "display" "block"
2637+ , Property "height" "0"
2638+ , Property "width" "0"
2639+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2643+ (class ++ paragraph ++ "::before")
2644+ [ Property "content" "''"
2645+ , Property "display" "block"
2646+ , Property "height" "0"
2647+ , Property "width" "0"
2648+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2994− supports =
2652+ PaddingStyle cls top right bottom left ->
2995− "@supports (display:grid) {" ++ modernGrid ++ "}"
2653+ let
2997− [ base
2658+ renderStyle
2998− , supports
2659+ maybePseudo
2661+ [ Property "padding"
2662+ (String.fromInt top
2664+ ++ String.fromInt right
2666+ ++ String.fromInt bottom
2668+ ++ String.fromInt left
3001− GridPosition position ->
2673+ BorderWidth cls top right bottom left ->
3003− class =
2675+ class =
3004− ".grid-pos-"
2676+ "."
3005− ++ String.fromInt position.row
2677+ ++ cls
3007− ++ String.fromInt position.col
2679+ renderStyle
3008− ++ "-"
2680+ maybePseudo
3009− ++ String.fromInt position.width
2681+ class
3010− ++ "-"
2682+ [ Property "border-width"
3011− ++ String.fromInt position.height
3016− ++ String.fromInt position.row
2683+ (String.fromInt top
3017− ++ ";"
2684+ ++ "px "
3018− , "-ms-grid-row-span: "
3019− ++ String.fromInt position.height
2685+ ++ String.fromInt right
3020− ++ ";"
2686+ ++ "px "
3021− , "-ms-grid-column: "
3022− ++ String.fromInt position.col
2687+ ++ String.fromInt bottom
3023− ++ ";"
2688+ ++ "px "
3024− , "-ms-grid-column-span: "
3025− ++ String.fromInt position.width
2689+ ++ String.fromInt left
3026− ++ ";"
2690+ ++ "px"
2694+ GridTemplateStyle template ->
2698+ ++ String.join "-" (List.map lengthClassName template.rows)
2700+ ++ String.join "-" (List.map lengthClassName template.columns)
2702+ ++ lengthClassName (Tuple.first template.spacing)
2704+ ++ lengthClassName (Tuple.second template.spacing)
2707+ toGridLength (Tuple.second template.spacing)
2710+ toGridLength (Tuple.first template.spacing)
2713+ toGridLengthHelper Nothing Nothing x
2715+ toGridLengthHelper minimum maximum x =
2718+ String.fromInt px ++ "px"
2721+ case ( minimum, maximum ) of
2722+ ( Nothing, Nothing ) ->
2725+ ( Just minSize, Nothing ) ->
2726+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2728+ ( Nothing, Just maxSize ) ->
2729+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2731+ ( Just minSize, Just maxSize ) ->
2732+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2735+ case ( minimum, maximum ) of
2736+ ( Nothing, Nothing ) ->
2737+ String.fromInt i ++ "fr"
2739+ ( Just minSize, Nothing ) ->
2740+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2742+ ( Nothing, Just maxSize ) ->
2743+ "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2745+ ( Just minSize, Just maxSize ) ->
2746+ "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2749+ toGridLengthHelper (Just m) maximum len
2752+ toGridLengthHelper minimum (Just m) len
2756+ |> List.map toGridLength
2757+ |> String.join ySpacing
2758+ |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2762+ |> List.map toGridLength
2763+ |> String.join ySpacing
2764+ |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
3030− class ++ "{" ++ msPosition ++ "}"
2767+ class ++ "{" ++ msColumns ++ msRows ++ "}"
2771+ |> List.map toGridLength
2773+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2777+ |> List.map toGridLength
2779+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2782+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2785+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2788+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2791+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2795+ GridPosition position ->
2799+ ++ String.fromInt position.row
2801+ ++ String.fromInt position.col
2803+ ++ String.fromInt position.width
2805+ ++ String.fromInt position.height
2810+ ++ String.fromInt position.row
2812+ , "-ms-grid-row-span: "
2813+ ++ String.fromInt position.height
2815+ , "-ms-grid-column: "
2816+ ++ String.fromInt position.col
2818+ , "-ms-grid-column-span: "
2819+ ++ String.fromInt position.width
2824+ class ++ "{" ++ msPosition ++ "}"
3032− modernPosition =
2826+ modernPosition =
3033− String.join " "
2827+ String.join " "
3034− [ "grid-row: "
2828+ [ "grid-row: "
3035− ++ String.fromInt position.row
2829+ ++ String.fromInt position.row
3036− ++ " / "
2830+ ++ " / "
3037− ++ String.fromInt (position.row + position.height)
2831+ ++ String.fromInt (position.row + position.height)
3039− , "grid-column: "
2833+ , "grid-column: "
3040− ++ String.fromInt position.col
2834+ ++ String.fromInt position.col
3041− ++ " / "
2835+ ++ " / "
3042− ++ String.fromInt (position.col + position.width)
2836+ ++ String.fromInt (position.col + position.width)
2841+ class ++ "{" ++ modernPosition ++ "}"
2844+ "@supports (display:grid) {" ++ modernGrid ++ "}"
3046− modernGrid =
2848+ PseudoSelector class styles ->
3047− class ++ "{" ++ modernPosition ++ "}"
2849+ let
2850+ renderPseudoRule style =
2851+ renderStyleRule style (Just class)
2853+ List.map renderPseudoRule styles
3049− supports =
2856+ Transform transform ->
3050− "@supports (display:grid) {" ++ modernGrid ++ "}"
2857+ let
3052− [ base
2859+ transformValue transform
3056− PseudoSelector class styles ->
2861+ class =
3057− let
2862+ transformClass transform
3058− renderPseudoRule style =
3059− renderStyleRule options style (Just class)
3061− List.concatMap renderPseudoRule styles
2864+ case ( class, val ) of
2865+ ( Just cls, Just v ) ->
2869+ [ Property "transform"
3063− Transform transform ->
2873+ _ ->
3066− transformValue transform
3068− class =
2876+ combine style rendered =
3069− transformClass transform
2877+ { rules = rendered.rules ++ renderStyleRule style Nothing
3070− in
2878+ , topLevel =
3071− case ( class, val ) of
2879+ case topLevelValue style of
3072− ( Just cls, Just v ) ->
2880+ Nothing ->
3073− renderStyle options
2881+ rendered.topLevel
3076− [ Property "transform"
3080− _ ->
2883+ Just topLevel ->
3081− []
2884+ topLevel :: rendered.topLevel
2887+ case List.foldl combine { topLevel = [], rules = "" } stylesheet of
2888+ { topLevel, rules } ->
2889+ renderTopLevelValues topLevel ++ rules
3084lengthClassName : Length -> String
2892lengthClassName : Length -> String
@@ -3118,12 +2926,12 @@ formatTextShadow shadow =
3121−textShadowClass shadow =
2929+textShadowName shadow =
3122 String.concat
2930 String.concat
3124− , floatClass (Tuple.first shadow.offset) ++ "px"
2932+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3125− , floatClass (Tuple.second shadow.offset) ++ "px"
2933+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3126− , floatClass shadow.blur ++ "px"
2934+ , String.fromFloat shadow.blur ++ "px"
3127 , formatColorClass shadow.color
2935 , formatColorClass shadow.color
@@ -3144,17 +2952,17 @@ formatBoxShadow shadow =
3147−boxShadowClass shadow =
2955+boxShadowName shadow =
3148 String.concat <|
2956 String.concat <|
3149 [ if shadow.inset then
2957 [ if shadow.inset then
3150 "box-inset"
2958 "box-inset"
3154− , floatClass (Tuple.first shadow.offset) ++ "px"
2962+ , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3155− , floatClass (Tuple.second shadow.offset) ++ "px"
2963+ , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3156− , floatClass shadow.blur ++ "px"
2964+ , String.fromFloat shadow.blur ++ "px"
3157− , floatClass shadow.size ++ "px"
2965+ , String.fromFloat shadow.size ++ "px"
3158 , formatColorClass shadow.color
2966 , formatColorClass shadow.color
@@ -3199,17 +3007,6 @@ paddingName top right bottom left =
3199 ++ String.fromInt left
3007 ++ String.fromInt left
3202−paddingNameFloat top right bottom left =
3206− ++ floatClass right
3208− ++ floatClass bottom
3213getStyleName : Style -> String
3010getStyleName : Style -> String
3214getStyleName style =
3011getStyleName style =
3215 case style of
3012 case style of
@@ -3527,16 +3324,16 @@ convertAdjustment adjustment =
3527 capitalSize =
3324 capitalSize =
3528 1 / (ascender - newBaseline)
3325 1 / (ascender - newBaseline)
3531− 1 / (ascender - descender)
3533 fullVertical =
3327 fullVertical =
3536− -- (oldMiddle - newFullMiddle) * 2
3328+ (oldMiddle - newFullMiddle) * 2
3538 { full =
3330 { full =
3331+ { vertical = fullVertical
3539− adjust fullSize (ascender - descender) fullVertical
3333+ (ascender - descender)
3540 , capital =
3337 , capital =
3541 adjust capitalSize (ascender - newBaseline) capitalVertical
3338 adjust capitalSize (ascender - newBaseline) capitalVertical
@@ -3546,5 +3343,7 @@ adjust size height vertical =
3546 { vertical = vertical
3343 { vertical = vertical
3547 , height =
3344 , height =
3548 height / size
3345 height / size
3549 , size = size
3348 , size = size