Merged in hotfixes (pull request #35)

Hotfix improvements
This commit is contained in:
Tom Price
2015-05-19 00:05:21 +01:00
8 changed files with 8 additions and 8576 deletions

View File

@@ -78,7 +78,7 @@ body .fc { /* extra precedence to overcome jqui */
font-size: 1em;
text-align: center;
overflow: hidden;
font-family: "Courier New", Courier, monospace;
font-family: "Open Sans", sans-serif;
}
/*

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -43,7 +43,7 @@ $link-hover-color: darken($link-color, 15%) !default;
//
//## Font, line-height, and color for body text, headings, and more.
$font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-sans-serif: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif !default;
$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;

View File

@@ -1,6 +1,5 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% block title %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}
{% endif %}{% endblock %}
{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
{% block content %}
<div class="row">
@@ -9,7 +8,7 @@
<div class="col-sm-8">
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
{{ object.name }}
| {{ object.name }}
</h1>
</div>
</div>

View File

@@ -11,7 +11,7 @@
<div class="col-sm-4 text-right">
<a href="{% url 'invoice_void' object.pk %}" class="btn btn-default" title="Void Invoice">
<span class="glyphicon glyphicon-text-background"></span>
<span class="glyphicon glyphicon-ban-circle"></span>
</a>
</div>
</div>

Binary file not shown.

View File

@@ -13,6 +13,7 @@
<link rel="icon" type="image/png" href="/static/imgs/pyrigs-avatar.png">
<link rel="apple-touch-icon" href="/static/imgs/pyrigs-avatar.png">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:400italic,700,300,400' rel='stylesheet' type='text/css'>
<link rel="stylesheet" type="text/css" href="{% static "css/screen.css" %}">