diff --git a/index.html b/index.html index 1a4b4e97cbec5666132c2f1880b500fd8d143587..299ea68289be6d18a28ab9e5f9fbe2235fb63bff 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,8 @@ <link rel="stylesheet" href="res/Stysheet.css"> <link rel="stylesheet" href="src/node_modules/animate.css/animate.css"> <link rel="stylesheet" href="src/node_modules/bootstrap/dist/css/bootstrap.css" integrity="" crossorigin="anonymous"> + <link href="https://fonts.googleapis.com/css2?family=Fondamento&display=swap" rel="stylesheet"> + <link href="https://fonts.googleapis.com/css2?family=Alegreya:wght@400;500&display=swap" rel="stylesheet"> <title>Main</title> <script src="out/main.js"></script> <style> diff --git a/out/main.js b/out/main.js index c8683fca10a0f971508ccdcc880197523963886d..93c75e1ccdd2e977488930d40c21f11d5c8eb741 100644 --- a/out/main.js +++ b/out/main.js @@ -12410,22 +12410,22 @@ var $author$project$DungeonMap$placeIcon = F5( $elm$svg$Svg$image, _List_fromArray( [ - $elm$svg$Svg$Attributes$width('25'), - $elm$svg$Svg$Attributes$height('25'), + $elm$svg$Svg$Attributes$width('45'), + $elm$svg$Svg$Attributes$height('45'), $elm$svg$Svg$Attributes$x( $elm$core$String$fromFloat( A2( $elm$core$Maybe$withDefault, 0, - $elm$core$String$toFloat(x)) - 11.5)), + $elm$core$String$toFloat(x)) - 22.5)), $elm$svg$Svg$Attributes$y( $elm$core$String$fromFloat( A2( $elm$core$Maybe$withDefault, 0, - $elm$core$String$toFloat(y)) - 11.5)), + $elm$core$String$toFloat(y)) - 22)), $elm$svg$Svg$Attributes$title('ObjectIcon'), - $elm$svg$Svg$Attributes$xlinkHref('res/icons/hero.png') + $elm$svg$Svg$Attributes$xlinkHref('res/icons/Hero.svg') ]), _List_Nil), A2( @@ -12438,13 +12438,13 @@ var $author$project$DungeonMap$placeIcon = F5( A2( $elm$core$Maybe$withDefault, 0, - $elm$core$String$toFloat(x)) + 1)), + $elm$core$String$toFloat(x)))), $elm$svg$Svg$Attributes$y( $elm$core$String$fromFloat( A2( $elm$core$Maybe$withDefault, 0, - $elm$core$String$toFloat(y)) + 2.5)), + $elm$core$String$toFloat(y)))), $elm$svg$Svg$Attributes$dominantBaseline('middle') ]), _List_fromArray( @@ -14746,7 +14746,7 @@ var $author$project$Main$view = function (model) { $elm$html$Html$div, _List_fromArray( [ - $elm$html$Html$Attributes$class('wrapper'), + $elm$html$Html$Attributes$class('wrapper textFont'), A2($elm$html$Html$Attributes$style, 'height', '100%') ]), _List_fromArray( diff --git a/res/Stysheet.css b/res/Stysheet.css index f456420006bca71c60fa03ac635a0973d4eeafab..1b8eecd790f603c74e562cede7c53f24f1780cab 100644 --- a/res/Stysheet.css +++ b/res/Stysheet.css @@ -17,6 +17,7 @@ html { text-align: left; padding: 10px; margin-bottom: 1%; + font-family: 'Fondamento', cursive; } .footer { @@ -36,6 +37,10 @@ html { background-color: #e4be9b; } +.textFont { + font-family: 'Alegreya', serif; +} + .grid-container { display: grid; grid-gap: 2%; @@ -103,11 +108,11 @@ tr:nth-child(even) {background-color: white;} } .aboutText { - padding-left: 10%; - padding-right: 10%; + padding-left: 5%; + padding-right: 5%; } h1.about { - padding-top: 20px; + padding-top: 2%; font-variant: small-caps; } \ No newline at end of file diff --git a/src/DungeonMap.elm b/src/DungeonMap.elm index 2f09454f7d2d7fb34dbdcb88ea2213fd1e7ce4c6..14c87cad65ca30c914b33001a77e7d07671a3304 100644 --- a/src/DungeonMap.elm +++ b/src/DungeonMap.elm @@ -261,16 +261,16 @@ placeIcon iconType id x y color = "player" -> [ Svg.image - [ SvgAtt.width "25" - , SvgAtt.height "25" - , SvgAtt.x (String.fromFloat (Maybe.withDefault 0 (String.toFloat x) - 11.5)) - , SvgAtt.y (String.fromFloat (Maybe.withDefault 0 (String.toFloat y) - 11.5)) + [ SvgAtt.width "45" + , SvgAtt.height "45" + , SvgAtt.x (String.fromFloat (Maybe.withDefault 0 (String.toFloat x) - 22.5)) + , SvgAtt.y (String.fromFloat (Maybe.withDefault 0 (String.toFloat y) - 22)) , SvgAtt.title "ObjectIcon" - , SvgAtt.xlinkHref ("res/icons/hero.png") + , SvgAtt.xlinkHref "res/icons/Hero.svg" ] [] , Svg.text_ [ SvgAtt.textAnchor "middle" - , SvgAtt.x (String.fromFloat (Maybe.withDefault 0 (String.toFloat x) + 1)) - , SvgAtt.y (String.fromFloat (Maybe.withDefault 0 (String.toFloat y) + 2.5)) + , SvgAtt.x (String.fromFloat (Maybe.withDefault 0 (String.toFloat x))) + , SvgAtt.y (String.fromFloat (Maybe.withDefault 0 (String.toFloat y))) , SvgAtt.dominantBaseline "middle" ] [ Svg.text (String.fromInt id) ] diff --git a/src/Main.elm b/src/Main.elm index 6fa41c9f4e097cde255bc469454adfc990ea8b70..97f512f1fe2e2eae889c8bc5291bc9ea09cd5798 100644 --- a/src/Main.elm +++ b/src/Main.elm @@ -264,7 +264,7 @@ update msg model = view : Model -> Html Msg view model = - div [Html.Attributes.class "wrapper", Html.Attributes.style "height" "100%"] + div [Html.Attributes.class "wrapper textFont", Html.Attributes.style "height" "100%"] [ header , Tab.config TabMsg |> Tab.items