aboutsummaryrefslogtreecommitdiff
path: root/pyaggr3g470r/templates/errors
diff options
context:
space:
mode:
authorFrançois Schmidts <francois.schmidts@gmail.com>2015-04-06 10:37:13 +0200
committerFrançois Schmidts <francois.schmidts@gmail.com>2015-04-06 10:37:13 +0200
commit29bb2a36f0b5d1781ab05f1976aa0c5017351807 (patch)
tree52b2dd87f4d36f6a9c518cc14f96e523b1dea045 /pyaggr3g470r/templates/errors
parentmisc update (diff)
parentMinor changes to the CSS. (diff)
downloadnewspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.gz
newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.tar.bz2
newspipe-29bb2a36f0b5d1781ab05f1976aa0c5017351807.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: pyaggr3g470r/controllers/feed.py pyaggr3g470r/templates/home.html
Diffstat (limited to 'pyaggr3g470r/templates/errors')
-rw-r--r--pyaggr3g470r/templates/errors/404.html2
-rw-r--r--pyaggr3g470r/templates/errors/500.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/pyaggr3g470r/templates/errors/404.html b/pyaggr3g470r/templates/errors/404.html
index 49c9ef5a..c64a2be8 100644
--- a/pyaggr3g470r/templates/errors/404.html
+++ b/pyaggr3g470r/templates/errors/404.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block content %}
<div class="container">
- <div class="jumbotron">
+ <div class="well">
<h1>Page Not Found</h1>
<p>What you were looking for is just not there, go to the <a href="{{ url_for('home') }}">home page</a>.</p>
</div>
diff --git a/pyaggr3g470r/templates/errors/500.html b/pyaggr3g470r/templates/errors/500.html
index 1fa6acc9..417fc0c7 100644
--- a/pyaggr3g470r/templates/errors/500.html
+++ b/pyaggr3g470r/templates/errors/500.html
@@ -4,7 +4,7 @@
{% endblock %}
{% block content %}
<div class="container">
- <div class="jumbotron">
+ <div class="well">
<h1>Internal Server Error</h1>
<p>Something bad just happened! Go to the <a href="{{ url_for('home') }}">home page</a>.</p>
</div>
bgstack15