Skip to content

Commit 7409c75

Browse files
functorafunctora
committed
Functora.Miso.Css
1 parent 6640100 commit 7409c75

File tree

16 files changed

+66
-46
lines changed

16 files changed

+66
-46
lines changed

‎ghcjs/currency-converter/src/App/Widgets/Decrypt.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import App.Types
77
import Data.Functor.Barbie
88
import qualified Functora.Aes as Aes
99
import Functora.Cfg
10+
import qualified Functora.Miso.Css as Css
1011
import qualified Functora.Miso.Jsm as Jsm
1112
import Functora.Miso.Prelude
1213
import qualified Functora.Miso.Widgets.Field as Field
@@ -37,7 +38,7 @@ decrypt st =
3738
( Button.config
3839
& Button.setOnClick (PushUpdate $ Instant decryptDoc)
3940
& Button.setIcon (Just "login")
40-
& Button.setAttributes [class_ "fill"]
41+
& Button.setAttributes [Css.fullWidth]
4142
)
4243
"Open"
4344
]

‎ghcjs/currency-converter/src/App/Widgets/Fav.hs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import App.Types
77
import App.Widgets.Templates
88
import qualified Data.Map as Map
99
import qualified Data.Text as T
10+
import qualified Functora.Miso.Css as Css
1011
import qualified Functora.Miso.Jsm as Jsm
1112
import Functora.Miso.Prelude
1213
import qualified Functora.Miso.Widgets.Field as Field
@@ -56,7 +57,7 @@ fav st =
5657
& Button.setIcon (Just "favorite")
5758
& Button.setAttributes
5859
[ Theme.secondaryBg,
59-
class_ "fill"
60+
Css.fullWidth
6061
]
6162
)
6263
"Save",
@@ -67,7 +68,7 @@ fav st =
6768
& Button.setIcon (Just "delete_forever")
6869
& Button.setAttributes
6970
[ Theme.secondaryBg,
70-
class_ "fill"
71+
Css.fullWidth
7172
]
7273
)
7374
"Delete",
@@ -76,7 +77,7 @@ fav st =
7677
( Button.config
7778
& Button.setOnClick closeAction
7879
& Button.setIcon (Just "arrow_back")
79-
& Button.setAttributes [class_ "fill"]
80+
& Button.setAttributes [Css.fullWidth]
8081
)
8182
"Back"
8283
]
@@ -147,7 +148,7 @@ favItem st label Fav {favUri = uri} =
147148
$ Button.raised
148149
( Button.config
149150
& Button.setOnClick openAction
150-
& Button.setAttributes [class_ "fill"]
151+
& Button.setAttributes [Css.fullWidth]
151152
)
152153
label
153154
where

