Skip to content

Commit af304f5

Browse files
committed
Improve css a bit
1 parent 5f30268 commit af304f5

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

src/Main.elm

+21-19
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ view model =
8282
if not model.showSettings then
8383
div [ css [ width (vw 100.0), minHeight (vh 100.0), display inlineFlex, flexDirection column ] ]
8484
[ div [ css [ minHeight (vh 20.0), display inlineFlex ] ]
85-
[ div [ css [ margin4 auto auto (px 8) auto, fontSize (px 64) ] ] [ text model.question.target ] ]
85+
[ div [ css [ margin4 auto auto (px 8) auto, fontSize (rem 3) ] ] [ text model.question.target ] ]
8686
, div [ css [ minHeight (vh 10.0), display inlineFlex ] ]
87-
[ div [ css [ margin4 auto auto (px 8) auto, fontSize (px 24) ] ] [ outputBox model ] ]
87+
[ div [ css [ margin4 auto auto (px 8) auto, fontSize (rem 1.5) ] ] [ outputBox model ] ]
8888
, div [ css [ minHeight (vh 60.0), display inlineFlex ] ]
89-
[ div [ css [ margin4 auto auto (rem 4) auto ] ] [ virtualKeyboard model ] ]
89+
[ div [ css [ withMedia [ only screen [ Media.maxWidth (px 1000) ] ] [ width (pct 100) ], margin4 auto auto (rem 4) auto, width (px 1000) ] ] [ virtualKeyboard model ] ]
9090
, div [ css [ position absolute, top (rem 1), right (rem 1) ] ]
9191
[ settingsBtn ]
9292
]
@@ -145,8 +145,8 @@ outputBox model =
145145
virtualKeyboard : Model -> Html Msg
146146
virtualKeyboard model =
147147
if model.showVirtualKeyboard then
148-
div [ css [ display inlineFlex, flexDirection column, alignItems center ] ]
149-
[ div []
148+
div [ css [ display inlineFlex, flexDirection column, alignItems center, width (pct 100) ] ]
149+
[ div [ css [display inlineFlex, flexDirection row, width (pct 100)] ]
150150
[ virtualKeyboardBtn '手'
151151
, virtualKeyboardBtn '田'
152152
, virtualKeyboardBtn '水'
@@ -159,7 +159,7 @@ virtualKeyboard model =
159159
, virtualKeyboardBtn '心'
160160
, virtualBackspace
161161
]
162-
, div []
162+
, div [ css [display inlineFlex, flexDirection row, width (pct 82)] ]
163163
[ virtualKeyboardBtn '日'
164164
, virtualKeyboardBtn '尸'
165165
, virtualKeyboardBtn '木'
@@ -170,7 +170,7 @@ virtualKeyboard model =
170170
, virtualKeyboardBtn '大'
171171
, virtualKeyboardBtn '中'
172172
]
173-
, div []
173+
, div [ css [display inlineFlex, flexDirection row, width (pct 72)] ]
174174
[ virtualKeyboardBtn '重'
175175
, virtualKeyboardBtn '難'
176176
, virtualKeyboardBtn '金'
@@ -180,7 +180,7 @@ virtualKeyboard model =
180180
, virtualKeyboardBtn '一'
181181
, virtualQuestionMark
182182
]
183-
, div [] [ virtualSpace ]
183+
, div [ css [ width (pct 60) ] ] [ virtualSpace ]
184184
]
185185

186186
else
@@ -191,11 +191,13 @@ buttonStyle : Style
191191
buttonStyle =
192192
Css.batch
193193
[ margin (rem 0.2)
194-
, height (rem 4.5)
195-
, width (rem 4.5)
196-
, fontSize (px 20)
194+
, height (rem 4)
195+
, display inlineFlex
196+
, flexGrow (num 1)
197+
, fontSize (rem 1)
197198
, touchAction manipulation
198-
, borderRadius (rem 0.2)
199+
, borderRadius (rem 0.5)
200+
, withMedia [ only screen [ Media.minHeight (px 1200) ] ] [ height (rem 6) ]
199201
]
200202

201203

@@ -205,7 +207,7 @@ virtualKeyboardBtn char =
205207
[ onClick (PressedLetter char)
206208
, css [ buttonStyle ]
207209
]
208-
[ text <| String.fromChar char ]
210+
[ span [ css [width (pct 100), margin auto] ] [text <| String.fromChar char ] ]
209211

210212

211213
virtualBackspace : Html Msg
@@ -214,16 +216,16 @@ virtualBackspace =
214216
[ onClick (Control "Backspace")
215217
, css [ buttonStyle ]
216218
]
217-
[ text "" ]
219+
[ span [ css [width (pct 100), margin auto] ] [text "" ] ]
218220

219221

220222
virtualSpace : Html Msg
221223
virtualSpace =
222224
button
223225
[ onClick (PressedLetter ' ')
224-
, css [ buttonStyle, width (rem 20) ]
226+
, css [ buttonStyle, width (pct 100) ]
225227
]
226-
[ text "Space" ]
228+
[ span [ css [width (pct 100), margin auto] ] [text "Space" ] ]
227229

228230

229231
virtualQuestionMark : Html Msg
@@ -233,21 +235,21 @@ virtualQuestionMark =
233235
, on "pointerup" <| Decode.succeed <| LiftedLetter '?'
234236
, css [ buttonStyle ]
235237
]
236-
[ text "" ]
238+
[ span [ css [width (pct 100), margin auto] ] [text "" ] ]
237239

238240

239241
settingsBtn : Html Msg
240242
settingsBtn =
241243
button
242244
[ onClick (ToggleSettings True), css [ buttonStyle ] ]
243-
[ text "⚙️" ]
245+
[ span [ css [width (rem 4), margin auto] ] [text "⚙️" ] ]
244246

245247

246248
closeSettingsBtn : Html Msg
247249
closeSettingsBtn =
248250
button
249251
[ onClick (ToggleSettings False), css [ buttonStyle ] ]
250-
[ text "" ]
252+
[ span [ css [width (rem 4), margin auto] ] [text "" ] ]
251253

252254

253255

0 commit comments

Comments
 (0)