Merge branch 'frost' of https://github.com/Aevann1/Drama into frost

files/templates/sidebar_2Much4You.html

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
     {% if sub %}
         {% set image='/static/assets/images/subs/' + sub.name + '.webp?a=1008' %}
@@ -9,17 +10,13 @@
 
 
 {% if sub %}
-    <pre>
-
-    
-    </pre>
-    {{sub.sidebar_html|safe}}
+    <div class="mt-4">{{sub.sidebar_html|safe}}</div>
     <a class="btn btn-primary btn-block mt-4" href="/s/{{sub.name}}/mods">MODS</a>
     {% if v and v.mods(sub.name) %}
         <a class="btn btn-primary btn-block" href="/s/{{sub.name}}/sidebar">EDIT SIDEBAR</a>
     {% endif %}
 {% else %}
-    <p class="mt-4">Rules: No doxxing, No CP or other clearly illegal shit. Thanks.</p>
+    <p class="mt-4">Rules: No doxxing, No CP or other clearly illegal shit. Thanks!</p>
 {% endif %}
 
 <pre>
@@ -29,4 +26,4 @@
 
     
 </pre>
-</div>
+</div>