characters/templates/characters/charactershowcase_detail.html

@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-  <div class="page-detail-helper container py-2 py-md-3">
+  <div class="container py-2 py-md-3">
     <div class="row mb-3">
       <div class="col-lg-1"></div>
       <div class="col-12 col-lg-10">

characters/templates/characters/characterversion_detail.html

@@ -12,7 +12,7 @@
 {% endblock %}
 
 {% block content %}
-  <div class="character-detail container page-detail-helper py-2 py-md-3">
+  <div class="character-detail container py-2 py-md-3">
     <div class="row mb-3">
       <div class="col-lg-1"></div>
       <div class="col-12 col-lg-10">

common/static/common/styles/studio/_custom.sass

@@ -57,8 +57,6 @@
       opacity: 1
 
 .btns-toolbar
-  @extend .border-bottom
-
   flex-wrap: wrap
 
 .checkbox-like
@@ -426,10 +424,6 @@ input
   &.unread
     opacity: 1
 
-/* Pages. */
-.page-detail-helper
-  .btns-toolbar
-    border-bottom: 0 !important
 
 /* Payment. */
 .braintree-heading

training/templates/training/section.html

@@ -19,84 +19,82 @@
 {% endblock %}
 
 {% block nexted_content %}
-  <div class="page-detail-helper">
+  <div class="row mb-3">
-    <div class="row mb-3">
+    {% if section.preview_youtube_link %}
-      {% if section.preview_youtube_link %}
-        <div class="col">
-          <div class="overflow-hidden rounded">
-            {% include 'common/components/video_player_embed.html' with url=section.preview_youtube_link rounded=True  %}
-          </div>
-        </div>
-      {% elif video %}
-        <div class="col">
-          <div class="overflow-hidden rounded">
-            {% if section.is_free or request.user|has_active_subscription %}
-              {% if user.is_anonymous %}
-                {% include 'common/components/video_player.html' with url=video.source.url poster=section.thumbnail_m_url tracks=section.static_asset.video.tracks.all loop=section.static_asset.video.loop %}
-              {% else %}
-                {% include 'common/components/video_player.html' with url=video.source.url progress_url=video.progress_url start_position=video.start_position poster=section.thumbnail_m_url tracks=section.static_asset.video.tracks.all loop=section.static_asset.video.loop %}
-              {% endif %}
-            {% else %}
-              {% include 'common/components/content_locked.html' with background=section.thumbnail_m_url %}
-            {% endif %}
-          </div>
-        </div>
-      {% else %}
-        <div class="col">
-          <div class="overflow-hidden rounded">
-            {% if section.is_free or request.user|has_active_subscription %}
-              {% if section.thumbnail %}
-                {% include "common/components/helpers/image_set.html" with alt=section.name classes="img-fluid img-width-100 rounded" img_source=section.thumbnail xsmall_width="600" small_width="800" medium_width="1000" large_width="1200" xlarge_width="1920" %}
-              {% endif %}
-            {% else %}
-              {% include 'common/components/content_locked.html' with background=training.picture_header %}
-            {% endif %}
-          </div>
-        </div>
-      {% endif %}
-    </div>
-    <div class="row">
       <div class="col">
-        <div class="align-items-start row">
+        <div class="overflow-hidden rounded">
-          <div class="col-12 col-md mb-2 mb-md-3">
+          {% include 'common/components/video_player_embed.html' with url=section.preview_youtube_link rounded=True  %}
-            <div class="d-md-block d-none">
-              <p class="small text-muted">{{ chapter.name }}</p>
-              <h2>{{ section.name }}</h2>
-            </div>
-            <div class="text-muted x-sm">
-              <p class="d-inline me-2">{{ section.date_created|date:"N jS, Y" }}</p>
-              {% if section.static_asset.license %}
-                <a href="{{ section.static_asset.license.url }}" target="_blank" class="d-inline me-2 text-muted" data-bs-toggle="tooltip" data-placement="bottom" title="{{ section.static_asset.license.description }}">
-                  <i class="i-info"></i>
-                  {{ section.static_asset.license }}
-                </a>
-              {% endif %}
-              {% if section.is_free %}
-                {% include "common/components/cards/pill.html" with label='Free' %}
-              {% endif %}
-            </div>
-          </div>
-          <div class="col-12 col-md-auto mb-2 mb-md-0 mt-0 mt-md-3">
-            {% include "common/components/navigation/buttons_toolbar.html" with item=section %}
-          </div>
         </div>