‎ghcjs/currency-converter/src/App/Widgets/Main.hs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import qualified App.Widgets.Header as Header
77
import qualified App.Widgets.Menu as Menu
88
import qualified App.Widgets.SwapAmounts as SwapAmounts
99
import qualified App.Widgets.SwapCurrencies as SwapCurrencies
10+
import qualified Functora.Miso.Css as Css
1011
import qualified Functora.Miso.Jsm as Jsm
1112
import Functora.Miso.Prelude
1213
import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
@@ -85,7 +86,7 @@ screenWidget st@Model {modelState = St {stCpt = Just {}}} =
8586
.~ [ Button.raised
8687
( Button.config
8788
& Button.setIcon (Just "login")
88-
& Button.setAttributes [class_ "fill"]
89+
& Button.setAttributes [Css.fullWidth]
8990
& Button.setOnClick (setScreenAction $ unQrCode sc)
9091
)
9192
"Open"
@@ -112,7 +113,7 @@ screenWidget st@Model {modelState = St {stScreen = QrCode sc}} =
112113
.~ [ Button.raised
113114
( Button.config
114115
& Button.setIcon (Just "login")
115-
& Button.setAttributes [class_ "fill"]
116+
& Button.setAttributes [Css.fullWidth]
116117
& Button.setOnClick (setScreenAction $ unQrCode sc)
117118
)
118119
"Open"

‎ghcjs/currency-converter/src/App/Widgets/Menu.hs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ where
66
import App.Types
77
import qualified App.Widgets.Fav as Fav
88
import qualified App.Widgets.Templates as Templates
9+
import qualified Functora.Miso.Css as Css
910
import qualified Functora.Miso.Jsm as Jsm
1011
import Functora.Miso.Prelude
1112
import qualified Functora.Miso.Widgets.BrowserLink as BrowserLink
@@ -151,7 +152,7 @@ menu st =
151152
)
152153
& Button.setAttributes
153154
[ Theme.secondaryBg,
154-
class_ "fill"
155+
Css.fullWidth
155156
]
156157
)
157158
$ if isQrCode sc
@@ -174,7 +175,7 @@ menu st =
174175
)
175176
& Button.setAttributes
176177
[ Theme.secondaryBg,
177-
class_ "fill"
178+
Css.fullWidth
178179
]
179180
)
180181
"Note",
@@ -283,7 +284,7 @@ menu st =
283284
( Button.config
284285
& Button.setOnClick closed
285286
& Button.setIcon (Just "arrow_back")
286-
& Button.setAttributes [class_ "fill"]
287+
& Button.setAttributes [Css.fullWidth]
287288
)
288289
"Back"
289290
]
@@ -351,7 +352,7 @@ linksWidget st =
351352
( Button.config
352353
& Button.setOnClick openWidget
353354
& Button.setIcon (Just "android")
354-
& Button.setAttributes [class_ "fill"]
355+
& Button.setAttributes [Css.fullWidth]
355356
)
356357
"App"
357358
]
@@ -407,7 +408,7 @@ linksWidget st =
407408
& Button.setOnClick (openBrowser testGroupLink)
408409
& Button.setAttributes
409410
[ Theme.secondaryBg,
410-
class_ "fill"
411+
Css.fullWidth
411412
]
412413
)
413414
"Join testing (closed beta)",
@@ -418,7 +419,7 @@ linksWidget st =
418419
& Button.setOnClick (openBrowser googlePlayLink)
419420
& Button.setAttributes
420421
[ Theme.secondaryBg,
421-
class_ "fill"
422+
Css.fullWidth
422423
]
423424
)
424425
"Google Play (closed beta)",
@@ -429,7 +430,7 @@ linksWidget st =
429430
& Button.setOnClick (openBrowser apkLink)
430431
& Button.setAttributes
431432
[ Theme.secondaryBg,
432-
class_ "fill"
433+
Css.fullWidth
433434
]
434435
)
435436
"Download APK",
@@ -440,7 +441,7 @@ linksWidget st =
440441
& Button.setOnClick (openBrowser sourceLink)
441442
& Button.setAttributes
442443
[ Theme.secondaryBg,
443-
class_ "fill"
444+
Css.fullWidth
444445
]
445446
)
446447
"Source",
@@ -451,7 +452,7 @@ linksWidget st =
451452
& Button.setOnClick (openBrowser functoraLink)
452453
& Button.setAttributes
453454
[ Theme.secondaryBg,
454-
class_ "fill"
455+
Css.fullWidth
455456
]
456457
)
457458
"Author",
@@ -476,7 +477,7 @@ linksWidget st =
476477
)
477478
& Button.setAttributes
478479
[ Theme.secondaryBg,
479-
class_ "fill"
480+
Css.fullWidth
480481
]
481482
)
482483
"Donate",
@@ -485,7 +486,7 @@ linksWidget st =
485486
( Button.config
486487
& Button.setOnClick closeWidget
487488
& Button.setIcon (Just "arrow_back")
488-
& Button.setAttributes [class_ "fill"]
489+
& Button.setAttributes [Css.fullWidth]
489490
)
490491
"Back"
491492
]

‎ghcjs/currency-converter/src/App/Widgets/SwapAmounts.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module App.Widgets.SwapAmounts
44
where
55

