fix conflict issue

cms/static/aircox/cms/styles.css

@@ -52,31 +52,31 @@ main .section {
 
 
 /** comments **/
-.comment-form label {
+.comment_form label {
     display: none;
 }
 
-.comment-form input:not([type=checkbox]),
-.comment-form textarea {
+.comment_form input:not([type=checkbox]),
+.comment_form textarea {
     display: inline-block;
     width: calc(100% - 5em);
     max-height: 6em;
     margin: 0.2em 0em;
 }
 
-.comment-form input[type=checkbox],
-.comment-form button[type=submit] {
+.comment_form input[type=checkbox],
+.comment_form button[type=submit] {
     max-width: 4em;
     vertical-align:bottom;
     margin: 0.2em 0em;
     text-align: center;
 }
 
-.comment-form .extra {
+.comment_form .extra {
     display: none;
 }
 
-.comment-form input[type="checkbox"]:checked + .extra {
+.comment_form input[type="checkbox"]:checked + .extra {
     display: block;
 }
 

cms/templates/aircox/cms/detail.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block pre_title %}
-<div class="pre_title">
+<div class="pre_title metadata">
 {% if object.thread %}
 <div class="threads">
     {{ object|threads:' > '|safe }}

cms/templates/aircox/cms/section_comments.html

@@ -5,7 +5,7 @@
 
 {% block section_content %}
 {{ form.non_field_errors }}
-<form action="" method="POST" class="comment-form">
+<form action="" method="POST" class="comment_form">
 {% csrf_token %}
 {% render_honeypot_field "hp_website" %}
 <div>
@@ -25,13 +25,16 @@
     <button type="submit">{% trans "Post!" %}</button>
 </div>
 </form>
-<ul style="padding:0; margin:0">
+<div class="comment_list">
     {% for item in object_list %}
-    <li id="comment-{{ item.id }}" class="{{item.css}}">
+    <div id="comment-{{ item.id }}" class="comment_item">
         {{ item.content }}
 
-        <div class="info">
-            <a href="{% if item.url %}{{ item.url }}{% else %}#{% endif %}">{{ item.author }}</a>
+        <div class="metadata">
+            <a href="{% if item.url %}{{ item.url }}{% else
+                %}#{% endif %}" class="author">
+            {{ item.author }}
+            </a>
 
             <time datetime="{{ item.date }}">
                 {{ item.date|date:'l d F Y' }},
@@ -40,9 +43,9 @@
 
             <a href="#comment-{{ item.id }}">#{{ item.id }}</a>
         </div>
-    </li>
+    </div>
     {% endfor %}
-</ul>
+</div>
 
 {% endblock %}
 

cms/views.py

@@ -32,7 +32,6 @@ class PostBaseView:
                     for k in self.website.menu_layouts
                 }.items() if v
             }
-
         context['view'] = self
         return context