@@ -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
@@ -29,6 +30,7 @@ module Internal.Model exposing
29 , TransformComponent(..)
30 , TransformComponent(..)
30 , Transformation(..)
31 , Transformation(..)
31 , VAlign(..)
32 , VAlign(..)
33 , addNodeName
35 , addNodeName
@@ -40,7 +42,7 @@ module Internal.Model exposing
40 , asParagraph
42 , asParagraph
42 , asTextColumn
44 , asTextColumn
43− , boxShadowName
45+ , boxShadowClass
44 , columnClass
46 , columnClass
45 , composeTransformation
47 , composeTransformation
46 , contextClasses
48 , contextClasses
@@ -77,40 +79,30 @@ module Internal.Model exposing
77 , onlyStyles
79 , onlyStyles
78 , optionsToRecord
80 , optionsToRecord
79 , paddingName
81 , paddingName
80 , pageClass
83 , pageClass
81 , paragraphClass
84 , paragraphClass
82 , reduceRecursive
85 , reduceRecursive
83− , reduceRecursiveCalcName
84 , reduceStyles
86 , reduceStyles
85 , reduceStylesRecursive
87 , reduceStylesRecursive
86 , removeNever
88 , removeNever
89 , renderFontClassName
89 , renderFontClassName
90 , renderHeight
90 , renderHeight
91 , renderRoot
91 , renderRoot
92 , renderWidth
93 , renderWidth
93 , rootStyle
94 , rootStyle
94 , rowClass
95 , rowClass
95 , singleClass
96 , singleClass
98 , spacingName
97 , spacingName
101− , textElement
99+ , textShadowClass
105 , toStyleSheet
101 , toStyleSheet
106− , toStyleSheetString
107 , transformClass
102 , transformClass
110 , unstyled
103 , unstyled
112 , unwrapDecorations
104 , unwrapDecorations
113− , unwrapDecsHelper
105+ , variantName
@@ -120,7 +112,7 @@ import Html.Attributes
120import Html.Keyed
112import Html.Keyed
121import Internal.Flag as Flag exposing (Flag)
113import Internal.Flag as Flag exposing (Flag)
122import Internal.Style exposing (classes, dot)
114import Internal.Style exposing (classes, dot)
123−import Json.Encode as Json
115+import Json.Encode as Encode
124import Set exposing (Set)
116import Set exposing (Set)
125import VirtualDom
117import VirtualDom
@@ -182,7 +174,7 @@ type Style
182 | Colored String String Color
174 | Colored String String Color
183 | SpacingStyle String Int Int
175 | SpacingStyle String Int Int
184 | BorderWidth String Int Int Int Int
176 | BorderWidth String Int Int Int Int
185− | PaddingStyle String Int Int Int Int
177+ | PaddingStyle String Float Float Float Float
186 | GridTemplateStyle
178 | GridTemplateStyle
187 { spacing : ( Length, Length )
179 { spacing : ( Length, Length )
188 , columns : List Length
180 , columns : List Length
@@ -213,12 +205,86 @@ type PseudoClass
209+type alias Adjustment =
218 | SansSerif
219 | SansSerif
219 | Monospace
220 | Monospace
220 | Typeface String
221 | Typeface String
221 | ImportFont String String
222 | ImportFont String String
225+ , adjustment : Maybe Adjustment
226+ , variants : List Variant
231+ = VariantActive String
233+ | VariantIndexed String Int
238+ VariantActive name ->
239+ "\"" ++ name ++ "\""
242+ "\"" ++ name ++ "\" 0"
244+ VariantIndexed name index ->
245+ "\"" ++ name ++ "\" " ++ String.fromInt index
250+ VariantActive name ->
256+ VariantIndexed name index ->
257+ name ++ "-" ++ String.fromInt index
260+renderVariants typeface =
263+ Just (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
224type Property
290type Property
@@ -306,6 +372,13 @@ type NodeName
306 | 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))
@@ -314,7 +387,7 @@ type alias Gathered msg =
314 { node : NodeName
387 { node : NodeName
315 , attributes : List (VirtualDom.Attribute msg)
388 , attributes : List (VirtualDom.Attribute msg)
316 , styles : List Style
389 , styles : List Style
317− , children : List (VirtualDom.Node msg)
390+ , children : NearbyChildren msg
318 , has : Flag.Field
391 , has : Flag.Field
@@ -382,7 +455,10 @@ finalizeNode has node attributes children embedMode parentContext =
382 Embedded nodeName internal ->
455 Embedded nodeName internal ->
383 VirtualDom.node nodeName
456 VirtualDom.node nodeName
384 attributes
457 attributes
458+ [ createNode internal
459+ [ Html.Attributes.class
385− [ createNode internal [ Html.Attributes.class (classes.any ++ " " ++ classes.single) ]
460+ (classes.any ++ " " ++ classes.single)
388 case parentContext of
464 case parentContext of
@@ -459,49 +535,45 @@ finalizeNode has node attributes children embedMode parentContext =
461embedWith 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
462 if static then
547 if static then
463− staticRoot
548+ staticRoot opts
464− :: (styles
549+ :: dynamicStyleSheet
465− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
467− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
469− |> toStyleSheet opts
471 :: children
550 :: children
474− (styles
553+ dynamicStyleSheet
475− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
477− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
479− |> toStyleSheet opts
481 :: children
554 :: children
484embedKeyed 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
485 if static then
567 if static then
486− ( "static-stylesheet", staticRoot )
568+ ( "static-stylesheet", staticRoot opts )
487 :: ( "dynamic-stylesheet"
569 :: ( "dynamic-stylesheet"
488− , styles
570+ , dynamicStyleSheet
489− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
491− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
493− |> toStyleSheet opts
495 :: children
572 :: children
498 ( "dynamic-stylesheet"
575 ( "dynamic-stylesheet"
499− , styles
576+ , dynamicStyleSheet
500− |> List.foldl reduceStyles ( Set.empty, [ renderFocusStyle opts.focus ] )
502− -- |> reduceStylesRecursive Set.empty [ ]) --renderFocusStyle opts.focus ]
504− |> toStyleSheet opts
506 :: children
578 :: children
@@ -817,7 +889,16 @@ skippable flag style =
820−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)
821gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
902gatherAttrRecursive classes node has transform styles attrs children elementAttrs =
822 case elementAttrs of
903 case elementAttrs of
@@ -951,7 +1032,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
952 gatherAttrRecursive (classes ++ " " ++ newClass)
1033 gatherAttrRecursive (classes ++ " " ++ newClass)
954− (Flag.merge addToFlags has)
1035+ (Flag.merge addToFlags (Flag.add Flag.width has))
955 transform
1036 transform
956 (newStyles ++ styles)
1037 (newStyles ++ styles)
@@ -972,7 +1053,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
973 "height-px-" ++ val
1054 "height-px-" ++ val
975− gatherAttrRecursive (name ++ " " ++ classes)
1056+ gatherAttrRecursive (Internal.Style.classes.heightExact ++ " " ++ name ++ " " ++ classes)
977 (Flag.add Flag.height has)
1058 (Flag.add Flag.height has)
978 transform
1059 transform
@@ -1029,7 +1110,7 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1030 gatherAttrRecursive (classes ++ " " ++ newClass)
1111 gatherAttrRecursive (classes ++ " " ++ newClass)
1032− (Flag.merge addToFlags has)
1113+ (Flag.merge addToFlags (Flag.add Flag.height has))
1033 transform
1114 transform
1034 (newStyles ++ styles)
1115 (newStyles ++ styles)
@@ -1061,20 +1142,15 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1061 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1142 gatherAttrRecursive classes (addNodeName "h6" node) has transform styles attrs children remaining
1063 Paragraph ->
1144 Paragraph ->
1064− let
1145+ -- previously we rendered a <p> tag, though apparently this invalidates the html if it has <div>s inside.
1065− newNode =
1146+ -- Since we can't guaranteee that there are no divs, we need another strategy.
1066− case node of
1147+ -- While it's not documented in many places, there apparently is a paragraph aria role
1067− Generic ->
1148+ -- https://github.com/w3c/aria/blob/11f85f41a5b621fdbe85fc9bcdcd270e653a48ba/common/script/roleInfo.js
1068− NodeName "p"
1149+ -- Though we'll need to wait till it gets released in an official wai-aria spec to use it.
1069−
1150+ -- If it's used at the moment, then Lighthouse complains (likely rightfully) that role paragraph is not recognized.
1076− gatherAttrRecursive classes
1151+ gatherAttrRecursive
1077− newNode
1152+ classes
1079 transform
1155 transform
@@ -1109,75 +1185,16 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1110 Styled styled ->
1186 Styled styled ->
1111 styles ++ styled.styles
1187 styles ++ styled.styles
1115− [ Html.Attributes.class <|
1119− [ Internal.Style.classes.nearby
1120− , Internal.Style.classes.single
1121− , Internal.Style.classes.above
1126− [ Internal.Style.classes.nearby
1127− , Internal.Style.classes.single
1128− , Internal.Style.classes.below
1133− [ Internal.Style.classes.nearby
1134− , Internal.Style.classes.single
1135− , Internal.Style.classes.onRight
1140− [ Internal.Style.classes.nearby
1141− , Internal.Style.classes.single
1142− , Internal.Style.classes.onLeft
1147− [ Internal.Style.classes.nearby
1148− , Internal.Style.classes.single
1149− , Internal.Style.classes.inFront
1154− [ Internal.Style.classes.nearby
1155− , Internal.Style.classes.single
1156− , Internal.Style.classes.behind
1170− styled.html NoStyleSheet asEl
1174− if location == Behind then
1175− Internal.Style.classes.hasBehind ++ " " ++ classes
1180− gatherAttrRecursive newClasses node has transform newStyles attrs (nearbyElement :: children) remaining
1189+ gatherAttrRecursive
1196+ (addNearbyElement location elem children)
1182 AlignX x ->
1199 AlignX x ->
1183 if Flag.present Flag.xAlign has then
1200 if Flag.present Flag.xAlign has then
@@ -1233,6 +1250,106 @@ gatherAttrRecursive classes node has transform styles attrs children elementAttr
1233 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
1236renderWidth w =
1353renderWidth w =
1237 case w of
1354 case w of
1238 Px px ->
1355 Px px ->
@@ -1319,7 +1436,7 @@ renderHeight h =
1319 "height-px-" ++ val
1436 "height-px-" ++ val
1321 ( Flag.none
1438 ( Flag.none
1322− , name
1439+ , Internal.Style.classes.heightExact ++ " " ++ name
1323 , [ Single name "height" (val ++ "px") ]
1440 , [ Single name "height" (val ++ "px") ]
@@ -1342,7 +1459,7 @@ renderHeight h =
1342 , [ Single
1459 , [ Single
1343 (Internal.Style.classes.any
1460 (Internal.Style.classes.any
1345− ++ Internal.Style.classes.row
1462+ ++ Internal.Style.classes.column
1346 ++ " > "
1463 ++ " > "
1347 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
1464 ++ (Internal.Style.dot <| "height-fill-" ++ String.fromInt portion)
@@ -1361,7 +1478,9 @@ renderHeight h =
1363 "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.
1364− (String.fromInt minSize ++ "px")
1483+ (String.fromInt minSize ++ "px !important")
1366 ( newFlag, newAttrs, newStyle ) =
1485 ( newFlag, newAttrs, newStyle ) =
1367 renderHeight len
1486 renderHeight len
@@ -1439,7 +1558,7 @@ element : LayoutContext -> NodeName -> List (Attribute aligned msg) -> Children
1439element context node attributes children =
1558element context node attributes children =
1440 attributes
1559 attributes
1441 |> List.reverse
1560 |> List.reverse
1442− |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] []
1561+ |> gatherAttrRecursive (contextClasses context) node Flag.none untransformed [] [] NoNearbyChildren
1443 |> createElement context children
1562 |> createElement context children
@@ -1488,36 +1607,33 @@ createElement context children rendered =
1488 -- Same if it's a column or row with one child and width-content, height-content
1607 -- Same if it's a column or row with one child and width-content, height-content
1489 -- interferes with css grid
1608 -- interferes with css grid
1490 -- Maybe we could unpack text elements in a paragraph as well,
1609 -- Maybe we could unpack text elements in a paragraph as well,
1491− -- however embedded style elements that are larger than the line height will overlap with exisitng text.
1610+ -- however, embedded elements that are larger than the line height will overlap with exisitng text.
1492 -- I don't think that's what we want.
1611 -- I don't think that's what we want.
1494− context
1613+ -- context
1495− == asEl
1614+ -- == asEl
1496− || context
1615+ -- || context
1497− == asParagraph
1616+ -- == asParagraph
1499− ( VirtualDom.text
1618+ -- ( VirtualDom.text
1500− (if context == asParagraph then
1619+ -- (if context == asParagraph then
1501− str ++ " "
1620+ -- str
1506− :: htmls
1624+ -- :: htmls
1507− , existingStyles
1625+ -- , existingStyles
1628+ ( (if context == asEl then
1629+ textElementFill str
1511− ( textElement
1632+ textElement str
1512− (if context == asParagraph then
1518− :: htmls
1634+ :: htmls
1519− , existingStyles
1635+ , existingStyles
1522 Empty ->
1638 Empty ->
1523 ( htmls, existingStyles )
1639 ( htmls, existingStyles )
@@ -1559,38 +1675,30 @@ createElement context children rendered =
1559 -- TEXT OPTIMIZATION
1675 -- TEXT OPTIMIZATION
1560 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1676 -- You can have raw text if the element is an el, and has `width-content` and `height-content`
1561 -- Same if it's a column or row with one child and width-content, height-content
1677 -- Same if it's a column or row with one child and width-content, height-content
1563− context
1679+ -- context
1564− == asEl
1680+ -- == asEl
1565− || context
1681+ -- || context
1566− == asParagraph
1682+ -- == asParagraph
1568− ( ( key
1684+ -- ( ( key
1569− , VirtualDom.text
1685+ -- , VirtualDom.text
1570− (if context == asParagraph then
1577− :: htmls
1688+ -- :: htmls
1578− , existingStyles
1689+ -- , existingStyles
1693+ , if context == asEl then
1694+ textElementFill str
1584− (if context == asParagraph then
1588− str
1697+ textElement str
1591− :: htmls
1699+ :: htmls
1592− , existingStyles
1700+ , existingStyles
1595 Empty ->
1703 Empty ->
1596 ( htmls, existingStyles )
1704 ( htmls, existingStyles )
@@ -1613,13 +1721,8 @@ createElement context children rendered =
1613 (finalizeNode rendered.has
1721 (finalizeNode rendered.has
1614 rendered.node
1722 rendered.node
1615 rendered.attributes
1723 rendered.attributes
1616− (Keyed <|
1724+ (Keyed
1620− ( "nearby-elements-pls", x )
1622− rendered.children
1725+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
1624 NoStyleSheet
1727 NoStyleSheet
@@ -1633,13 +1736,7 @@ createElement context children rendered =
1633 rendered.node
1736 rendered.node
1634 rendered.attributes
1737 rendered.attributes
1639− ( "nearby-elements-pls", x )
1641− rendered.children
1739+ (addKeyedChildren "nearby-element-pls" keyed rendered.children)
@@ -1661,7 +1758,7 @@ createElement context children rendered =
1661 rendered.has
1758 rendered.has
1662 rendered.node
1759 rendered.node
1663 rendered.attributes
1760 rendered.attributes
1664− (Unkeyed <| unkeyed ++ rendered.children)
1761+ (Unkeyed (addChildren unkeyed rendered.children))
1665 NoStyleSheet
1762 NoStyleSheet
@@ -1673,10 +1770,42 @@ createElement context children rendered =
1673 rendered.has
1770 rendered.has
1674 rendered.node
1771 rendered.node
1675 rendered.attributes
1772 rendered.attributes
1676− (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
@@ -1688,8 +1817,20 @@ defaultOptions =
1691−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"
1692− 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) ] []
1695addWhen ifThis x to =
1836addWhen ifThis x to =
@@ -1807,7 +1948,7 @@ type Spacing
1809type Padding
1950type Padding
1810− = Padding String Int Int Int Int
1951+ = Padding String Float Float Float Float
1813extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
1954extractSpacingAndPadding : List (Attribute aligned msg) -> ( Maybe Padding, Maybe Spacing )
@@ -1903,35 +2044,44 @@ getHeight attrs =
2047+textElementClasses : String
2048+textElementClasses =
2053+ ++ classes.widthContent
2055+ ++ classes.heightContent
1906textElement : String -> VirtualDom.Node msg
2058textElement : String -> VirtualDom.Node msg
1907textElement str =
2059textElement str =
1908 Html.div
2060 Html.div
1909 [ Html.Attributes.class
2061 [ Html.Attributes.class
1910− (String.join " "
2062+ textElementClasses
1913− , classes.widthContent
1914− , classes.heightContent
1918 [ Html.text str ]
2064 [ Html.text str ]
2067+textElementFillClasses : String
2068+textElementFillClasses =
2073+ ++ classes.widthFill
2075+ ++ classes.heightFill
1921textElementFill : String -> VirtualDom.Node msg
2078textElementFill : String -> VirtualDom.Node msg
1922textElementFill str =
2079textElementFill str =
1923− VirtualDom.node "div"
2080+ Html.div
1924− [ VirtualDom.property "className"
2081+ [ Html.Attributes.class
1925− (Json.string <|
2082+ textElementFillClasses
1929− , classes.widthFill
1930− , classes.heightFill
1934− [ VirtualDom.text str ]
2084+ [ Html.text str ]
1937type Children x
2087type Children x
@@ -1939,10 +2089,6 @@ type Children x
1939 | Keyed (List ( String, x ))
2089 | Keyed (List ( String, x ))
1943−-- toHtml : OptionRecord -> Element msg -> VirtualDom.Node msg
1946toHtml mode el =
2092toHtml mode el =
1947 case el of
2093 case el of
1948 Unstyled html ->
2094 Unstyled html ->
@@ -1978,8 +2124,7 @@ renderRoot optionList attributes child =
1980type RenderMode
2126type RenderMode
1982− | Layout
2127+ = Layout
1983 | NoStaticStyleSheet
2128 | NoStaticStyleSheet
1984 | WithVirtualCss
2129 | WithVirtualCss
@@ -2028,8 +2173,8 @@ rootStyle =
2028 , SansSerif
2173 , SansSerif
2031− [ 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))
2032− , 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))
2033 , StyleClass Flag.fontSize (FontSize 20)
2178 , StyleClass Flag.fontSize (FontSize 20)
2034 , StyleClass Flag.fontFamily <|
2179 , StyleClass Flag.fontFamily <|
2035 FontFamily (List.foldl renderFontClassName "font-" families)
2180 FontFamily (List.foldl renderFontClassName "font-" families)
@@ -2061,14 +2206,49 @@ renderFontClassName font current =
2061 |> String.toLower
2206 |> String.toLower
2062 |> String.words
2207 |> String.words
2063 |> String.join "-"
2208 |> String.join "-"
2210+ FontWith { name } ->
2067renderFocusStyle :
2218renderFocusStyle :
2068 FocusStyle
2219 FocusStyle
2069− -> Style
2220+ -> List Style
2070renderFocusStyle 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, ")
2071− 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")
2072 (List.filterMap identity
2252 (List.filterMap identity
2073 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2253 [ Maybe.map (\color -> Property "border-color" (formatColor color)) focus.borderColor
2074 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
2254 , Maybe.map (\color -> Property "background-color" (formatColor color)) focus.backgroundColor
@@ -2091,6 +2271,7 @@ renderFocusStyle focus =
2091 , Just <| Property "outline" "none"
2271 , Just <| Property "outline" "none"
2096focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
2277focusDefaultStyle : { backgroundColor : Maybe Color, borderColor : Maybe Color, shadow : Maybe Shadow }
@@ -2102,7 +2283,7 @@ focusDefaultStyle =
2102 { color =
2283 { color =
2103 Rgba (155 / 255) (203 / 255) 1 1
2284 Rgba (155 / 255) (203 / 255) 1 1
2104 , offset = ( 0, 0 )
2285 , offset = ( 0, 0 )
2105− , blur = 3
2286+ , blur = 0
2106 , size = 3
2287 , size = 3
@@ -2170,519 +2351,734 @@ optionsToRecord options =
2173−renderFont : List Font -> String
2354+toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2174−renderFont families =
2355+toStyleSheet 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) ]
2376+ VirtualDom.node "elm-ui-rules"
2377+ [ VirtualDom.property "rules"
2378+ (encodeStyles options styleSheet)
2383+renderTopLevelValues rules =
2176− fontName font =
2385+ withImport font =
2177 case font of
2386 case font of
2178− Serif ->
2387+ ImportFont _ url ->
2179− "serif"
2388+ Just ("@import url('" ++ url ++ "');")
2390+ -- FontWith with ->
2391+ -- case with.url of
2393+ -- Just ("@import url('" ++ x ++ "');")
2181− SansSerif ->
2399+ allNames =
2182− "sans-serif"
2400+ List.map Tuple.first rules
2184− Monospace ->
2402+ fontImports ( name, typefaces ) =
2185− "monospace"
2403+ let
2405+ String.join "\n" (List.filterMap withImport typefaces)
2187− Typeface name ->
2409+ fontAdjustments ( name, typefaces ) =
2188− "\"" ++ name ++ "\""
2410+ case typefaceAdjustment typefaces of
2413+ (List.map (renderNullAdjustmentRule name) allNames)
2190− ImportFont name url ->
2415+ Just adjustment ->
2191− "\"" ++ name ++ "\""
2416+ String.join ""
2417+ (List.map (renderFontAdjustmentRule name adjustment) allNames)
2193− families
2419+ String.join "\n" (List.map fontImports rules)
2194− |> List.map fontName
2195− |> String.join ", "
2420+ ++ String.join "\n" (List.map fontAdjustments rules)
2198−toStyleSheet : OptionRecord -> List Style -> VirtualDom.Node msg
2423+renderNullAdjustmentRule fontToAdjust otherFontName =
2199−toStyleSheet options styleSheet =
2424+ let
2200− VirtualDom.node "style" [] [ VirtualDom.text (toStyleSheetString options styleSheet) ]
2425+ name =
2426+ if fontToAdjust == otherFontName then
2430+ otherFontName ++ " ." ++ fontToAdjust
2437+ ++ classes.sizeByCapital
2442+ ++ classes.sizeByCapital
2444+ [ ( "line-height", "1" )
2450+ ++ classes.sizeByCapital
2452+ ++ Internal.Style.classes.text
2456+ ++ classes.sizeByCapital
2458+ ++ Internal.Style.classes.text
2460+ [ ( "vertical-align", "0" )
2461+ , ( "line-height", "1" )
2203−toStyleSheetString : OptionRecord -> List Style -> String
2204−toStyleSheetString options stylesheet =
2206− renderTopLevels rule =
2208− FontFamily name typefaces ->
2212− ImportFont _ url ->
2213− Just ("@import url('" ++ url ++ "');")
2215− _ ->
2466+fontRule name modifier ( parentAdj, textAdjustment ) =
2216− Nothing
2467+ [ bracket
2218− typefaces
2469+ ++ name
2219− |> List.filterMap getImports
2470+ ++ "."
2220− |> String.join "\n"
2471+ ++ modifier
2221− |> Just
2472+ ++ ", "
2485+ ++ Internal.Style.classes.text
2491+ ++ Internal.Style.classes.text
2226− renderProps force (Property key val) existing =
2497+renderFontAdjustmentRule fontToAdjust ( full, capital ) otherFontName =
2227− if force then
2498+ let
2228− existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2499+ name =
2500+ if fontToAdjust == otherFontName then
2231− existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2504+ otherFontName ++ " ." ++ fontToAdjust
2507+ (fontRule name classes.sizeByCapital capital ++ fontRule name classes.fullSize full)
2510+bracket selector rules =
2512+ renderPair ( name, val ) =
2513+ name ++ ": " ++ val ++ ";"
2515+ selector ++ " {" ++ String.join "" (List.map renderPair rules) ++ "}"
2233− renderStyle maybePseudo selector props =
2518+fontAdjustmentRules converted =
2519+ ( [ ( "display", "block" )
2521+ , [ ( "display", "inline-block" )
2522+ , ( "line-height", String.fromFloat converted.height )
2523+ , ( "vertical-align", String.fromFloat converted.vertical ++ "em" )
2524+ , ( "font-size", String.fromFloat converted.size ++ "em" )
2529+typefaceAdjustment typefaces =
2234− case maybePseudo of
2532+ case found of
2235 Nothing ->
2533 Nothing ->
2236− selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}"
2534+ case face of
2536+ case with.adjustment of
2542+ ( fontAdjustmentRules
2543+ (.full (convertAdjustment adjustment))
2544+ , fontAdjustmentRules
2545+ (.capital (convertAdjustment adjustment))
2238− Just pseudo ->
2548+ _ ->
2239− case pseudo of
2549+ found
2241− case options.hover of
2245− ForceHover ->
2551+ Just _ ->
2246− selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}"
2552+ found
2249− selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2251− Focus ->
2558+fontName font =
2252− let
2559+ case font of
2253− renderedProps =
2560+ Serif ->
2254− List.foldl (renderProps False) "" props
2561+ "serif"
2265− ++ "-fs:not(.focus) {"
2275− , ".focusable-parent:focus ~ "
2285− Active ->
2563+ SansSerif ->
2286− selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}"
2564+ "sans-serif"
2288− renderStyleRule rule maybePseudo =
2566+ Monospace ->
2289− case rule of
2567+ "monospace"
2290− Style selector props ->
2291− renderStyle maybePseudo selector props
2293− Shadows name prop ->
2569+ Typeface name ->
2294− renderStyle
2570+ "\"" ++ name ++ "\""
2572+ ImportFont name url ->
2573+ "\"" ++ name ++ "\""
2575+ FontWith { name } ->
2296− ("." ++ name)
2576+ "\"" ++ name ++ "\""
2297− [ Property "box-shadow" prop
2577+
2579+topLevelValue rule =
2581+ FontFamily name typefaces ->
2582+ Just ( name, typefaces )
2588+renderProps force (Property key val) existing =
2590+ existing ++ "\n " ++ key ++ ": " ++ val ++ " !important;"
2593+ existing ++ "\n " ++ key ++ ": " ++ val ++ ";"
2596+encodeStyles options stylesheet =
2602+ renderStyleRule options style Nothing
2604+ ( getStyleName style, Encode.list Encode.string styled )
2609+toStyleSheetString : OptionRecord -> List Style -> String
2610+toStyleSheetString options stylesheet =
2612+ combine style rendered =
2613+ { rules = rendered.rules ++ renderStyleRule options style Nothing
2615+ case topLevelValue style of
2620+ topLevel :: rendered.topLevel
2623+ case List.foldl combine { topLevel = [], rules = [] } stylesheet of
2624+ { topLevel, rules } ->
2625+ renderTopLevelValues topLevel ++ String.concat rules
2628+renderStyle : OptionRecord -> Maybe PseudoClass -> String -> List Property -> List String
2629+renderStyle options maybePseudo selector props =
2630+ case maybePseudo of
2632+ [ selector ++ "{" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2637+ case options.hover of
2300− Transparency name transparency ->
2641+ ForceHover ->
2642+ [ selector ++ "-hv {" ++ List.foldl (renderProps True) "" props ++ "\n}" ]
2645+ [ selector ++ "-hv:hover {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2302− opacity =
2649+ renderedProps =
2303− (1 - transparency)
2650+ List.foldl (renderProps False) "" props
2307− renderStyle
2652+ [ selector ++ "-fs:focus {" ++ renderedProps ++ "\n}"
2308− maybePseudo
2653+ , ("." ++ classes.any ++ ":focus " ++ selector ++ "-fs {")
2309− ("." ++ name)
2654+ ++ renderedProps
2310− [ 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 {")
2313− FontSize i ->
2664+ Active ->
2314− renderStyle
2665+ [ selector ++ "-act:active {" ++ List.foldl (renderProps False) "" props ++ "\n}" ]
2316− (".font-size-" ++ String.fromInt i)
2317− [ Property "font-size" (String.fromInt i ++ "px")
2320− FontFamily name typefaces ->
2324− [ Property "font-family" (renderFont typefaces)
2327− Single class prop val ->
2668+renderStyleRule : OptionRecord -> Style -> Maybe PseudoClass -> List String
2669+renderStyleRule options rule maybePseudo =
2671+ Style selector props ->
2328− renderStyle
2672+ renderStyle options maybePseudo selector props
2331− [ Property prop val
2334− Colored class prop color ->
2674+ Shadows name prop ->
2335− renderStyle
2675+ renderStyle options
2336− maybePseudo
2676+ maybePseudo
2337− ("." ++ class)
2677+ ("." ++ name)
2338− [ Property prop (formatColor color)
2678+ [ Property "box-shadow" prop
2341− SpacingStyle cls x y ->
2681+ Transparency name transparency ->
2343− class =
2683+ opacity =
2344− "." ++ cls
2684+ (1 - transparency)
2688+ renderStyle options
2691+ [ Property "opacity" (String.fromFloat opacity)
2346− xPx =
2694+ FontSize i ->
2695+ renderStyle options
2697+ (".font-size-" ++ String.fromInt i)
2347− String.fromInt x ++ "px"
2698+ [ Property "font-size" (String.fromInt i ++ "px")
2349− yPx =
2701+ FontFamily name typefaces ->
2705+ |> List.filterMap renderVariants
2706+ |> String.join ", "
2709+ [ Property "font-family"
2711+ |> List.map fontName
2350− String.fromInt y ++ "px"
2712+ |> String.join ", "
2714+ , Property "font-feature-settings" features
2715+ , Property "font-variant"
2716+ (if List.any hasSmallCaps typefaces then
2353− "." ++ Internal.Style.classes.row
2720+ "normal"
2724+ renderStyle options
2355− wrappedRow =
2729+ Single class prop val ->
2356− "." ++ Internal.Style.classes.wrapped ++ row
2730+ renderStyle options
2733+ [ Property prop val
2358− column =
2736+ Colored class prop color ->
2359− "." ++ Internal.Style.classes.column
2737+ renderStyle options
2740+ [ Property prop (formatColor color)
2361− page =
2743+ SpacingStyle cls x y ->
2362− "." ++ Internal.Style.classes.page
2744+ let
2364− paragraph =
2748+ halfX =
2365− "." ++ Internal.Style.classes.paragraph
2749+ String.fromFloat (toFloat x / 2) ++ "px"
2367− left =
2751+ halfY =
2368− "." ++ Internal.Style.classes.alignLeft
2752+ String.fromFloat (toFloat y / 2) ++ "px"
2371− "." ++ Internal.Style.classes.alignRight
2755+ String.fromInt x ++ "px"
2374− "." ++ Internal.Style.classes.any
2758+ String.fromInt y ++ "px"
2376− single =
2760+ row =
2377− "." ++ Internal.Style.classes.single
2761+ "." ++ Internal.Style.classes.row
2380− [ renderStyle maybePseudo (class ++ row ++ " > " ++ any) [ Property "margin-right" xPx ]
2382− -- margins don't apply to last element of normal, unwrapped rows
2763+ wrappedRow =
2383− , renderStyle maybePseudo (class ++ row ++ " > " ++ any ++ ":last-child") [ Property "margin" "0" ]
2764+ "." ++ Internal.Style.classes.wrapped ++ row
2385− -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2766+ column =
2386− , renderStyle maybePseudo
2767+ "." ++ Internal.Style.classes.column
2387− (class ++ wrappedRow ++ " > " ++ any)
2388− [ Property "margin" ("0 " ++ xPx ++ " " ++ yPx ++ " 0")
2390− , renderStyle maybePseudo
2391− (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
2392− [ Property "margin-right" "0"
2395− -- columns
2769+ page =
2396− , renderStyle maybePseudo (class ++ column ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2770+ "." ++ Internal.Style.classes.page
2397− , renderStyle maybePseudo (class ++ page ++ " > " ++ any ++ " + " ++ any) [ Property "margin-top" yPx ]
2398− , renderStyle maybePseudo (class ++ page ++ " > " ++ left) [ Property "margin-right" xPx ]
2399− , renderStyle maybePseudo (class ++ page ++ " > " ++ right) [ Property "margin-left" xPx ]
2402− (class ++ paragraph)
2403− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2407− ("textarea" ++ class)
2408− [ Property "line-height" ("calc(1em + " ++ String.fromInt y ++ "px)")
2413− -- (class ++ paragraph ++ " > " ++ any)
2414− -- [ Property "margin-right" xPx
2415− -- , Property "margin-bottom" yPx
2419− (class ++ paragraph ++ " > " ++ left)
2420− [ Property "margin-right" xPx
2424− (class ++ paragraph ++ " > " ++ right)
2425− [ Property "margin-left" xPx
2429− (class ++ paragraph ++ "::after")
2772+ paragraph =
2430− [ Property "content" "''"
2773+ "." ++ Internal.Style.classes.paragraph
2431− , Property "display" "block"
2432− , Property "height" "0"
2433− , Property "width" "0"
2434− , Property "margin-top" (String.fromInt (-1 * (y // 2)) ++ "px")
2438− (class ++ paragraph ++ "::before")
2439− [ Property "content" "''"
2440− , Property "display" "block"
2441− , Property "height" "0"
2442− , Property "width" "0"
2443− , Property "margin-bottom" (String.fromInt (-1 * (y // 2)) ++ "px")
2447− PaddingStyle cls top right bottom left ->
2775+ left =
2448− let
2776+ "." ++ Internal.Style.classes.alignLeft
2456− [ Property "padding"
2457− (String.fromInt top
2459− ++ String.fromInt right
2461− ++ String.fromInt bottom
2463− ++ String.fromInt left
2468− BorderWidth cls top right bottom left ->
2778+ right =
2469− let
2779+ "." ++ Internal.Style.classes.alignRight
2477− [ Property "border-width"
2478− (String.fromInt top
2480− ++ String.fromInt right
2482− ++ String.fromInt bottom
2484− ++ String.fromInt left
2489− GridTemplateStyle template ->
2781+ any =
2490− let
2782+ "." ++ Internal.Style.classes.any
2493− ++ String.join "-" (List.map lengthClassName template.rows)
2495− ++ String.join "-" (List.map lengthClassName template.columns)
2497− ++ lengthClassName (Tuple.first template.spacing)
2499− ++ lengthClassName (Tuple.second template.spacing)
2502− toGridLength (Tuple.second template.spacing)
2505− toGridLength (Tuple.first template.spacing)
2508− toGridLengthHelper Nothing Nothing x
2510− toGridLengthHelper minimum maximum x =
2513− String.fromInt px ++ "px"
2516− case ( minimum, maximum ) of
2517− ( Nothing, Nothing ) ->
2520− ( Just minSize, Nothing ) ->
2521− "minmax(" ++ String.fromInt minSize ++ "px, " ++ "max-content)"
2523− ( Nothing, Just maxSize ) ->
2524− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2526− ( Just minSize, Just maxSize ) ->
2527− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2530− case ( minimum, maximum ) of
2531− ( Nothing, Nothing ) ->
2532− String.fromInt i ++ "fr"
2534− ( Just minSize, Nothing ) ->
2535− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt i ++ "fr" ++ "fr)"
2537− ( Nothing, Just maxSize ) ->
2538− "minmax(max-content, " ++ String.fromInt maxSize ++ "px)"
2540− ( Just minSize, Just maxSize ) ->
2541− "minmax(" ++ String.fromInt minSize ++ "px, " ++ String.fromInt maxSize ++ "px)"
2544− toGridLengthHelper (Just m) maximum len
2547− toGridLengthHelper minimum (Just m) len
2551− |> List.map toGridLength
2552− |> String.join ySpacing
2553− |> (\x -> "-ms-grid-columns: " ++ x ++ ";")
2557− |> List.map toGridLength
2558− |> String.join ySpacing
2559− |> (\x -> "-ms-grid-rows: " ++ x ++ ";")
2562− class ++ "{" ++ msColumns ++ msRows ++ "}"
2566− |> List.map toGridLength
2568− |> (\x -> "grid-template-columns: " ++ x ++ ";")
2572− |> List.map toGridLength
2574− |> (\x -> "grid-template-rows: " ++ x ++ ";")
2577− "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2580− "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2583− class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2586− "@supports (display:grid) {" ++ modernGrid ++ "}"
2590− GridPosition position ->
2784+ single =
2591− let
2785+ "." ++ Internal.Style.classes.single
2593− ".grid-pos-"
2787+ List.concat
2594− ++ String.fromInt position.row
2788+ [ renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ " + " ++ any) [ Property "margin-left" xPx ]
2596− ++ String.fromInt position.col
2790+ -- margins don't apply to last element of normal, unwrapped rows
2597− ++ "-"
2791+ -- , renderStyle options maybePseudo (class ++ row ++ " > " ++ any ++ ":first-child") [ Property "margin" "0" ]
2598− ++ String.fromInt position.width
2792+ -- For wrapped rows, margins always apply because we handle "canceling out" the other margins manually in the element.
2599− ++ "-"
2793+ , renderStyle options
2600− ++ String.fromInt position.height
2794+ maybePseudo
2601−
2795+ (class ++ wrappedRow ++ " > " ++ any)
2602− msPosition =
2796+ [ Property "margin" (halfY ++ " " ++ halfX)
2603− String.join " "
2797+ ]
2605− ++ String.fromInt position.row
2607− , "-ms-grid-row-span: "
2608− ++ String.fromInt position.height
2610− , "-ms-grid-column: "
2611− ++ String.fromInt position.col
2613− , "-ms-grid-column-span: "
2614− ++ String.fromInt position.width
2619− class ++ "{" ++ msPosition ++ "}"
2624− ++ String.fromInt position.row
2626− ++ String.fromInt (position.row + position.height)
2629− ++ String.fromInt position.col
2631− ++ String.fromInt (position.col + position.width)
2636− class ++ "{" ++ modernPosition ++ "}"
2639− "@supports (display:grid) {" ++ modernGrid ++ "}"
2643− PseudoSelector class styles ->
2799+ -- , renderStyle options maybePseudo
2800+ -- (class ++ wrappedRow ++ " > " ++ any ++ ":last-child")
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
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 ->
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 ->
2645− renderPseudoRule style =
2879+ class =
2646− renderStyleRule style (Just class)
2880+ "."
2648− List.map renderPseudoRule styles
2882+ in
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 ->
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
2649 |> String.join " "
2976 |> String.join " "
2977+ |> (\x -> "grid-template-columns: " ++ x ++ ";")
2651− Transform transform ->
2979+ rows =
2652− let
2980+ template.rows
2653− val =
2981+ |> List.map toGridLength
2654− transformValue transform
2982+ |> String.join " "
2983+ |> (\x -> "grid-template-rows: " ++ x ++ ";")
2656− class =
2985+ gapX =
2657− transformClass transform
2986+ "grid-column-gap:" ++ toGridLength (Tuple.first template.spacing) ++ ";"
2659− case ( class, val ) of
2660− ( Just cls, Just v ) ->
2664− [ Property "transform"
2669− ""
2989+ "grid-row-gap:" ++ toGridLength (Tuple.second template.spacing) ++ ";"
2671− combine style rendered =
2991+ modernGrid =
2672− { rendered
2992+ class ++ "{" ++ columns ++ rows ++ gapX ++ gapY ++ "}"
2673− | rules = rendered.rules ++ renderStyleRule style Nothing
2675− case renderTopLevels style of
2679− Just topLevel ->
2994+ supports =
2680− rendered.topLevel ++ 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 ++ "}"
2683− case List.foldl combine { rules = "", topLevel = "" } stylesheet of
3052+ [ base
2684− { topLevel, rules } ->
3053+ , supports
2685− 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"
2688lengthClassName : Length -> String
3084lengthClassName : Length -> String
@@ -2722,12 +3118,12 @@ formatTextShadow shadow =
2725−textShadowName shadow =
3121+textShadowClass shadow =
2726 String.concat
3122 String.concat
2728− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3124+ , floatClass (Tuple.first shadow.offset) ++ "px"
2729− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3125+ , floatClass (Tuple.second shadow.offset) ++ "px"
2730− , String.fromFloat shadow.blur ++ "px"
3126+ , floatClass shadow.blur ++ "px"
2731 , formatColorClass shadow.color
3127 , formatColorClass shadow.color
@@ -2748,17 +3144,17 @@ formatBoxShadow shadow =
2751−boxShadowName shadow =
3147+boxShadowClass shadow =
2752 String.concat <|
3148 String.concat <|
2753 [ if shadow.inset then
3149 [ if shadow.inset then
2754 "box-inset"
3150 "box-inset"
2758− , String.fromFloat (Tuple.first shadow.offset) ++ "px"
3154+ , floatClass (Tuple.first shadow.offset) ++ "px"
2759− , String.fromFloat (Tuple.second shadow.offset) ++ "px"
3155+ , floatClass (Tuple.second shadow.offset) ++ "px"
2760− , String.fromFloat shadow.blur ++ "px"
3156+ , floatClass shadow.blur ++ "px"
2761− , String.fromFloat shadow.size ++ "px"
3157+ , floatClass shadow.size ++ "px"
2762 , formatColorClass shadow.color
3158 , formatColorClass shadow.color
@@ -2803,6 +3199,17 @@ paddingName top right bottom left =
2803 ++ String.fromInt left
3199 ++ String.fromInt left
3202+paddingNameFloat top right bottom left =
3206+ ++ floatClass right
3208+ ++ floatClass bottom
2806getStyleName : Style -> String
3213getStyleName : Style -> String
2807getStyleName style =
3214getStyleName style =
2808 case style of
3215 case style of
@@ -3068,3 +3475,76 @@ onlyStyles attr =
3481+{- Font Adjustments -}
3484+convertAdjustment adjustment =
3500+ ((ascender - newBaseline) / 2) + newBaseline
3503+ ((ascender - descender) / 2) + descender
3506+ [ adjustment.capital
3507+ , adjustment.baseline
3508+ , adjustment.descender
3509+ , adjustment.lowercase
3513+ Maybe.withDefault adjustment.capital (List.maximum lines)
3516+ Maybe.withDefault adjustment.descender (List.minimum lines)
3520+ |> List.filter (\x -> x /= descender)
3522+ |> Maybe.withDefault adjustment.baseline
3528+ 1 / (ascender - newBaseline)
3531+ 1 / (ascender - descender)
3536+ -- (oldMiddle - newFullMiddle) * 2
3539+ adjust fullSize (ascender - descender) fullVertical
3541+ adjust capitalSize (ascender - newBaseline) capitalVertical
3545+adjust size height vertical =
3546+ { vertical = vertical