-        <div class="row mb-2">
-          {% if section.static_asset.author_image_url  %}
-            <div style="background-image:url('{{ section.static_asset.author_image_url }}');" class="ms-2 profile-avatar"></div>
-          {% else %}
-            <div style="background-image:url('{% static 'common/images/blank-profile-pic.png' %}');" class="ms-2 profile-avatar">
-            </div>
-          {% endif %}
-
-          {% include 'common/components/cards/card_profile.html' with user=section.static_asset.user title="Publisher" %}
-        </div>
-        <section class="mb-3 markdown-text">
-          {% with_shortcodes section.text|markdown_unsafe %}
-        </section>
-        <section class="mb-3">
-          {% include 'comments/components/comment_section.html' %}
-        </section>
       </div>
+    {% elif video %}
+      <div class="col">
+        <div class="overflow-hidden rounded">
+          {% if section.is_free or request.user|has_active_subscription %}
+            {% if user.is_anonymous %}
+              {% include 'common/components/video_player.html' with url=video.source.url poster=section.thumbnail_m_url tracks=section.static_asset.video.tracks.all loop=section.static_asset.video.loop %}
+            {% else %}
+              {% include 'common/components/video_player.html' with url=video.source.url progress_url=video.progress_url start_position=video.start_position poster=section.thumbnail_m_url tracks=section.static_asset.video.tracks.all loop=section.static_asset.video.loop %}
+            {% endif %}
+          {% else %}
+            {% include 'common/components/content_locked.html' with background=section.thumbnail_m_url %}
+          {% endif %}
+        </div>
+      </div>
+    {% else %}
+      <div class="col">
+        <div class="overflow-hidden rounded">
+          {% if section.is_free or request.user|has_active_subscription %}
+            {% if section.thumbnail %}
+              {% include "common/components/helpers/image_set.html" with alt=section.name classes="img-fluid img-width-100 rounded" img_source=section.thumbnail xsmall_width="600" small_width="800" medium_width="1000" large_width="1200" xlarge_width="1920" %}
+            {% endif %}
+          {% else %}
+            {% include 'common/components/content_locked.html' with background=training.picture_header %}
+          {% endif %}
+        </div>
+      </div>
+    {% endif %}
+  </div>
+  <div class="row">
+    <div class="col">
+      <div class="align-items-start row">
+        <div class="col-12 col-md mb-2 mb-md-3">
+          <div class="d-md-block d-none">
+            <p class="small text-muted">{{ chapter.name }}</p>
+            <h2>{{ section.name }}</h2>
+          </div>
+          <div class="text-muted x-sm">
+            <p class="d-inline me-2">{{ section.date_created|date:"N jS, Y" }}</p>
+            {% if section.static_asset.license %}
+              <a href="{{ section.static_asset.license.url }}" target="_blank" class="d-inline me-2 text-muted" data-bs-toggle="tooltip" data-placement="bottom" title="{{ section.static_asset.license.description }}">
+                <i class="i-info"></i>
+                {{ section.static_asset.license }}
+              </a>
+            {% endif %}
+            {% if section.is_free %}
+              {% include "common/components/cards/pill.html" with label='Free' %}
+            {% endif %}
+          </div>
+        </div>
+        <div class="col-12 col-md-auto mb-2 mb-md-0 mt-0 mt-md-3">
+          {% include "common/components/navigation/buttons_toolbar.html" with item=section %}
+        </div>
+      </div>
+      <div class="row mb-2">
+        {% if section.static_asset.author_image_url  %}
+          <div style="background-image:url('{{ section.static_asset.author_image_url }}');" class="ms-2 profile-avatar"></div>
+        {% else %}
+          <div style="background-image:url('{% static 'common/images/blank-profile-pic.png' %}');" class="ms-2 profile-avatar">
+          </div>
+        {% endif %}
+
+        {% include 'common/components/cards/card_profile.html' with user=section.static_asset.user title="Publisher" %}
+      </div>
+      <section class="mb-3 markdown-text">
+        {% with_shortcodes section.text|markdown_unsafe %}
+      </section>
+      <section class="mb-3">
+        {% include 'comments/components/comment_section.html' %}
+      </section>
     </div>
   </div>
 {% endblock nexted_content %}