Merge branch 'master' into develop

# Conflicts: # cps/web.py
2017-03-16 21:02:11 +00:00
parent ff89d9c20d a87fab8774
commit 06a4af44cc
2 changed files with 10 additions and 7 deletions
@@ -2,7 +2,7 @@
 {% block body %}
 <div class="single">
  <div class="row">
-    <div class="col-sm-3 col-lg-3 col-xs-12">
+    <div class="col-sm-3 col-lg-3 col-xs-5">
      <div class="cover">
        {% if entry.has_cover %}
          <img src="{{ url_for('get_cover', cover_path=entry.path.replace('\\','/')) }}" />