Skip to content

Commit 608579d

Browse files
committed
Include images in bundle by showing them through CSS
This fixes them not showing in rumblebot
1 parent 5e7b646 commit 608579d

File tree

8 files changed

+56
-20
lines changed

8 files changed

+56
-20
lines changed

src/battle-viewer/BattleViewer.elm

+9-11
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,15 @@ view model =
225225
"itself"
226226
]
227227
]
228-
, button [ onClick ToggleOpponentSelect, class "_select-button" ]
228+
, button [ onClick ToggleOpponentSelect, class "_select-button d-flex align-items-end" ]
229229
[ p [ class "mr-2" ] [ text "change opponent" ]
230-
, img
231-
[ src <|
232-
Api.urlForAsset model.apiContext
233-
(if model.viewingOpponentSelect then
234-
"/images/close-panel.svg"
235-
236-
else
237-
"/images/open-panel.svg"
238-
)
230+
, div
231+
[ class <|
232+
if model.viewingOpponentSelect then
233+
"_img-close-panel"
234+
235+
else
236+
"_img-open-panel"
239237
]
240238
[]
241239
]
@@ -282,7 +280,7 @@ viewBar model =
282280
viewLoadingMessage message =
283281
div [ class "d-flex justify-content-center align-items-center" ]
284282
[ p [ class "_text mr-2" ] [ text message ]
285-
, img [ class "spinner", src <| Api.urlForAsset model.apiContext "/images/spinner.svg" ] []
283+
, div [ class "_img-spinner" ] []
286284
]
287285
in
288286
div [ class "_run-bar" ]

src/battle-viewer/main.scss

+27
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,33 @@
33
border-bottom: $border-2;
44
}
55

6+
@mixin img($name) {
7+
background: url("../images/#{$name}.svg");
8+
width: $icon-size;
9+
height: $icon-size;
10+
background-size: 100%;
11+
background-repeat: no-repeat;
12+
}
13+
14+
._img-settings {
15+
@include img("settings");
16+
}
17+
18+
._img-spinner {
19+
@include img("spinner");
20+
filter: brightness(var(--is-dark-theme));
21+
height: 20px;
22+
width: 20px;
23+
}
24+
25+
._img-close-panel {
26+
@include img("close-panel");
27+
}
28+
29+
._img-open-panel {
30+
@include img("open-panel");
31+
}
32+
633
._app-root {
734
display: flex;
835
flex-direction: column;

src/css/base.scss

+3-7
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ a {
9292
color: var(--blue) !important;
9393
}
9494

95+
$icon-size: 18px;
96+
9597
img {
96-
width: 18px;
98+
width: $icon-size;
9799
display: inline-block;
98100
}
99101

@@ -128,12 +130,6 @@ button {
128130
color: var(--bright-red) !important;
129131
}
130132

131-
.spinner {
132-
height: 20px;
133-
width: 20px;
134-
filter: brightness(var(--is-dark-theme));
135-
}
136-
137133
.text-red {
138134
color: var(--bright-red);
139135
}

src/garage/Main.elm

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,15 +462,15 @@ viewBar model =
462462
)
463463
]
464464
)
465-
, div [ class "d-flex" ]
465+
, div [ class "d-flex align-items-center" ]
466466
[ case model.apiContext.siteInfo of
467467
Just _ ->
468468
a [ class "mr-3", href <| Api.urlForPublishing model.apiContext, target "_blank" ] [ text "publish to a board" ]
469469

470470
Nothing ->
471471
div [] []
472472
, a [ class "mr-4", href "https://rr-docs.readthedocs.io/en/latest/", target "_blank" ] [ text "docs" ]
473-
, button [ onClick ViewSettings ] [ img [ src <| Api.urlForAsset model.apiContext "/images/settings.svg" ] [] ]
473+
, div [ class "_img-settings", onClick ViewSettings ] []
474474
]
475475
]
476476

src/images/close-panel.svg

+3
Loading

src/images/open-panel.svg

+3
Loading

src/images/settings.svg

+3
Loading

src/images/spinner.svg

+6
Loading

0 commit comments

Comments
 (0)