Merge branch 'master' into martin-martin-patch-1

Author: dbader

arcade-a-primer/README.md

@@ -1 +1 @@
-Source files supporting the **Arcade - A Modern Python Game Framework** article
+Source files supporting the [Arcade: A Primer on the Python Game Framework](https://realpython.com/arcade-python-game-framework/) article on [Real Python](https://realpython.com/).

arcade-a-primer/arcade_game.py

@@ -40,7 +40,7 @@ class SpaceShooter(arcade.Window):
     Collisions end the game
     """
 
-    def __init__(self, width, height, title):
+    def __init__(self, width: int, height: int, title: str):
         """Initialize the game
         """
         super().__init__(width, height, title)
@@ -131,7 +131,7 @@ def add_cloud(self, delta_time: float):
         self.clouds_list.append(cloud)
         self.all_sprites.append(cloud)
 
-    def on_key_press(self, symbol, modifiers):
+    def on_key_press(self, symbol: int, modifiers: int):
         """Handle user keyboard input
         Q: Quit the game
         P: Pause the game

rp-portfolio/personal_portfolio/templates/base.html

@@ -12,7 +12,7 @@
             <li class="nav-item active">
               <a class="nav-link" href="{% url 'project_index' %}">Home</a>
             </li>
-            <li class="nav-item">
+            <li class="nav-item active">
               <a class="nav-link" href="{% url 'blog_index' %}">Blog</a>
             </li>
           </ul>