@@ -16,6 +16,7 @@ module Internal.Model exposing
16 , LayoutContext(..)
16 , LayoutContext(..)
17 , Length(..)
17 , Length(..)
18 , Location(..)
18 , Location(..)
19 , NodeName(..)
20 , NodeName(..)
20 , Option(..)
21 , Option(..)
21 , OptionRecord
22 , OptionRecord
@@ -41,7 +42,7 @@ module Internal.Model exposing
41 , asParagraph
42 , asParagraph
43 , asTextColumn
44 , asTextColumn
44− , boxShadowName
45+ , boxShadowClass
45 , columnClass
46 , columnClass
46 , composeTransformation
47 , composeTransformation
47 , contextClasses
48 , contextClasses
@@ -78,31 +79,30 @@ module Internal.Model exposing
78 , onlyStyles
79 , onlyStyles
79 , optionsToRecord
80 , optionsToRecord
80 , paddingName
81 , paddingName
81 , pageClass
83 , pageClass
82 , paragraphClass
84 , paragraphClass
83 , reduceRecursive
85 , reduceRecursive
84 , reduceStyles
86 , reduceStyles
85 , reduceStylesRecursive
87 , reduceStylesRecursive
86 , removeNever
88 , removeNever
90 , renderFontClassName
89 , renderFontClassName
91 , renderHeight
90 , renderHeight
92 , renderRoot
91 , renderRoot
93 , renderWidth
93 , renderWidth
94 , rootStyle
94 , rootStyle
95 , rowClass
95 , rowClass
96 , singleClass
96 , singleClass
97 , spacingName
97 , spacingName
100− , textShadowName
99+ , textShadowClass
102 , toStyleSheet
101 , toStyleSheet
103 , transformClass
102 , transformClass
104 , unstyled
103 , unstyled
105 , unwrapDecorations
104 , 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 Json
115+import Json.Encode as Encode
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 Int Int Int Int
177+ | PaddingStyle String Float Float Float Float
178 | GridTemplateStyle
178 | GridTemplateStyle
179 { spacing : ( Length, Length )
179 { spacing : ( Length, Length )
180 , columns : List Length
180 , columns : List Length
@@ -222,8 +222,7 @@ type Font
222 | ImportFont String String
222 | ImportFont String String
223 | FontWith
223 | FontWith
224 { name : String
224 { name : String
225− , url : Maybe String
226− , adjustment : Adjustment
225+ , adjustment : Maybe Adjustment
227 , variants : List Variant
226 , variants : List Variant
@@ -246,6 +245,18 @@ renderVariant var =
246 "\"" ++ name ++ "\" " ++ String.fromInt index
245 "\"" ++ name ++ "\" " ++ String.fromInt index
250+ VariantActive name ->
256+ VariantIndexed name index ->
257+ name ++ "-" ++ String.fromInt index
249renderVariants typeface =
260renderVariants typeface =
250 case typeface of
261 case typeface of
251 FontWith font ->
262 FontWith font ->
@@ -361,6 +372,13 @@ type NodeName
361 | Embedded String String
372 | 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))
@@ -369,7 +387,7 @@ type alias Gathered msg =
369 { node : NodeName
387 { node : NodeName
370 , attributes : List (VirtualDom.Attribute msg)
388 , attributes : List (VirtualDom.Attribute msg)
371 , styles : List Style
389 , styles : List Style
372− , children : List (VirtualDom.Node msg)
390+ , children : NearbyChildren msg
373 , has : Flag.Field
391 , has : Flag.Field
@@ -437,7 +455,10 @@ finalizeNode has node attributes children embedMode parentContext =
437 Embedded nodeName internal ->
455 Embedded nodeName internal ->
438 VirtualDom.node nodeName
456 VirtualDom.node nodeName
439 attributes
457 attributes
458+ [ createNode internal
459+ [ Html.Attributes.class
440− [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
460+ (classes.any ++ " " ++ classes.single)
443 case parentContext of
464 case parentContext of
@@ -514,49 +535,45 @@ finalizeNode has node attributes children embedMode parentContext =
516embedWith static opts styles children =
537embedWith static opts styles children =
541+ |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
543+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
545+ |> toStyleSheet opts
517 if static then
547 if static then
518− staticRoot
548+ staticRoot opts
519− :: (styles
549+ :: dynamicStyleSheet
520− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
522− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
524− |> toStyleSheet opts
526 :: children
550 :: children
529− (styles
553+ dynamicStyleSheet
530− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
532− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
534− |> toStyleSheet opts
536 :: children
554 :: children
539embedKeyed static opts styles children =
557embedKeyed static opts styles children =
561+ |> List.foldl reduceStyles ( Set.empty, renderFocusStyle opts.focus )
563+ -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
565+ |> toStyleSheet opts
540 if static then
567 if static then
541− ( "static-stylesheet", staticRoot )
568+ ( "static-stylesheet", staticRoot opts )
542 :: ( "dynamic-stylesheet"
569 :: ( "dynamic-stylesheet"
543− , styles
570+ , dynamicStyleSheet
544− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
546− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
548− |> toStyleSheet opts
550 :: children
572 :: children
553 ( "dynamic-stylesheet"
575 ( "dynamic-stylesheet"
554− , styles
576+ , dynamicStyleSheet
555− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
557− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
559− |> toStyleSheet opts
561 :: children
578 :: children
@@ -872,7 +889,16 @@ skippable flag style =
875−gatherAttrRecursive : String -> NodeName -> Flag.Field -> Transformation -> List Style -> List (VirtualDom.Attribute msg) -> List (VirtualDom.Node msg) -> List (Attribute aligned msg) -> Gathered msg
892+gatherAttrRecursive :
898+ -> List (VirtualDom.Attribute msg)
899+ -> NearbyChildren msg
900+ -> List (Attribute aligned msg)
876gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
877 case elementAttrs of
903 case elementAttrs of
@@ -1006,7 +1032,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1007 gatherAttrRecursive (classes ++ " " ++ newClass)
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
1009− (Flag.merge addToFlags has)
1035+ (Flag.merge addToFlags (Flag.add Flag.width has))
1010 transform
1036 transform
1011 (newStyles ++ styles)
1037 (newStyles ++ styles)
@@ -1027,7 +1053,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1028 "height-px-" ++ val
1054 "height-px-" ++ val
1030− gatherAttrRecursive (name ++ " " ++ classes)
1056+ gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
1032 (Flag.add Flag.height has)
1058 (Flag.add Flag.height has)
1033 transform
1059 transform
@@ -1084,7 +1110,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1085 gatherAttrRecursive (classes ++ " " ++ newClass)
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
1087− (Flag.merge addToFlags has)
1113+ (Flag.merge addToFlags (Flag.add Flag.height has))
1088 transform
1114 transform
1089 (newStyles ++ styles)
1115 (newStyles ++ styles)
@@ -1116,20 +1142,15 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1116 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1118 Paragraph ->
1144 Paragraph ->
1119− let
1145+ -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
1120− newNode =
1146+ -- Since we can't guaranteee that there are no divs, we need another strategy.
1121− case node of
1147+ -- While it's not documented in many places, there apparently is a paragraph aria role
1122− Generic ->
1148+ -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
1123− NodeName "p"
1149+ -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
1124−
1150+ -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
1131− gatherAttrRecursive classes
1151+ gatherAttrRecursive
1132− newNode
1152+ classes
1134 transform
1155 transform
@@ -1164,75 +1185,16 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1165 Styled styled ->
1186 Styled styled ->
1166 styles ++ styled.styles
1187 styles ++ styled.styles
1170− [ Html.Attributes.class <|
1174− [ Internal.Style.classes.nearby
1175− , Internal.Style.classes.single
1176− , Internal.Style.classes.above
1181− [ Internal.Style.classes.nearby
1182− , Internal.Style.classes.single
1183− , Internal.Style.classes.below
1188− [ Internal.Style.classes.nearby
1189− , Internal.Style.classes.single
1190− , Internal.Style.classes.onRight
1195− [ Internal.Style.classes.nearby
1196− , Internal.Style.classes.single
1197− , Internal.Style.classes.onLeft
1202− [ Internal.Style.classes.nearby
1203− , Internal.Style.classes.single
1204− , Internal.Style.classes.inFront
1209− [ Internal.Style.classes.nearby
1210− , Internal.Style.classes.single
1211− , Internal.Style.classes.behind
1225− styled.html NoStyleSheet asEl
1229− if location == Behind then
1230− Internal.Style.classes.hasBehind ++ " " ++ classes
1235− gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1189+ gatherAttrRecursive
1196+ (addNearbyElement location elem children)
1237 AlignX x ->
1199 AlignX x ->
1238 if Flag.present Flag.xAlign has then
1200 if Flag.present Flag.xAlign has then
@@ -1288,6 +1250,106 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1288 remaining
1250 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
1291renderWidth w =
1353renderWidth w =
1292 case w of
1354 case w of
1293 Px px ->
1355 Px px ->
@@ -1374,7 +1436,7 @@ renderHeight h =
1374 "height-px-" ++ val
1436 "height-px-" ++ val
1376 ( Flag.none
1438 ( Flag.none
1377− , name
1439+ , Internal.Style.classes.heightExact ++ " " ++ name
1378 , [ Single name "height" (val ++ "px") ]
1440 , [ Single name "height" (val ++ "px") ]
@@ -1397,7 +1459,7 @@ renderHeight h =
1397 , [ Single
1459 , [ Single
1398 (Internal.Style.classes.any
1460 (Internal.Style.classes.any
1400− ++ Internal.Style.classes.row
1462+ ++ Internal.Style.classes.column
1401 ++ " > "
1463 ++ " > "
1402 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1416,7 +1478,9 @@ renderHeight h =
1418 "min-height"
1480 "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.
1419− (String.fromInt minSize ++ "px")
1483+ (String.fromInt minSize ++ "px !important")
1421 ( newFlag, newAttrs, newStyle ) =
1485 ( newFlag, newAttrs, newStyle ) =
1422 renderHeight len
1486 renderHeight len
@@ -1494,7 +1558,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1494element context node attributes children =
1558element context node attributes children =
1495 attributes
1559 attributes
1496 |> List.reverse
1560 |> List.reverse
1497− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1561+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1498 |> createElement context children
1562 |> createElement context children
@@ -1657,13 +1721,8 @@ createElement context children rendered =
1657 (finalizeNode rendered.has
1721 (finalizeNode rendered.has
1658 rendered.node
1722 rendered.node
1659 rendered.attributes
1723 rendered.attributes
1660− (Keyed <|
1724+ (Keyed
1664− ( "nearby-elements-pls", x )
1666− rendered.children
1725+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1668 NoStyleSheet
1727 NoStyleSheet
@@ -1677,13 +1736,7 @@ createElement context children rendered =
1677 rendered.node
1736 rendered.node
1678 rendered.attributes
1737 rendered.attributes
1683− ( "nearby-elements-pls", x )
1685− rendered.children
1739+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
@@ -1705,7 +1758,7 @@ createElement context children rendered =
1705 rendered.has
1758 rendered.has
1706 rendered.node
1759 rendered.node
1707 rendered.attributes
1760 rendered.attributes
1708− (Unkeyed <| unkeyed ++ rendered.children)
1761+ (Unkeyed (addChildren unkeyed rendered.children))
1709 NoStyleSheet
1762 NoStyleSheet
@@ -1717,10 +1770,42 @@ createElement context children rendered =
1717 rendered.has
1770 rendered.has
1718 rendered.node
1771 rendered.node
1719 rendered.attributes
1772 rendered.attributes
1720− (Unkeyed (unkeyed ++ rendered.children))
1773+ (Unkeyed (addChildren 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
@@ -1732,8 +1817,20 @@ defaultOptions =
1735−staticRoot =
1820+staticRoot : OptionRecord -> VirtualDom.Node msg
1824+ -- wrap the style node in a div to prevent `Dark Reader` from blowin up the dom.
1825+ VirtualDom.node "div"
1736− VirtualDom.node "style" [] [ VirtualDom.text Internal.Style.rules ]
1827+ [ 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) ] []
1739addWhen ifThis x to =
1836addWhen ifThis x to =
@@ -1851,7 +1948,7 @@ type Spacing
1853type Padding
1950type Padding
1854− = Padding String Int Int Int Int
1951+ = Padding String Float Float Float Float
1857extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -1947,34 +2044,44 @@ getHeight attrs =
2047+textElementClasses : String
2048+textElementClasses =
2053+ ++ classes.widthContent
2055+ ++ classes.heightContent
1950textElement : String -> VirtualDom.Node msg
2058textElement : String -> VirtualDom.Node msg
1951textElement str =
2059textElement str =
1952 Html.div
2060 Html.div
1953 [ Html.Attributes.class
2061 [ Html.Attributes.class
1954− (String.join " "
2062+ textElementClasses
1957− , classes.widthContent
1958− , classes.heightContent
1962 [ Html.text str ]
2064 [ Html.text str ]
2067+textElementFillClasses : String
2068+textElementFillClasses =
2073+ ++ classes.widthFill
2075+ ++ classes.heightFill
1965textElementFill : String -> VirtualDom.Node msg
2078textElementFill : String -> VirtualDom.Node msg
1966textElementFill str =
2079textElementFill str =
1967− VirtualDom.node "div"
2080+ Html.div
1968 [ Html.Attributes.class
2081 [ Html.Attributes.class
1969− (String.join " "
2082+ textElementFillClasses
1972− , classes.widthFill
1973− , classes.heightFill
1977− [ VirtualDom.text str ]
2084+ [ Html.text str ]
1980type Children x
2087type Children x
@@ -1982,10 +2089,6 @@ type Children x
1982 | Keyed (List ( String, x ))
2089 | Keyed (List ( String, x ))
1986−-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
1989toHtml mode el =
2092toHtml mode el =
1990 case el of
2093 case el of
1991 Unstyled html ->
2094 Unstyled html ->
@@ -2021,8 +2124,7 @@ renderRoot optionList attributes child =
2023type RenderMode
2126type RenderMode
2025− | Layout
2127+ = Layout
2026 | NoStaticStyleSheet
2128 | NoStaticStyleSheet
2027 | WithVirtualCss
2129 | WithVirtualCss
@@ -2071,8 +2173,8 @@ rootStyle =
2071 , SansSerif
2173 , SansSerif
2074− [ StyleClass Flag.bgColor (Colored ("bg-color-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2176+ [ StyleClass Flag.bgColor (Colored ("bg-" ++ formatColorClass (Rgba 1 1 1 0)) "background-color" (Rgba 1 1 1 0))
2075− , StyleClass Flag.fontColor (Colored ("font-color-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2177+ , StyleClass Flag.fontColor (Colored ("fc-" ++ formatColorClass (Rgba 0 0 0 1)) "color" (Rgba 0 0 0 1))
2076 , StyleClass Flag.fontSize (FontSize 20)
2178 , StyleClass Flag.fontSize (FontSize 20)
2077 , StyleClass Flag.fontFamily <|
2179 , StyleClass Flag.fontFamily <|
2078 FontFamily (List.foldl renderFontClassName "font-" families)
2180 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2115,9 +2217,38 @@ renderFontClassName font current =
2116renderFocusStyle :
2218renderFocusStyle :
2117 FocusStyle
2219 FocusStyle
2118− -> Style
2220+ -> List Style
2119renderFocusStyle focus =
2221renderFocusStyle 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, ")
2120− Style (Internal.Style.dot classes.any ++ ":focus .focusable, " ++ Internal.Style.dot classes.any ++ ".focusable:focus")
2249+ ++ (Internal.Style.dot classes.any ++ ".focusable:focus, ")
2250+ ++ (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb")
2121 (List.filterMap identity
2252 (List.filterMap identity
2122 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2123 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2140,6 +2271,7 @@ renderFocusStyle focus =
2140 , Just <| Property "outline" "none"
2271 , Just <| Property "outline" "none"
2145focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2151,7 +2283,7 @@ focusDefaultStyle =
2151 { color =
2283 { color =
2152 Rgba (155 / 255) (203 / 255) 1 1
2284 Rgba (155 / 255) (203 / 255) 1 1
2153 , offset = ( 0, 0 )
2285 , offset = ( 0, 0 )
2154− , blur = 3
2286+ , blur = 0
2155 , size = 3
2287 , size = 3
@@ -2221,7 +2353,31 @@ optionsToRecord options =
2222toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2354toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2223toStyleSheet options styleSheet =
2355toStyleSheet 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"
2224− VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2372+ [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2376+ VirtualDom.node "elm-ui-rules"
2377+ [ VirtualDom.property "rules"
2378+ (encodeStyles options styleSheet)
2227renderTopLevelValues rules =
2383renderTopLevelValues rules =
@@ -2231,14 +2387,12 @@ renderTopLevelValues rules =
2231 ImportFont _ url ->
2387 ImportFont _ url ->
2232 Just ("@import url('" ++ url ++ "');")
2388 Just ("@import url('" ++ url ++ "');")
2234− FontWith with ->
2390+ -- FontWith with ->
2235− case with.url of
2391+ -- case with.url of
2236− Just x ->
2392+ -- Just x ->
2237− Just ("@import url('" ++ x ++ "');")
2393+ -- Just ("@import url('" ++ x ++ "');")
2239− Nothing ->
2394+ -- Nothing ->
2240− Nothing
2395+ -- Nothing
@@ -2379,12 +2533,17 @@ typefaceAdjustment typefaces =
2379 Nothing ->
2533 Nothing ->
2380 case face of
2534 case face of
2381 FontWith with ->
2535 FontWith with ->
2382− Just
2536+ case with.adjustment of
2383− ( fontAdjustmentRules
2542+ ( fontAdjustmentRules
2384− (.full (convertAdjustment with.adjustment))
2543+ (.full (convertAdjustment adjustment))
2385− , fontAdjustmentRules
2544+ , fontAdjustmentRules
2386− (.capital (convertAdjustment with.adjustment))
2545+ (.capital (convertAdjustment adjustment))
@@ -2434,489 +2593,492 @@ renderProps force (Property key val) existing =
2434 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2593 existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596+encodeStyles options stylesheet =
2602+ renderStyleRule options style Nothing
2604+ ( getStyleName style, Encode.list Encode.string styled )
2437toStyleSheetString : OptionRecord -> List Style -> String
2609toStyleSheetString : OptionRecord -> List Style -> String
2438toStyleSheetString options stylesheet =
2610toStyleSheetString options stylesheet =
2440− renderStyle maybePseudo selector props =
2612+ combine style rendered =
2441− case maybePseudo of
2613+ { rules = rendered.rules ++ renderStyleRule options style Nothing
2442− Nothing ->
2614+ , topLevel =
2443− selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2615+ case topLevelValue style of
2445− Just pseudo ->
2617+ rendered.topLevel
2448− case options.hover of
2452− ForceHover ->
2619+ Just topLevel ->
2453− selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2620+ topLevel :: rendered.topLevel
2623+ case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2624+ { topLevel, rules } ->
2625+ renderTopLevelValues topLevel ++ String.concat rules
2456− selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2458− Focus ->
2628+renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2459− let
2629+renderStyle options maybePseudo selector props =
2460− renderedProps =
2630+ case maybePseudo of
2461− List.foldl (renderProps False) "" props
2632+ [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2472− ++ "-fs:not(.focus) {"
2482− , ".focusable-parent:focus ~ "
2492− Active ->
2634+ Just pseudo ->
2493− selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2635+ case pseudo of
2637+ case options.hover of
2495− renderStyleRule rule maybePseudo =
2641+ ForceHover ->
2496− case rule of
2642+ [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2497− Style selector props ->
2498− renderStyle maybePseudo selector props
2500− Shadows name prop ->
2644+ AllowHover ->
2501− renderStyle
2645+ [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2504− [ Property "box-shadow" prop
2507− Transparency name transparency ->
2647+ Focus ->
2509− opacity =
2649+ renderedProps =
2510− (1 - transparency)
2650+ List.foldl (renderProps False) "" props
2514− renderStyle
2652+ [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2515− maybePseudo
2653+ , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2516− ("." ++ name)
2654+ ++ renderedProps
2517− [ Property "opacity" (String.fromFloat opacity)
2655+ ++ "\n}"
2656+ , (selector ++ "-fs:focus-within {")
2659+ , (".ui-slide-bar:focus + " ++ Internal.Style.dot classes.any ++ " .focusable-thumb" ++ selector ++ "-fs {")
2520− FontSize i ->
2664+ Active ->
2521− renderStyle
2665+ [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2523− (".font-size-" ++ String.fromInt i)
2524− [ Property "font-size" (String.fromInt i ++ "px")
2527− FontFamily name typefaces ->
2531− |> List.filterMap renderVariants
2532− |> String.join ", "
2535− [ Property "font-family"
2537− |> List.map fontName
2538− |> String.join ", "
2540− , Property "font-feature-settings" features
2541− , Property "font-variant"
2542− (if List.any hasSmallCaps typefaces then
2545− else
2668+renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2546− "normal"
2669+renderStyleRule options rule maybePseudo =
2547− )
2670+ case rule of
2548− ]
2671+ Style selector props ->
2549− in
2672+ renderStyle options maybePseudo selector props
2550− String.join " "
2673+
2674+ Shadows name prop ->
2551− [ renderStyle
2675+ renderStyle options
2552− maybePseudo
2676+ maybePseudo
2553− ("." ++ name)
2677+ ("." ++ name)
2554− families
2678+ [ Property "box-shadow" prop
2557− Single class prop val ->
2681+ Transparency name transparency ->
2558− renderStyle
2688+ renderStyle options
2559− maybePseudo
2689+ maybePseudo
2560− ("." ++ class)
2690+ ("." ++ name)
2561− [ Property prop val
2691+ [ Property "opacity" (String.fromFloat opacity)
2564− Colored class prop color ->
2694+ FontSize i ->
2565− renderStyle
2695+ renderStyle options
2566− maybePseudo
2696+ maybePseudo
2567− ("." ++ class)
2697+ (".font-size-" ++ String.fromInt i)
2568− [ Property prop (formatColor color)
2698+ [ Property "font-size" (String.fromInt i ++ "px")
2571− SpacingStyle cls x y ->
2701+ FontFamily name typefaces ->
2573− class =
2703+ features =
2574− "." ++ cls
2704+ 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
2577− String.fromFloat (toFloat x / 2) ++ "px"
2720+ "normal"
2724+ renderStyle options
2579− halfY =
2729+ Single class prop val ->
2580− String.fromFloat (toFloat y / 2) ++ "px"
2730+ renderStyle options
2733+ [ Property prop val
2582− xPx =
2736+ Colored class prop color ->
2583− String.fromInt x ++ "px"
2737+ renderStyle options
2740+ [ Property prop (formatColor color)
2585− yPx =
2743+ SpacingStyle cls x y ->
2586− String.fromInt y ++ "px"
2744+ let
2589− "." ++ Internal.Style.classes.row
2749+ String.fromFloat (toFloat x / 2) ++ "px"
2591− wrappedRow =
2751+ halfY =
2592− "." ++ Internal.Style.classes.wrapped ++ row
2752+ String.fromFloat (toFloat y / 2) ++ "px"
2594− column =
2754+ xPx =
2595− "." ++ Internal.Style.classes.column
2755+ String.fromInt x ++ "px"
2598− "." ++ Internal.Style.classes.page
2758+ String.fromInt y ++ "px"
2600− paragraph =
2760+ row =
2601− "." ++ Internal.Style.classes.paragraph
2761+ "." ++ Internal.Style.classes.row
2603− left =
2763+ wrappedRow =
2604− "." ++ Internal.Style.classes.alignLeft
2764+ "." ++ Internal.Style.classes.wrapped ++ row
2606− right =
2766+ column =
2607− "." ++ Internal.Style.classes.alignRight
2767+ "." ++ Internal.Style.classes.column
2610− "." ++ Internal.Style.classes.any
2770+ "." ++ Internal.Style.classes.page
2612− single =
2772+ paragraph =
2613− "." ++ Internal.Style.classes.single
2773+ "." ++ Internal.Style.classes.paragraph
2616− [ renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2618− -- margins don't apply to last element of normal, unwrapped rows
2619− -- , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2620− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2621− , renderStyle maybePseudo
2622− (class ++ wrappedRow ++ " > " ++ any)
2623− [ Property "margin" (halfY ++ " " ++ halfX)
2626− -- , renderStyle maybePseudo
2775+ left =
2627− -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2776+ "." ++ Internal.Style.classes.alignLeft
2628− -- [ Property "margin-right" "0"
2631− , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2632− , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2633− , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2634− , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2637− (class ++ paragraph)
2638− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2642− ("textarea" ++ class)
2643− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2648− -- (class ++ paragraph ++ " > " ++ any)
2649− -- [ Property "margin-right" xPx
2650− -- , Property "margin-bottom" yPx
2654− (class ++ paragraph ++ " > " ++ left)
2655− [ Property "margin-right" xPx
2659− (class ++ paragraph ++ " > " ++ right)
2778+ right =
2660− [ Property "margin-left" xPx
2779+ "." ++ Internal.Style.classes.alignRight
2664− (class ++ paragraph ++ "::after")
2665− [ Property "content" "''"
2666− , Property "display" "block"
2667− , Property "height" "0"
2668− , Property "width" "0"
2669− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2673− (class ++ paragraph ++ "::before")
2674− [ Property "content" "''"
2675− , Property "display" "block"
2676− , Property "height" "0"
2677− , Property "width" "0"
2678− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2682− PaddingStyle cls top right bottom left ->
2781+ any =
2683− let
2782+ "." ++ Internal.Style.classes.any
2691− [ Property "padding"
2692− (String.fromInt top
2694− ++ String.fromInt right
2696− ++ String.fromInt bottom
2698− ++ String.fromInt left
2703− BorderWidth cls top right bottom left ->
2784+ single =
2704− let
2785+ "." ++ Internal.Style.classes.single
2709− renderStyle
2787+ List.concat
2710− maybePseudo
2788+ [ renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2712− [ Property "border-width"
2790+ -- margins don't apply to last element of normal, unwrapped rows
2713− (String.fromInt top
2791+ -- , renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2714− ++ "px "
2792+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2715− ++ String.fromInt right
2793+ , renderStyle options
2716− ++ "px "
2794+ maybePseudo
2717− ++ String.fromInt bottom
2795+ (class ++ wrappedRow ++ " > " ++ any)
2718− ++ "px "
2796+ [ Property "margin" (halfY ++ " " ++ halfX)
2719− ++ String.fromInt left
2724− GridTemplateStyle template ->
2799+ -- , renderStyle options maybePseudo
2725− let
2800+ -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2726− class =
2801+ -- [ Property "margin-right" "0"
2727− ".grid-rows-"
2802+ -- ]
2728− ++ String.join "-" (List.map lengthClassName template.rows)
2730− ++ String.join "-" (List.map lengthClassName template.columns)
2732− ++ lengthClassName (Tuple.first template.spacing)
2734− ++ lengthClassName (Tuple.second template.spacing)
2737− toGridLength (Tuple.second template.spacing)
2740− toGridLength (Tuple.first template.spacing)
2743− toGridLengthHelper Nothing Nothing x
2745− toGridLengthHelper minimum maximum x =
2748− String.fromInt px ++ "px"
2751− case ( minimum, maximum ) of
2752− ( Nothing, Nothing ) ->
2755− ( Just minSize, Nothing ) ->
2756− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2758− ( Nothing, Just maxSize ) ->
2759− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2761− ( Just minSize, Just maxSize ) ->
2762− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2765− case ( minimum, maximum ) of
2766− ( Nothing, Nothing ) ->
2767− String.fromInt i ++ "fr"
2769− ( Just minSize, Nothing ) ->
2770− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2772− ( Nothing, Just maxSize ) ->
2773− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2775− ( Just minSize, Just maxSize ) ->
2776− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2779− toGridLengthHelper (Just m) maximum len
2782− toGridLengthHelper minimum (Just m) len
2786− |> List.map toGridLength
2787− |> String.join ySpacing
2788− |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2792− |> List.map toGridLength
2793− |> String.join ySpacing
2794− |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2797− class ++ "{" ++ msColumns ++ msRows ++ "}"
2800− template.columns
2803+ -- columns
2801− |> List.map toGridLength
2804+ , renderStyle options maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2802− |> String.join " "
2805+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2803− |> (\x -> "grid-template-columns: " ++ x ++ ";")
2806+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2804−
2807+ , renderStyle options maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2805− rows =
2808+ , renderStyle options
2806− template.rows
2809+ maybePseudo
2807− |> List.map toGridLength
2810+ (class ++ paragraph)
2808− |> String.join " "
2811+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2809− |> (\x -> "grid-template-rows: " ++ x ++ ";")
2812+ ]
2810−
2813+ , renderStyle options
2811− gapX =
2814+ maybePseudo
2812− "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2815+ ("textarea" ++ any ++ class)
2813−
2816+ [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2814− gapY =
2817+ , Property "height" ("calc(100% + " ++ String.fromInt y ++ "px)")
2815− "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2818+ ]
2818− class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2821− "@supports (display:grid) {" ++ modernGrid ++ "}"
2825− GridPosition position ->
2820+ -- , renderStyle options
2826− let
2821+ -- maybePseudo
2827− class =
2822+ -- (class ++ paragraph ++ " > " ++ any)
2828− ".grid-pos-"
2823+ -- [ Property "margin-right" xPx
2829− ++ String.fromInt position.row
2824+ -- , Property "margin-bottom" yPx
2831− ++ String.fromInt position.col
2826+ , renderStyle options
2832− ++ "-"
2827+ maybePseudo
2833− ++ String.fromInt position.width
2828+ (class ++ paragraph ++ " > " ++ left)
2834− ++ "-"
2829+ [ Property "margin-right" xPx
2835− ++ String.fromInt position.height
2830+ ]
2836−
2831+ , renderStyle options
2837− msPosition =
2832+ maybePseudo
2838− String.join " "
2833+ (class ++ paragraph ++ " > " ++ right)
2839− [ "-ms-grid-row: "
2834+ [ Property "margin-left" xPx
2840− ++ String.fromInt position.row
2835+ ]
2841− ++ ";"
2836+ , renderStyle options
2842− , "-ms-grid-row-span: "
2837+ maybePseudo
2843− ++ String.fromInt position.height
2838+ (class ++ paragraph ++ "::after")
2844− ++ ";"
2839+ [ Property "content" "''"
2845− , "-ms-grid-column: "
2840+ , Property "display" "block"
2846− ++ String.fromInt position.col
2841+ , Property "height" "0"
2847− ++ ";"
2842+ , Property "width" "0"
2848− , "-ms-grid-column-span: "
2843+ , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2849− ++ String.fromInt position.width
2844+ ]
2850− ++ ";"
2845+ , renderStyle options
2852−
2847+ (class ++ paragraph ++ "::before")
2853− base =
2848+ [ Property "content" "''"
2854− class ++ "{" ++ msPosition ++ "}"
2849+ , Property "display" "block"
2855−
2850+ , Property "height" "0"
2856− modernPosition =
2851+ , Property "width" "0"
2857− String.join " "
2852+ , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2858− [ "grid-row: "
2853+ ]
2859− ++ String.fromInt position.row
2854+ ]
2861− ++ String.fromInt (position.row + position.height)
2864− ++ String.fromInt position.col
2866− ++ String.fromInt (position.col + position.width)
2871− class ++ "{" ++ modernPosition ++ "}"
2874− "@supports (display:grid) {" ++ modernGrid ++ "}"
2878− PseudoSelector class styles ->
2856+ PaddingStyle cls top right bottom left ->
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 ->
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 ->
2880− renderPseudoRule style =
2900+ class =
2881− renderStyleRule style (Just class)
2901+ ".grid-rows-"
2882− in
2902+ ++ String.join "-" (List.map lengthClassName template.rows)
2883− List.map renderPseudoRule styles
2903+ ++ "-cols-"
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
2884 |> String.join " "
2976 |> String.join " "
2977+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2886− Transform transform ->
2979+ rows =
2887− let
2980+ template.rows
2888− val =
2981+ |> List.map toGridLength
2889− transformValue transform
2982+ |> String.join " "
2983+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2891− class =
2985+ gapX =
2892− transformClass transform
2986+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2894− case ( class, val ) of
2895− ( Just cls, Just v ) ->
2899− [ Property "transform"
2904− ""
2989+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2906− combine style rendered =
2991+ modernGrid =
2907− { rules = rendered.rules ++ renderStyleRule style Nothing
2992+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2909− case topLevelValue style of
2913− Just topLevel ->
2994+ supports =
2914− topLevel :: rendered.topLevel
2995+ "@supports (display:grid) {" ++ modernGrid ++ "}"
3001+ GridPosition position ->
3005+ ++ String.fromInt position.row
3007+ ++ String.fromInt position.col
3009+ ++ String.fromInt position.width
3011+ ++ String.fromInt position.height
3016+ ++ String.fromInt position.row
3018+ , "-ms-grid-row-span: "
3019+ ++ String.fromInt position.height
3021+ , "-ms-grid-column: "
3022+ ++ String.fromInt position.col
3024+ , "-ms-grid-column-span: "
3025+ ++ String.fromInt position.width
3030+ class ++ "{" ++ msPosition ++ "}"
3035+ ++ String.fromInt position.row
3037+ ++ String.fromInt (position.row + position.height)
3040+ ++ String.fromInt position.col
3042+ ++ String.fromInt (position.col + position.width)
3047+ class ++ "{" ++ modernPosition ++ "}"
3050+ "@supports (display:grid) {" ++ modernGrid ++ "}"
2917− case List.foldl combine { topLevel = [], rules = "" } stylesheet of
3052+ [ base
2918− { topLevel, rules } ->
3053+ , supports
2919− renderTopLevelValues topLevel ++ rules
3054+ ]
3056+ PseudoSelector class styles ->
3058+ renderPseudoRule style =
3059+ renderStyleRule options style (Just class)
3061+ List.concatMap renderPseudoRule styles
3063+ Transform transform ->
3066+ transformValue transform
3069+ transformClass transform
3071+ case ( class, val ) of
3072+ ( Just cls, Just v ) ->
3073+ renderStyle options
3076+ [ Property "transform"
2922lengthClassName : Length -> String
3084lengthClassName : Length -> String
@@ -2956,12 +3118,12 @@ formatTextShadow shadow =
2959−textShadowName shadow =
3121+textShadowClass shadow =
2960 String.concat
3122 String.concat
2962− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3124+ , floatClass (Tuple.first shadow.offset) ++ "px"
2963− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3125+ , floatClass (Tuple.second shadow.offset) ++ "px"
2964− , String.fromFloat shadow.blur ++ "px"
3126+ , floatClass shadow.blur ++ "px"
2965 , formatColorClass shadow.color
3127 , formatColorClass shadow.color
@@ -2982,17 +3144,17 @@ formatBoxShadow shadow =
2985−boxShadowName shadow =
3147+boxShadowClass shadow =
2986 String.concat <|
3148 String.concat <|
2987 [ if shadow.inset then
3149 [ if shadow.inset then
2988 "box-inset"
3150 "box-inset"
2992− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3154+ , floatClass (Tuple.first shadow.offset) ++ "px"
2993− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3155+ , floatClass (Tuple.second shadow.offset) ++ "px"
2994− , String.fromFloat shadow.blur ++ "px"
3156+ , floatClass shadow.blur ++ "px"
2995− , String.fromFloat shadow.size ++ "px"
3157+ , floatClass shadow.size ++ "px"
2996 , formatColorClass shadow.color
3158 , formatColorClass shadow.color
@@ -3037,6 +3199,17 @@ paddingName top right bottom left =
3037 ++ String.fromInt left
3199 ++ String.fromInt left
3202+paddingNameFloat top right bottom left =
3206+ ++ floatClass right
3208+ ++ floatClass bottom
3040getStyleName : Style -> String
3213getStyleName : Style -> String
3041getStyleName style =
3214getStyleName style =
3042 case style of
3215 case style of