2952cf8 · rowtype-yoga/ry-blocks

git.iko.soy/rowtype-yoga/ry-blocks

on main help sign in

Minor

2952cf8Mark Eibes6 years ago

src/Yoga/Block/Atom/Button/Style.purs+1

compare with main

unifiedsplit

@@ -81,6 +81,7 @@ button =

81 , "&:disabled":

82 nest

83 { background: str colour.highlightDisabled

84+ , border: str $ i "1px solid transparent"

84 }

85 }

86 }

86 , """&[data-button-type="dangerous"]""":

87 , """&[data-button-type="dangerous"]""":

src/Yoga/Block/Atom/Input/Style.purs+13−10

@@ -103,12 +103,13 @@ labelLarge { left, width, top } =

103 , padding: _0

104 , whiteSpace: nowrap -- force on one line

105 , overflow: str "hidden"

106+ , height: str "calc(var(--s0) * 0.95)"

106 , maxWidth: str $ i width "px"

107 , maxWidth: str $ i width "px"

107 , textOverflow: str "ellipsis"

108 , textOverflow: str "ellipsis"

108 , marginTop: str "calc(var(--s-1) + var(--s-5))"

109 , marginTop: str "calc(var(--s-1) + var(--s-5))"

109 , marginBottom: str $ i "calc(" "var(--s-1)" "+" "var(--s-5)" " + " top "px" ")"

110 , marginBottom: str $ i "calc(" "var(--s-1)" "+" "var(--s-5)" " + " top "px" ")"

110 , marginLeft: str $ i left "px"

111 , marginLeft: str $ i left "px"

111− , marginRight: str "var(--input-side-padding)"

112+ , marginRight: var "--input-side-padding"

112 , color: str colour.placeholderText

113 , color: str colour.placeholderText

113 , fontWeight: str "400"

114 , fontWeight: str "400"

114 , """&[data-required="true"]:after""":

115 , """&[data-required="true"]:after""":

@@ -117,6 +118,7 @@ labelLarge { left, width, top } =

117 , color: str colour.required

118 , color: str colour.required

118 , fontFamily: str "Helvetica, Arial, Inter, sans-serif"

119 , fontFamily: str "Helvetica, Arial, Inter, sans-serif"

119 , fontSize: str "calc(var(--s0))"

120 , fontSize: str "calc(var(--s0))"

121+ , lineHeight: str "calc(var(--s0) * 0.85)"

120 }

122 }

121 }

123 }

122

124

@@ -166,16 +168,7 @@ inputContainer props = theCss <>? props.css

166 , "--input-side-padding": var "--s-1"

168 , "--input-side-padding": var "--s-1"

167 , "--input-top-padding": var "--s-5"

169 , "--input-top-padding": var "--s-5"

168 , "--input-bottom-padding": var "--s-5"

170 , "--input-bottom-padding": var "--s-5"

169− , alignItems: center

170− , justifyContent: center

171− , paddingLeft: str "calc(var(--input-side-padding) - var(--border-width))"

172− , paddingRight: str "calc(var(--input-side-padding) - var(--border-width))"

173− , paddingTop: str "calc(var(--input-top-padding) - var(--border-width))"

174− , paddingBottom: str "calc(var(--input-bottom-padding) - var(--border-width))"

175− , gap: str "calc(var(--input-side-padding) / 2)"

176 , "--border-width": str "1px"

171 , "--border-width": str "1px"

177− , border: str $ "var(--border-width) solid " <> colour.inputBorder

178− , borderRadius: var "--input-border-radius"

179 , """&[data-invalid="false"]""":

172 , """&[data-invalid="false"]""":

180 nest

173 nest

181 { borderColor: str colour.success

174 { borderColor: str colour.success

@@ -192,6 +185,16 @@ inputContainer props = theCss <>? props.css

192 , borderColor: str colour.highlight

185 , borderColor: str colour.highlight

193 , transition: str "border-color 0s linear 0.1s"

186 , transition: str "border-color 0s linear 0.1s"

194 }

187 }

188+ , alignItems: center

189+ , justifyContent: center

190+ , border: str $ "var(--border-width) solid " <> colour.inputBorder

191+ , paddingLeft: str "calc(var(--input-side-padding) - var(--border-width))"

192+ , paddingRight: str "calc(var(--input-side-padding) - var(--border-width))"

193+ , paddingTop: str "calc(var(--input-top-padding) - var(--border-width))"

194+ , paddingBottom: str "calc(var(--input-bottom-padding) - var(--border-width))"

195+ , height: str "calc(var(--s2) * 0.9)"

196+ , gap: str "calc(var(--input-side-padding) / 2)"

197+ , borderRadius: var "--input-border-radius"

195 }

198 }

196

199

197inputWrapper ∷ Style

200inputWrapper ∷ Style

src/Yoga/Block/Container/Style.purs+4−4

@@ -192,8 +192,8 @@ defaultColours =

192 , interfaceBackground: interfaceBackgroundDark

193 , interfaceBackgroundDangerous: interfaceBackgroundDangerousDark

194 , interfaceDangerousText: interfaceDangerousTextDark

195− , interfaceBackgroundDisabled: darken 0.3 interfaceBackgroundDark

195+ , interfaceBackgroundDisabled: lighten 0.14 >>> saturate 0.02 $ darkBg

196− , interfaceTextDisabled: (desaturate 0.3 >>> lighten 0.25) interfaceBackgroundDark

196+ , interfaceTextDisabled: (desaturate 0.3 >>> lighten 0.25 >>> desaturate 0.3) interfaceBackgroundDark

197 , interfaceBackgroundHighlight: lighten 0.1 interfaceBackgroundDark

198 , interfaceBackgroundShadow: darken 0.1 interfaceBackgroundDark

199 , inputBackground: darkBg

@@ -211,7 +211,7 @@ defaultColours =

211 , highlightRotatedBackwards: highlightDark # rotateHue (-30.0)

212 , highlightText

213 , text: lightBg

214− , placeholderText: darken 0.4 lightBg

214+ , placeholderText: darken 0.4 white

215 }

216 }

217 where

@@ -219,7 +219,7 @@ defaultColours =

219

220 highlightDark = Color.rgb 0x88 0x33 0xFF

221

222− interfaceBackgroundDark = Color.hsl 240.0 0.10 0.33

222+ interfaceBackgroundDark = lighten 0.14 >>> saturate 0.12 $ darkBg

223

224 interfaceBackground = lightBg

225