Feature/SK-363 | Remove old CSS and Update bootstrap version (#85)

scaleoutsystems · Mar 10, 2023 · 83e37a7 · 83e37a7
1 parent efdedd8
commit 83e37a7
Showing 1 changed file with 31 additions and 24 deletions.
diff --git a/templates/portal/index.html b/templates/portal/index.html
@@ -4,33 +4,38 @@
 {% load custom_tags %}
 {% block content %}
 
-<div style="display: inline-flex;">
-    <h1 class="h3 mb-3" style="margin-right: 5px;">Apps</h1>
-    <h1 class="h3 mb-3 ghost-number">{% if published_apps|length > 0 %}{{ published_apps|length }}{% endif %}</h1>
-    <div>
-        {% for tf in request.session.app_tag_filters %}
-        <div class="tag tag-list"><a class="tag-list-ico fas fa-times" style="color: #fffafa;"
-                href="{% url 'portal:index' %}?tf_remove={{ tf | urlencode }}"></a><span style="font-weight: 500;">{{ tf
-                }}</span></div>
-        {% endfor %}
+    <div class="row">
+        <div class="col">
+            <h3 class="mb-3" style="margin-right: 5px;">
+                Apps
+                {% if published_apps|length > 0 %}
+                <small>{{ published_apps|length }}</small>
+                {% endif %}
+
+            </h3>
+
+            <div>
+                {% for tf in request.session.app_tag_filters %}
+                <div class="tag tag-list"><a class="tag-list-ico fas fa-times" style="color: #fffafa;"
+                        href="{% url 'portal:index' %}?tf_remove={{ tf | urlencode }}"></a><span style="font-weight: 500;">{{ tf
+                        }}</span></div>
+                {% endfor %}
+            </div>
+        </div>
     </div>
-</div>
-<div class="row">
+<div class="row pt-3 g-4">
     {% for app in published_apps %}
-    <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-4 col-xxl-4 mb-4">
-        <div class="card h-100">
+    <div class="col-12 col-md-6 col-lg-6 col-xl-4">
+        <div class="card h-100 border-0 shadow">
 
             <div style="height:350px;" class="align-items-center d-flex justify-content-center p-2">
                 <img width="200" class="img-fluid img-cover" src="{{ media_url }}{{ app.app.logo_file }}"
                     alt="Card image cap">
             </div>
-            <div class="card-header px-4 pt-4">
-                <h3>
+            <div class="card-body px-4 pt-2">
+                <h3 class="card-header bg-white">
                     {{ app.name }}
                 </h3>
-                <!-- <div class="my-2">Started {{ project.created_at }}</div> -->
-            </div>
-            <div class="card-body px-4 pt-2">
                 <div>
                     {% if request.session.app_tags|exists:app.id %}
                     {% with app.tags|split:"," as tags %}
@@ -43,8 +48,9 @@ <h3>
                     <a href="{% url 'portal:index' %}?app_id_remove={{ app.id | urlencode }}&tag_count={{ tags.count | urlencode }}"
                         style="display: inline-flex;">
                         {% csrf_token %}
-                        <button type="submit" class="btn btn-danger btn-circle tag-count"><span
-                                class="fas fa-minus"></span></button>
+                        <button type="submit" class="btn btn-danger btn-circle tag-count">
+                            -
+                        </button>
                     </a>
                     {% endwith %}
                     {% else %}
@@ -69,10 +75,11 @@ <h3>
                     {% endif %}
                 </div>
                 <!-- <p>Some text here</p> -->
-                <div style="position:absolute;bottom:0.5em;">
-                    <h4>
-                        <a href="{{ app.table_field.url }}">Open</a>
-                    </h4>
+                <div class="row pt-3">
+                    <div class="col">
+
+                        <a href="{{ app.table_field.url }}" target="_blank" class="btn btn-primary">Open</a>
+                    </div>
                 </div>
             </div>
         </div>