prompt: We are currently solving the following issue within our repository. Here is the issue text:
  --- BEGIN ISSUE ---
  epstein_civil_violence box doesn't fit grid
  <img width="431" alt="screen shot 2018-04-01 at 10 05 11 pm" src="https://user-images.githubusercontent.com/166734/38180219-de2decf8-35f8-11e8-8d9b-562d2fb7c58b.png">
  
  ^^ Fix the outline grid on this model. The grid should be the same size as the outline.
  
  --- END ISSUE ---
  
  Below are some code segments, each from a relevant file. One or more of these files may contain bugs.
  --- BEGIN FILES ---
  Path: `examples/epstein_civil_violence/civil_violence/server.py`
  Content:
  ```
  1 from mesa.visualization.ModularVisualization import ModularServer
  2 from mesa.visualization.modules import CanvasGrid
  3 
  4 from .model import CivilViolenceModel
  5 from .agent import Citizen, Cop
  6 
  7 
  8 COP_COLOR = "#000000"
  9 AGENT_QUIET_COLOR = "#0066CC"
  10 AGENT_REBEL_COLOR = "#CC0000"
  11 JAIL_COLOR = "#757575"
  12 
  13 
  14 def citizen_cop_portrayal(agent):
  15     if agent is None:
  16         return
  17 
  18     portrayal = {"Shape": "circle",
  19                  "x": agent.pos[0], "y": agent.pos[1],
  20                  "Filled": "true"}
  21 
  22     if type(agent) is Citizen:
  23         color = AGENT_QUIET_COLOR if agent.condition == "Quiescent" else \
  24             AGENT_REBEL_COLOR
  25         color = JAIL_COLOR if agent.jail_sentence else color
  26         portrayal["Color"] = color
  27         portrayal["r"] = 0.8
  28         portrayal["Layer"] = 0
  29 
  30     elif type(agent) is Cop:
  31         portrayal["Color"] = COP_COLOR
  32         portrayal["r"] = 0.5
  33         portrayal["Layer"] = 1
  34     return portrayal
  35 
  36 
  37 model_params = dict(height=40,
  38                     width=40,
  39                     citizen_density=.7,
  40                     cop_density=.074,
  41                     citizen_vision=7,
  42                     cop_vision=7,
  43                     legitimacy=.8,
  44                     max_jail_term=1000)
  45 
  46 canvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 500, 500)
  47 server = ModularServer(CivilViolenceModel, [canvas_element],
  48                        "Epstein Civil Violence", model_params)
  49
  ```
  --- END FILES ---
  
  Please first localize the bug based on the issue statement, and then generate a patch according to the `git diff` format fenced by three backticks.
  
  Here is an example:
  
  ```diff
  diff --git a/examples/server_async.py b/examples/server_async.py
  --- a/examples/server_async.py
  +++ b/examples/server_async.py
  @@ -313,4 +313,4 @@
   
   
   if __name__ == "__main__":
  -    asyncio.run(run_async_server("."), debug=True)
  +    asyncio.run(run_async_server(), debug=True)
  diff --git a/examples/server_sync.py b/examples/server_sync.py
  --- a/examples/server_sync.py
  +++ b/examples/server_sync.py
  @@ -313,5 +313,5 @@
   
   
   if __name__ == "__main__":
  -    server = run_sync_server(".")
  +    server = run_sync_server()
       server.shutdown()
  
  ```
  
golden_diff: diff --git a/examples/epstein_civil_violence/civil_violence/server.py b/examples/epstein_civil_violence/civil_violence/server.py
  --- a/examples/epstein_civil_violence/civil_violence/server.py
  +++ b/examples/epstein_civil_violence/civil_violence/server.py
  @@ -43,6 +43,6 @@
                       legitimacy=.8,
                       max_jail_term=1000)
   
  -canvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 500, 500)
  +canvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 480, 480)
   server = ModularServer(CivilViolenceModel, [canvas_element],
                          "Epstein Civil Violence", model_params)
  
