added margin

This commit is contained in:
Nicholas Matlaga 2017-07-14 18:21:48 -04:00 committed by Griatch
parent 01a340b818
commit 1ee8fcb495
3 changed files with 39 additions and 27 deletions

View file

@ -1,3 +1,5 @@
/* Old site styles, left in just in case.
Shouldn't break anything! */
@media (max-width: 570px) { @media (max-width: 570px) {
.oneThird { .oneThird {
width: 100%; width: 100%;
@ -20,6 +22,7 @@
.headerLinks { .headerLinks {
position: static; position: static;
} }
}
/* If you for some reason need to override the default sizing model, /* If you for some reason need to override the default sizing model,
for instance, if you're using a Google Maps widget, you may need for instance, if you're using a Google Maps widget, you may need
@ -39,17 +42,20 @@ html {
position: relative; position: relative;
min-height: 100%; min-height: 100%;
} }
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: 30px; margin-bottom: 90px;
background-color: #fefefe;
} }
.footer { .footer {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
/* Set the fixed height of the footer here */ /* Set the fixed height of the footer here */
height: 30px; height: 60px;
line-height: 30px; /* Vertically center the text there */ line-height: 60px; /* Vertically center the text there */
background-color: #f5f5f5; background-color: #f5f5f5;
} }
@ -58,6 +64,9 @@ body {
width: 50px; width: 50px;
} }
.footer { /* Default Colors */
background-color: lightgrey; .main-content {
margin-top: 32px;
margin-bottom: 32px;
background-color: white;
} }

View file

@ -12,14 +12,15 @@
<link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" /> <link rel="icon" type="image/x-icon" href="/static/website/images/evennia_logo.png" />
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous"> <!-- Custom styles --> <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<!-- Custom CSS --> <!-- Base CSS -->
<link rel="stylesheet" type="text/css" href="{% static "website/css/app.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "website/css/app.css" %}">
{% comment %} {% comment %}
Allows for loading custom styles without overriding the base site styles Allows for loading custom styles without overriding the base site styles
{% endcomment %} {% endcomment %}
<!-- Custom CSS -->
<link rel="stylesheet" type="text/css" href="{% static "website/css/custom.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "website/css/custom.css" %}">
{% block header_ext %} {% block header_ext %}
@ -79,7 +80,7 @@
</div> </div>
</nav> </nav>
<div class="container" id="main-copy"> <div class="container main-content" id="main-copy">
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div> </div>

View file

@ -9,6 +9,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<div class="jumbotron">
<h1>Welcome!</h1> <h1>Welcome!</h1>
<hr /> <hr />
<p>Welcome to your new installation of <a href="http://evennia.com">Evennia</a>, your friendly <p>Welcome to your new installation of <a href="http://evennia.com">Evennia</a>, your friendly
@ -18,7 +19,7 @@
database without logging into the game. database without logging into the game.
{% if webclient_enabled %} {% if webclient_enabled %}
You can also connect to the game directly from your browser using our You can also connect to the game directly from your browser using our
<a href="{% url 'webclient:index' %}">online client</a>!<br></br> <a href="{% url 'webclient:index' %}">online client</a>!<br>
{% endif %} {% endif %}
For more info, take your time to For more info, take your time to
peruse our extensive online <a href="https://github.com/evennia/evennia/wiki">documentation</a>. peruse our extensive online <a href="https://github.com/evennia/evennia/wiki">documentation</a>.
@ -29,6 +30,7 @@
</p> </p>
</div> </div>
</div> </div>
</div>
<div class="row"> <div class="row">
@ -48,7 +50,7 @@
<div class="card-deck"> <div class="card-deck">
<div class="card card-outline-secondary text-center"> <div class="card card-outline-secondary text-center">
<h3 class="card-header">Players</h3> <h3 class="card-header">Players</h3>
<div class="card-block" <div class="card-block">
<p> <p>
There's currently <strong>{{num_players_connected}}</strong> connected out of a total of <strong>{{num_players_registered}}</strong> players registered. Of these, <strong>{{num_players_registered_recent}}</strong> were created this week, and <strong>{{num_players_connected_recent}}</strong> have connected within the last seven days. There's currently <strong>{{num_players_connected}}</strong> connected out of a total of <strong>{{num_players_registered}}</strong> players registered. Of these, <strong>{{num_players_registered_recent}}</strong> were created this week, and <strong>{{num_players_connected_recent}}</strong> have connected within the last seven days.
</p> </p>