From e91b4f2ed4fce7045342a188b4f5f35b35c500b0 Mon Sep 17 00:00:00 2001 From: Laura <L.Spilling@web.de> Date: Sat, 11 Jul 2020 16:23:30 +0200 Subject: [PATCH] Fancy Font --- index.html | 2 ++ out/main.js | 4 ++-- res/Stysheet.css | 11 ++++++++--- src/DungeonMap.elm | 2 +- src/Main.elm | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 1a4b4e9..299ea68 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 c8683fc..fc47ea6 100644 --- a/out/main.js +++ b/out/main.js @@ -12425,7 +12425,7 @@ var $author$project$DungeonMap$placeIcon = F5( 0, $elm$core$String$toFloat(y)) - 11.5)), $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( @@ -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 f456420..1b8eecd 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 2f09454..e6c719f 100644 --- a/src/DungeonMap.elm +++ b/src/DungeonMap.elm @@ -266,7 +266,7 @@ placeIcon iconType id x y color = , 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.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)) diff --git a/src/Main.elm b/src/Main.elm index 6fa41c9..97f512f 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 -- GitLab