verification_info: {"golden_diff": "diff --git a/examples/epstein_civil_violence/civil_violence/server.py b/examples/epstein_civil_violence/civil_violence/server.py\n--- a/examples/epstein_civil_violence/civil_violence/server.py\n+++ b/examples/epstein_civil_violence/civil_violence/server.py\n@@ -43,6 +43,6 @@\n                     legitimacy=.8,\n                     max_jail_term=1000)\n \n-canvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 500, 500)\n+canvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 480, 480)\n server = ModularServer(CivilViolenceModel, [canvas_element],\n                        \"Epstein Civil Violence\", model_params)\n", "issue": "epstein_civil_violence box doesn't fit grid\n<img width=\"431\" alt=\"screen shot 2018-04-01 at 10 05 11 pm\" src=\"https://user-images.githubusercontent.com/166734/38180219-de2decf8-35f8-11e8-8d9b-562d2fb7c58b.png\">\r\n\r\n^^ Fix the outline grid on this model. The grid should be the same size as the outline.\n", "before_files": [{"content": "from mesa.visualization.ModularVisualization import ModularServer\nfrom mesa.visualization.modules import CanvasGrid\n\nfrom .model import CivilViolenceModel\nfrom .agent import Citizen, Cop\n\n\nCOP_COLOR = \"#000000\"\nAGENT_QUIET_COLOR = \"#0066CC\"\nAGENT_REBEL_COLOR = \"#CC0000\"\nJAIL_COLOR = \"#757575\"\n\n\ndef citizen_cop_portrayal(agent):\n    if agent is None:\n        return\n\n    portrayal = {\"Shape\": \"circle\",\n                 \"x\": agent.pos[0], \"y\": agent.pos[1],\n                 \"Filled\": \"true\"}\n\n    if type(agent) is Citizen:\n        color = AGENT_QUIET_COLOR if agent.condition == \"Quiescent\" else \\\n            AGENT_REBEL_COLOR\n        color = JAIL_COLOR if agent.jail_sentence else color\n        portrayal[\"Color\"] = color\n        portrayal[\"r\"] = 0.8\n        portrayal[\"Layer\"] = 0\n\n    elif type(agent) is Cop:\n        portrayal[\"Color\"] = COP_COLOR\n        portrayal[\"r\"] = 0.5\n        portrayal[\"Layer\"] = 1\n    return portrayal\n\n\nmodel_params = dict(height=40,\n                    width=40,\n                    citizen_density=.7,\n                    cop_density=.074,\n                    citizen_vision=7,\n                    cop_vision=7,\n                    legitimacy=.8,\n                    max_jail_term=1000)\n\ncanvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 500, 500)\nserver = ModularServer(CivilViolenceModel, [canvas_element],\n                       \"Epstein Civil Violence\", model_params)\n", "path": "examples/epstein_civil_violence/civil_violence/server.py"}], "after_files": [{"content": "from mesa.visualization.ModularVisualization import ModularServer\nfrom mesa.visualization.modules import CanvasGrid\n\nfrom .model import CivilViolenceModel\nfrom .agent import Citizen, Cop\n\n\nCOP_COLOR = \"#000000\"\nAGENT_QUIET_COLOR = \"#0066CC\"\nAGENT_REBEL_COLOR = \"#CC0000\"\nJAIL_COLOR = \"#757575\"\n\n\ndef citizen_cop_portrayal(agent):\n    if agent is None:\n        return\n\n    portrayal = {\"Shape\": \"circle\",\n                 \"x\": agent.pos[0], \"y\": agent.pos[1],\n                 \"Filled\": \"true\"}\n\n    if type(agent) is Citizen:\n        color = AGENT_QUIET_COLOR if agent.condition == \"Quiescent\" else \\\n            AGENT_REBEL_COLOR\n        color = JAIL_COLOR if agent.jail_sentence else color\n        portrayal[\"Color\"] = color\n        portrayal[\"r\"] = 0.8\n        portrayal[\"Layer\"] = 0\n\n    elif type(agent) is Cop:\n        portrayal[\"Color\"] = COP_COLOR\n        portrayal[\"r\"] = 0.5\n        portrayal[\"Layer\"] = 1\n    return portrayal\n\n\nmodel_params = dict(height=40,\n                    width=40,\n                    citizen_density=.7,\n                    cop_density=.074,\n                    citizen_vision=7,\n                    cop_vision=7,\n                    legitimacy=.8,\n                    max_jail_term=1000)\n\ncanvas_element = CanvasGrid(citizen_cop_portrayal, 40, 40, 480, 480)\nserver = ModularServer(CivilViolenceModel, [canvas_element],\n                       \"Epstein Civil Violence\", model_params)\n", "path": "examples/epstein_civil_violence/civil_violence/server.py"}]}