66
import App.Types
7+
import qualified Functora.Miso.Css as Css
78
import Functora.Miso.Prelude
89
import qualified Material.Button as Button
910
import qualified Material.LayoutGrid as LayoutGrid
@@ -22,7 +23,7 @@ swapAmounts =
2223
& Button.setIcon (Just "swap_horizontal_circle")
2324
& Button.setOnClick onClickAction
2425
& Button.setAttributes
25-
[ class_ "fill",
26+
[ Css.fullWidth,
2627
class_ "no-print",
2728
Theme.secondaryBg
2829
]

‎ghcjs/currency-converter/src/App/Widgets/SwapCurrencies.hs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ module App.Widgets.SwapCurrencies
44
where
55

66
import App.Types
7+
import qualified Functora.Miso.Css as Css
78
import Functora.Miso.Prelude
89
import qualified Material.Button as Button
910
import qualified Material.LayoutGrid as LayoutGrid
@@ -21,7 +22,7 @@ swapCurrencies =
2122
& Button.setIcon (Just "swap_vertical_circle")
2223
& Button.setOnClick onClickAction
2324
& Button.setAttributes
24-
[ class_ "fill",
25+
[ Css.fullWidth,
2526
class_ "no-print",
2627
Theme.secondaryBg
2728
]

‎ghcjs/currency-converter/static/app.css‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ textarea {
2020
min-height: 72px;
2121
}
2222

23-
.fill {
24-
width: 100%;
25-
}
26-
2723
.fill-inner > div {
2824
width: 100%;
2925
min-width: 100%;
@@ -65,6 +61,7 @@ textarea {
6561
width: 80px;
6662
height: 80px;
6763
}
64+
6865
.lds-dual-ring:after {
6966
content: " ";
7067
display: block;
@@ -76,6 +73,7 @@ textarea {
7673
border-color: #ffffff transparent #ffffff transparent;
7774
animation: lds-dual-ring 1.2s linear infinite;
7875
}
76+
7977
@keyframes lds-dual-ring {
8078
0% {
8179
transform: rotate(0deg);

‎ghcjs/miso-widgets/miso-widgets.cabal‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ library
102102
ghc-options: -Wno-unused-packages
103103

104104
exposed-modules:
105+
Functora.Miso.Css
105106
Functora.Miso.Jsm
106107
Functora.Miso.Prelude
107108
Functora.Miso.Types
@@ -135,6 +136,7 @@ test-suite miso-widgets-test
135136
if flag(ghcid)
136137
hs-source-dirs: src
137138
other-modules:
139+
Functora.Miso.Css
138140
Functora.Miso.Jsm
139141
Functora.Miso.Prelude
140142
Functora.Miso.Types

‎ghcjs/miso-widgets/src/Functora/Miso/Css.hs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
module Functora.Miso.Css (fullWidth) where
2+
3+
import Functora.Miso.Prelude
4+
5+
fullWidth :: Attribute action
6+
fullWidth =
7+
style_ [("width", "100%")]

‎ghcjs/miso-widgets/src/Functora/Miso/Widgets/Currency.hs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ module Functora.Miso.Widgets.Currency
77
where
88

99
import qualified Data.List.NonEmpty as NonEmpty
10+
import qualified Functora.Miso.Css as Css
1011
import Functora.Miso.Prelude
1112
import Functora.Miso.Types
1213
import qualified Functora.Miso.Widgets.Field as Field
@@ -53,7 +54,7 @@ selectCurrency
5354
$ [ Button.raised
5455
( Button.setOnClick opened
5556
. Button.setAttributes
56-
[ class_ "fill"
57+
[ Css.fullWidth
5758
]
5859
$ Button.config
5960
)
@@ -75,7 +76,7 @@ selectCurrency
7576
[ currencyListWidget args opts
7677
]
7778
[ div_
78-
[ class_ "fill"
79+
[ Css.fullWidth
7980
]
8081
[ Field.textField
8182
Field.Args
@@ -93,7 +94,7 @@ selectCurrency
9394
( Button.config
9495
& Button.setOnClick closed
9596
& Button.setAttributes
96-
[ class_ "fill"
97+
[ Css.fullWidth
9798
]
9899
)
99100
"Back"

0 commit comments

Comments
 (0)