Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from master

Browse source
This commit is contained in:
Griatch 2019-02-12 11:47:38 +01:00
commit d94566ef20
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/default/building.py
View file

@ -3067,7 +3067,7 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
return return
elif nprots > 1: elif nprots > 1:
caller.msg("Found {} prototypes matching '{}':\n {}".format( caller.msg("Found {} prototypes matching '{}':\n {}".format(
nprots, prototype, ", ".join(prot.get('prototype_key', '') nprots, prototype, ", ".join(proto.get('prototype_key', '')
for proto in prototypes))) for proto in prototypes)))
return return
# we have a prototype, check access # we have a prototype, check access

2
evennia/web/website/templates/website/404.html
View file

@ -10,7 +10,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<h1 class="card-title">Error 404</h1> <h1 class="card-title">Error 404</h1>
<h4 class="card-subtitle">Page not found</h2> <h4 class="card-subtitle">Page not found</h2>
<hr /> <hr />

2
evennia/web/website/templates/website/500.html
View file

@ -10,7 +10,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<h1 class="card-title">Error 500</h1> <h1 class="card-title">Error 500</h1>
<h4 class="card-subtitle">Internal Server Error</h2> <h4 class="card-subtitle">Internal Server Error</h2>
<hr /> <hr />

2
evennia/web/website/templates/website/evennia_admin.html
View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block p-4"> <div class="card-body">
<h1 class="card-title">Admin</h1> <h1 class="card-title">Admin</h1>
<p class="card-text"> <p class="card-text">
Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game. Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.

2
evennia/web/website/templates/website/flatpages/default.html
View file

@ -7,7 +7,7 @@
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="card"> <div class="card">
<div class="card-block"> <div class="card-body">
<h1 class="card-title">{{flatpage.title}}</h1> <h1 class="card-title">{{flatpage.title}}</h1>
{{flatpage.content}} {{flatpage.content}}
</div> </div>

2
evennia/web/website/templates/website/tbi.html
View file

@ -12,7 +12,7 @@
<div class="col"> <div class="col">
<div class="card text-center"> <div class="card text-center">
<h1 class="card-header">To Be Implemented...</h1> <h1 class="card-header">To Be Implemented...</h1>
<div class="card-block"> <div class="card-body">
This feature has yet to be implemented, but rest assured that it will be! This feature has yet to be implemented, but rest assured that it will be!
<br /> <br />
<br /> <br />