replace font awesome by svg

msuesskraut · Nov 7, 2020 · 6a4a8fb · 6a4a8fb
1 parent 800afea
commit 6a4a8fb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/assets/icons/dot-opt.svg b/assets/icons/dot-opt.svg
diff --git a/assets/icons/o-opt.svg b/assets/icons/o-opt.svg
diff --git a/assets/icons/x-opt.svg b/assets/icons/x-opt.svg
diff --git a/assets/index.html b/assets/index.html
@@ -8,12 +8,9 @@
 
     <link rel="icon" type="image/png" href="./favicon.png">
 
-    <!-- Bootstrap 4.4.1 -->
+    <!-- Bootstrap 4.5.3 -->
     <link rel="stylesheet" href="bootstrap.min.css">
 
-    <!-- Font Awesome 5 -->
-    <script src="https://kit.fontawesome.com/8d3c6246d3.js"></script>
-
     <link rel="stylesheet" type="text/css" href="./main.css">
 
     <title>Binoxxo</title>
@@ -22,7 +19,7 @@
 <body>
 <section id="app"></section>
 
-<!-- Bootstrap 4.4.1 -->
+<!-- Bootstrap 4.5.3 -->
 <script src="jquery-3.5.1.slim.min.js"></script>
 <script src="bootstrap.bundle.min.js"></script>
 

diff --git a/src/view.rs b/src/view.rs
@@ -37,18 +37,12 @@ impl<'a> ViewBuilder<'a> {
         self.tr_with_args(id, None)
     }
 
-    fn view_field(&self, field: Field) -> Node<Message> {
-        let classes = match field {
-            Field::Empty => "fas fa-circle",
-            Field::X => "fas fa-times",
-            Field::O => "far fa-circle",
-        };
-
-        let mut field_view = i![C![classes]];
-        if Field::Empty == field {
-            field_view.add_style(St::FontSize, unit!(20, %));
+    fn view_field(&self, field: Field) -> Vec<Node<Message>> {
+        match field {
+            Field::Empty => Node::<Message>::from_html(include_str!("../assets/icons/dot-opt.svg")),
+            Field::X => Node::<Message>::from_html(include_str!("../assets/icons/x-opt.svg")),
+            Field::O => Node::<Message>::from_html(include_str!("../assets/icons/o-opt.svg")),
         }
-        field_view
     }
 
     fn view_cell(&self, col: usize, row: usize) -> Node<Message> {
@@ -271,10 +265,7 @@ impl<'a> ViewBuilder<'a> {
                 h1![self.tr("header")],
             ]
         ];
-        let board = div![
-            C!["cl-xs-8 col-sm-8 col-md-8 col-lg-8"],
-            self.view_game()
-        ];
+        let board = div![C!["cl-xs-8 col-sm-8 col-md-8 col-lg-8"], self.view_game()];
         let controls = div![
             C!["col-xs-4 col-sm-4 col-md-4 col-lg-4"],
             button![