Skip to content

Commit 29c92a8

Browse files
committed
Merge branch 'develop' of github.com:Orcpub/orcpub into opdevelop
2 parents df0cf2d + 2ef70a3 commit 29c92a8

34 files changed

+742
-20
lines changed

env/dev/env/index.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
(set! js/window.goog js/undefined)
66

77
(-> (js/require "figwheel-bridge")
8-
(.withModules #js {"react" (js/require "react"), "react-native" (js/require "react-native"), "expo" (js/require "expo"), "./assets/icons/app.png" (js/require "../../assets/icons/app.png"), "./assets/icons/loading.png" (js/require "../../assets/icons/loading.png"), "./assets/images/cljs.png" (js/require "../../assets/images/cljs.png"), "./assets/images/orcpub-logo.svg" (js/require "../../assets/images/orcpub-logo.svg"), "./assets/images/orcpub-logo.png" (js/require "../../assets/images/orcpub-logo.png")}
8+
(.withModules #js {"react" (js/require "react"), "react-native" (js/require "react-native"), "expo" (js/require "expo"), "./assets/icons/app.png" (js/require "../../assets/icons/app.png"), "./assets/icons/loading.png" (js/require "../../assets/icons/loading.png"), "./assets/images/cljs.png" (js/require "../../assets/images/cljs.png"), "./assets/images/dmv-logo.svg" (js/require "../../assets/images/dmv-logo.svg"), "./assets/images/dmv-logo.png" (js/require "../../assets/images/dmv-logo.png")}
99
)
1010
(.start "main"))

native/cljs/orcpub/core.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
:padding-bottom 5
2525
:padding-left 5
2626
:padding-right 5}}
27-
[image {:source (js/require "./assets/images/orcpub-logo.png")}]]
27+
[image {:source (js/require "./assets/images/dmv-logo.png")}]]
2828
[v5e/character-builder]])
2929

3030
(defn init []
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<browserconfig>
3+
<msapplication>
4+
<tile>
5+
<square70x70logo src="/favicon/favicon-70.png"/>
6+
<square150x150logo src="/favicon/favicon-150.png"/>
7+
<square310x310logo src="/favicon/favicon-310.png"/>
8+
<TileColor>#FFFFFF</TileColor>
9+
</tile>
10+
</msapplication>
11+
</browserconfig>
11.7 KB
Loading
12.5 KB
Loading
15.4 KB
Loading
16.3 KB
Loading
16.5 KB
Loading
1.39 KB
Loading
17.5 KB
Loading

0 commit comments

Comments
 (0)