django-spire 0.16.9__py3-none-any.whl → 0.16.11__py3-none-any.whl

django_spire/ai/chat/templates/django_spire/ai/chat/dropdown/ellipsis_dropdown.html

@@ -11,8 +11,8 @@
 {% endblock %}
 
 {% block dropdown_content %}
-    {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_click="enable_rename_chat()" link_text='Rename' %}
+    {% include 'django_spire/dropdown/element/dropdown_link_element.html' with x_click="enable_rename_chat()" link_text='Rename' link_css='text-start' %}
 
     {% url 'django_spire:ai:chat:template:confirm_delete' pk=recent_chat.id as delete_url %}
-    {% include 'django_spire/dropdown/element/ellipsis_dropdown_modal_link_element.html' with view_url=delete_url link_text='Delete' link_css='text-app-danger' %}
+    {% include 'django_spire/dropdown/element/ellipsis_dropdown_modal_link_element.html' with view_url=delete_url link_text='Delete' link_css='text-app-danger text-start' %}
 {% endblock %}

django_spire/ai/chat/templates/django_spire/ai/chat/widget/search_chat_widget.html

@@ -30,7 +30,7 @@
                 @keydown.up="$focus.wrap().previous()"
                 x-show="expanded && search_query.trim() !== ''"
 
-                class="position-absolute overflow-auto top-100 start-0 w-100 bg-white border border-bottom-2 rounded-bottom-1 shadow p-0 m-0"
+                class="position-absolute overflow-auto top-100 start-0 w-100 border border-bottom-2 rounded-bottom-1 shadow p-0 m-0"
                 style="z-index: 1100;"
                 x-ref="search_results">
 

django_spire/auth/group/templates/django_spire/auth/group/element/group_perm_element.html

@@ -1,40 +1,58 @@
-<div x-data="{
-               current_permission: '{{ perm_data.level_verbose }}',
-               permission_choices: ['None', 'View', 'Add', 'Change', 'Delete'],
-               loading: false,
-               error_message: '',
-               show_dropdown: false,
-                 async update(perm) {
-                   this.show_dropdown = false
-                   this.error_message = null
-                   if(this.current_permission !== perm) {
-                       this.loading = true
-                       let response = await ajax_request(
-                           'POST',
-                           '{% url "django_spire:auth:group:json:group_permission_ajax" app_name=perm_data.app_name pk=group.pk %}',
-                           {'perm_level': perm}
-                       )
-                       this.loading = false
-                       let status = response.data.status
-                       if (status === 200){
-                           this.current_permission = perm
-                       } else {
-                           this.error_message = response.data.message
-                       }
-                   }
-               }
-        }">
+<div
+    x-data="{
+        current_permission: '{{ perm_data.level_verbose }}',
+        permission_choices: ['None', 'View', 'Add', 'Change', 'Delete'],
+        loading: false,
+        error_message: '',
+        show_dropdown: false,
+
+        async update(perm) {
+            this.show_dropdown = false
+            this.error_message = null
+
+            if(this.current_permission !== perm) {
+                this.loading = true
+                let response = await ajax_request(
+                    'POST',
+                    '{% url "django_spire:auth:group:json:group_permission_ajax" app_name=perm_data.app_name pk=group.pk %}',
+                    {'perm_level': perm}
+                )
+                this.loading = false
+                let status = response.data.status
+                if (status === 200){
+                    this.current_permission = perm
+                } else {
+                    this.error_message = response.data.message
+                }
+            }
+        }
+    }"
+>
     <div class="position-relative">
         <div @click="show_dropdown = true" class="btn btn-sm border dropdown-toggle">
             <span x-text="current_permission"></span>
         </div>
-        <div @click.outside="show_dropdown = false" x-show="show_dropdown" style="width: 80px; z-index: 2"
-             class="card position-absolute bg-app-layer-three mt-1">
+        <div
+            style="width: 80px; z-index: 2"
+            class="card position-absolute bg-app-layer-one mt-1 border"
+            x-show="show_dropdown"
+            @click.outside="show_dropdown = false"
+        >
             <template x-for="perm in permission_choices">
-                <div @click="update(perm)" class="py-1 ps-2 cursor-pointer text-app-primary-hover"
-                     x-bind:class="{ 'border-bottom': perm !== 'Delete' }">
-                    <span class="fs--1" x-bind:class="{ 'text-app-secondary': perm === current_permission }"
-                          x-text="perm"></span>
+                <div
+                    class="py-1 ps-2 cursor-pointer bg-app-layer-three-hover"
+                    :class="{ 'border-bottom': perm !== 'Delete' }"
+                    :style="
+                        perm === 'None' ? 'border-top-left-radius: 0.30rem !important; border-top-right-radius: 0.30rem !important;' :
+                        perm === 'Delete' ? 'border-bottom-left-radius: 0.30rem !important; border-bottom-right-radius: 0.30rem !important;' : ''
+                    "
+                    @click="update(perm)"
+                >
+                    <span
+                        class="fs--1"
+                        :class="{ 'text-app-secondary': perm === current_permission }"
+                        x-text="perm"
+                    ></span>
                 </div>
             </template>
         </div>

django_spire/auth/group/templates/django_spire/auth/group/element/group_special_role_element.html

@@ -1,43 +1,60 @@
-<div x-data="{
-                has_access: '{{ special_role.has_access }}' === 'True',
-                get has_access_verbose() { return this.has_access ? 'Yes' : 'No' },
-                codename: '{{ special_role.codename }}',
-                permission_choices: ['No', 'Yes'],
-                loading: false,
-                error_message: '',
-                show_dropdown: false,
-                  async update(perm) {
-                    this.show_dropdown = false
-                    this.error_message = null
-                    this.loading = true
-                    let response = await ajax_request(
-                        'POST',
-                        '{% url "django_spire:auth:group:json:group_special_role_ajax" app_name=perm_data.app_name pk=group.pk %}',
-                        {
-                            'codename': this.codename,
-                            'grant_special_role_access': perm === 'Yes'
-                        }
-                    )
-                    this.loading = false
-                    let status = response.data.status
-                    if (status === 200){
-                        this.has_access = perm === 'Yes'
-                    } else {
-                        this.error_message = response.data.message
-                    }
+<div
+    x-data="{
+        has_access: '{{ special_role.has_access }}' === 'True',
+        get has_access_verbose() { return this.has_access ? 'Yes' : 'No' },
+        codename: '{{ special_role.codename }}',
+        permission_choices: ['No', 'Yes'],
+        loading: false,
+        error_message: '',
+        show_dropdown: false,
+
+        async update(perm) {
+            this.show_dropdown = false
+            this.error_message = null
+            this.loading = true
+            let response = await ajax_request(
+                'POST',
+                '{% url "django_spire:auth:group:json:group_special_role_ajax" app_name=perm_data.app_name pk=group.pk %}',
+                {
+                'codename': this.codename,
+                'grant_special_role_access': perm === 'Yes'
                 }
-            }">
+            )
+            this.loading = false
+            let status = response.data.status
+            if (status === 200){
+                this.has_access = perm === 'Yes'
+            } else {
+                this.error_message = response.data.message
+            }
+        }
+    }"
+>
     <div class="position-relative">
         <div @click="show_dropdown = true" class="btn btn-sm btn-app-primary-outlined dropdown-toggle">
             <span x-text="has_access_verbose"></span>
         </div>
-        <div @click.outside="show_dropdown = false" x-show="show_dropdown" style="width: 80px; z-index: 2"
-             class="card position-absolute bg-white mt-1">
+        <div
+            style="width: 80px; z-index: 2"
+            class="card position-absolute bg-app-layer-one mt-1 border"
+            x-show="show_dropdown"
+            @click.outside="show_dropdown = false"
+        >
             <template x-for="perm in permission_choices">
-                <div @click="update(perm)" class="py-1 ps-2 cursor-pointer bg-soft-primary-hover"
-                     x-bind:class="{ 'border-bottom': perm !== 'Yes' }">
-                    <span class="fs--1" x-bind:class="{ 'text-app-secondary': has_access_verbose === perm }"
-                          x-text="perm"></span>
+                <div
+                    class="py-1 ps-2 cursor-pointer bg-app-layer-three-hover"
+                    :class="{ 'border-bottom': perm !== 'Yes' }"
+                    :style="
+                        perm === 'No' ? 'border-top-left-radius: 0.30rem !important; border-top-right-radius: 0.30rem !important;' :
+                        perm === 'Yes' ? 'border-bottom-left-radius: 0.30rem !important; border-bottom-right-radius: 0.30rem !important;' : ''
+                    "
+                    @click="update(perm)"
+                >
+                    <span
+                        class="fs--1"
+                        :class="{ 'text-app-secondary': has_access_verbose === perm }"
+                        x-text="perm"
+                    ></span>
                 </div>
             </template>
         </div>

django_spire/auth/templates/django_spire/auth/page/login_page.html

@@ -1,11 +1,14 @@
 {% extends 'django_spire/auth/page/auth_page.html' %}
 
 {% block authentication_page_content %}
-
-    <form x-data="{
-        username: new GlueCharField('username', {required: true}),
-        password: new GlueCharField('password', {required: true})
-    }" method="post" class="text-app-secondary">
+    <form
+        class="text-app-secondary"
+        method="post"
+        x-data="{
+            username: new GlueCharField('username', {required: true, label: {% block username_label %}'Email Address'{% endblock %}}),
+            password: new GlueCharField('password', {required: true})
+        }"
+    >
         {% csrf_token %}
         <div class="row">
             <div class="col">
@@ -30,8 +33,4 @@
             Forgot my password
         </a>
     </div>
-
 {% endblock %}
-
-
-

django_spire/auth/templates/django_spire/auth/page/logout_page.html

@@ -15,7 +15,7 @@
         <div class="col px-4">
             <form method="post" action="{% url 'django_spire:auth:redirect:logout' %}" class="text-app-secondary">
                 {% csrf_token %}
-                <button type="submit" class="d-block mx-auto bg-light-primary shadow-sm text-white btn my-4 w-100">Logout</button>
+                <button type="submit" class="d-block mx-auto shadow-sm btn my-4 w-100">Logout</button>
             </form>
         </div>
     </div>

django_spire/auth/templates/django_spire/auth/page/password_set_form_page.html

@@ -13,7 +13,7 @@
         </div>
         <div class="row mt-2">
             <div class="col">
-                <button type="submit" class="w-100 btn btn-blue mt-2">Submit</button>
+                <button type="submit" class="w-100 btn btn-app-success mt-2">Submit</button>
             </div>
         </div>
     </form>

django_spire/comment/templates/django_spire/comment/element/comment_button_element.html

@@ -122,7 +122,7 @@
 
             {% elif button_text %}
                 <button @click="toggle_show_comment_dropdown()"
-                        class="btn bg-white text-business-base-blue rounded border-1 border-business-base-blue btn-sm px-2"
+                        class="btn text-business-base-blue rounded border-1 border-business-base-blue btn-sm px-2"
                         type="button" data-display="static"
                         aria-haspopup="true" aria-expanded="false">
                     {{ button_text }}
@@ -143,7 +143,7 @@
 
                             <div style="max-height: 100px; overflow-x: hidden; overflow-y: auto"
                                  x-show="show_user_list_dropdown" @click.outside="show_user_list_dropdown = false"
-                                 class="text-business-base-blue bg-white fs-0 w-75 ms-3 border rounded position-absolute top-25 start-0">
+                                 class="text-business-base-blue fs-0 w-75 ms-3 border rounded position-absolute top-25 start-0">
                                 <template x-for="(user, index) in filtered_users" :key="user.username">
                                     <a class="text-decoration-none text-business-base-blue" href="#">
                                         <li @click="add_user_to_comment(user)"
@@ -153,7 +153,7 @@
                                 </template>
                             </div>
 
-                            <button @click="$store.page_state.toggle_page_loading_state()" class="btn btn-primary btn-sm w-100 mt-1"
+                            <button @click="$store.page_state.toggle_page_loading_state()" class="btn btn-app-primary btn-sm w-100 mt-1"
                                     type="submit">Submit
                             </button>
                         </form>
@@ -162,4 +162,4 @@
             </div>
         </div>
     </div>
-{% endif %}
+{% endif %}

django_spire/comment/templates/django_spire/comment/element/comment_textarea_element.html

@@ -101,7 +101,7 @@
         </form>
 
         <div style="max-height: 125px; z-index: 2; overflow-x: hidden; overflow-y: auto" x-show="show_user_list" @click.outside="show_user_list=false" x-transition
-             class="bg-white text-900 w-100 shadow border rounded position-absolute top-50 start-0">
+             class="text-900 w-100 shadow border rounded position-absolute top-50 start-0">
             <template x-if="filtered_users.length > 0">
                 <template x-for="user in filtered_users" :key="user.id">
                         <div @click="add_user_to_comment(user)"

django_spire/comment/templates/django_spire/comment/widget/tagging_widget.html

@@ -108,7 +108,7 @@
              @keydown.up.prevent.stop="$focus.wrap().prev()"
              @keydown.tab.prevent.stop="$focus.wrap().next()"
              @keydown.esc.prevent.stop="document.getElementById(id).focus()"
-             class="bg-white w-100 shadow border border-1 rounded position-absolute top-100 start-0 mt-1">
+             class="w-100 shadow border border-1 rounded position-absolute top-100 start-0 mt-1">
             <template x-if="filtered_users.length > 0">
                 <template x-for="user in filtered_users" :key="user.id">
                         <button

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.9'
+__VERSION__ = '0.16.11'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

django_spire/contrib/form/templates/django_spire/contrib/form/button/form_submit_button.html

@@ -36,7 +36,7 @@
         x-cloak
     >
         <div
-            class="spinner-border text-white spinner-border-sm"
+            class="spinner-border spinner-border-sm"
             role="status"
             x-transition
         >

django_spire/contrib/help/templates/django_spire/contrib/help/help_modal.html

@@ -1,5 +1,5 @@
 <div
-    class="modal fade text-dark"
+    class="modal fade"
     id="{{ help_id }}"
     tabindex="-1"
     aria-labelledby="exampleModalLabel"
@@ -38,4 +38,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

django_spire/core/context_processors.py

@@ -20,9 +20,6 @@ def django_spire(request: WSGIRequest) -> dict[str, Any]:
 
     return {
         'DJANGO_SPIRE_VERSION': __VERSION__,
-        'app_bootstrap_icon': {
-            'help_desk': 'bi bi-headset'
-        },
         'AuthController': auth_controller_dict
     }
 

django_spire/core/management/commands/spire_startapp_pkg/maps.py

@@ -3,19 +3,26 @@ from __future__ import annotations
 
 def generate_replacement_map(components: list[str]) -> dict[str, str]:
     app_name = components[-1]
-    class_name = ''.join(word.title() for word in app_name.split('_'))
-    parent = components[-2] if len(components) > 1 else app_name
+    model_name = ''.join(word.title() for word in app_name.split('_'))
+    if len(components)> 1:
+        parents = components[0:-1]
+        parent = components[-2]
+    else:
+        parents = [app_name,]
+        parent = app_name
     module = '.'.join(components)
 
+    # The sequence is important. Plurals must be replaced first;
+    # otherwise, it will generate _plural variables and names.
     return {
         'module': module,
-        'spirepermission': parent.lower() + app_name.lower(),
-        'SpireChildApp': class_name,
-        'SpireChildApps': class_name + 's',
-        'spirechildapp': app_name.lower(),
-        'spirechildapps': app_name.lower() + 's',
-        'SpireParentApp': class_name,
-        'SpireParentApps': class_name + 's',
-        'spireparentapp': parent.lower(),
-        'spireparentapps': parent.lower() + 's'
+        'spire_model_name_plural': model_name + 's',
+        'spire_model_name': model_name,
+        'spire_app_name_plural': app_name.lower() + 's',
+        'spire_app_name': app_name.lower(),
+        'spire_parent_app': parent.lower(),
+        'spire_reverse_parent_path': ':'.join(parents[1:]).lower(),
+        'spire_reverse_path': ':'.join(parents[1:]).lower() + ':' + app_name.lower(),
+        'spire_label_path': '_'.join(parents[1:]).lower() + '_' + app_name.lower(),
+        'spire_template_path': '/'.join(parents[1:]).lower() + '/' + app_name.lower(),
     }

django_spire/core/management/commands/spire_startapp_pkg/template/templates/card/spirechildapp_detail_card.html

@@ -1,24 +1,24 @@
 {% extends 'django_spire/card/title_card.html' %}
 
 {% block card_title %}
-	SpireChildApp
+	spire_model_name
 {% endblock %}
 
 {% block card_button %}
-	{% if perms.spireparentapp.change_spirepermission %}
-        {% url 'spireparentapp:spirechildapp:page:form' pk=spirechildapp.pk as spirechildapp_edit_url %}
-        {% include 'django_spire/button/primary_dark_button.html' with button_text='Edit' button_icon='bi bi-pencil' button_href=spirechildapp_edit_url %}
+	{% if perms.spire_label_path.change_spire_app_name %}
+        {% url 'spire_parent_app:spire_app_name:page:form' pk=spire_app_name.pk as spire_app_name_edit_url %}
+        {% include 'django_spire/button/primary_dark_button.html' with button_text='Edit' button_icon='bi bi-pencil' button_href=spire_app_name_edit_url %}
     {% endif %}
 {% endblock %}
 
 {% block card_title_content %}
 	<div class="row g-3">
         <div class="col-12">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title='Name' attribute_value=spirechildapp.name %}
+            {% include 'django_spire/element/attribute_element.html' with attribute_title='Name' attribute_value=spire_app_name.name %}
         </div>
 
         <div class="col-12">
-            {% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=spirechildapp.description|linebreaksbr %}
+            {% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=spire_app_name.description|linebreaksbr %}
         </div>
     </div>
 {% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/card/spirechildapp_form_card.html

@@ -1,9 +1,9 @@
 {% extends 'django_spire/card/title_card.html' %}
 
 {% block card_title %}
-	SpireChildApp
+	spire_model_name
 {% endblock %}
 
 {% block card_title_content %}
-	{% include 'spireparentapp/spirechildapp/form/spirechildapp_form.html' %}
+	{% include 'spire_parent_app/spire_app_name/form/spire_app_name_form.html' %}
 {% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/card/spirechildapp_list_card.html

@@ -1,17 +1,17 @@
 {% extends 'django_spire/card/title_card.html' %}
 
 {% block card_title %}
-	SpireChildApps
+	spire_model_name_plural
 {% endblock %}
 
 {% block card_button %}
-    {% url 'spireparentapp:spirechildapp:page:form' pk=0 as new_spirechildapp_url %}
-	{% include 'django_spire/button/primary_dark_button.html' with button_text='Add' button_icon='bi bi-plus' button_href=new_spirechildapp_url %}
+    {% url 'spire_parent_app:spire_app_name:page:form' pk=0 as new_spire_app_name_url %}
+	{% include 'django_spire/button/primary_dark_button.html' with button_text='Add' button_icon='bi bi-plus' button_href=new_spire_app_name_url %}
 {% endblock %}
 
 {% block card_title_content %}
-	{% for spirechildapp in spirechildapps %}
-		{% include 'spireparentapp/spirechildapp/item/spirechildapp_item.html' %}
+	{% for spire_app_name in spire_app_name_plural %}
+		{% include 'spire_parent_app/spire_app_name/item/spire_app_name_item.html' %}
     {% empty %}
         {% include 'django_spire/item/no_data_item.html' %}
     {% endfor %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/item/spirechildapp_item.html

@@ -1,24 +1,24 @@
 {% extends 'django_spire/item/item.html' %}
 
 {% block item_title %}
-    {% url 'spireparentapp:spirechildapp:page:detail' pk=spirechildapp.pk as spirechildapp_view_url %}
-	{% include 'django_spire/element/attribute_element.html' with attribute_title='SpireChildApp' attribute_value=spirechildapp.name attribute_href=spirechildapp_view_url %}
+    {% url 'spire_parent_app:spire_app_name:page:detail' pk=spire_app_name.pk as spire_app_name_view_url %}
+	{% include 'django_spire/element/attribute_element.html' with attribute_title='spire_model_name' attribute_value=spire_app_name.name attribute_href=spire_app_name_view_url %}
 {% endblock %}
 
 {% block item_row_content %}
-	{% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=spirechildapp.description %}
+	{% include 'django_spire/element/attribute_element.html' with attribute_title='Description' attribute_value=spire_app_name.description %}
 {% endblock %}
 
 {% block item_button %}
-    {% url 'spireparentapp:spirechildapp:page:detail' pk=spirechildapp.pk as spirechildapp_view_url %}
+    {% url 'spire_parent_app:spire_app_name:page:detail' pk=spire_app_name.pk as spire_app_name_view_url %}
 
-    {% if perms.spireparentapp.change_spirepermission %}
-        {% url 'spireparentapp:spirechildapp:page:form' pk=spirechildapp.pk as spirechildapp_edit_url %}
+    {% if perms.spire_label_path.change_spire_app_name %}
+        {% url 'spire_parent_app:spire_app_name:page:form' pk=spire_app_name.pk as spire_app_name_edit_url %}
     {% endif %}
 
-    {% if perms.spireparentapp.delete_spirepermission %}
-        {% url 'spireparentapp:spirechildapp:page:delete' pk=spirechildapp.pk as spirechildapp_delete_url %}
+    {% if perms.spire_label_path.delete_spire_app_name %}
+        {% url 'spire_parent_app:spire_app_name:page:delete' pk=spire_app_name.pk as spire_app_name_delete_url %}
     {% endif %}
 
-	{% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=spirechildapp_view_url edit_url=spirechildapp_edit_url delete_url=spirechildapp_delete_url %}
+	{% include 'django_spire/dropdown/ellipsis_dropdown.html' with view_url=spire_app_name_view_url edit_url=spire_app_name_edit_url delete_url=spire_app_name_delete_url %}
 {% endblock %}

django_spire/core/management/commands/spire_startapp_pkg/template/templates/page/spirechildapp_detail_page.html

@@ -3,11 +3,11 @@
 {% block page_content %}
 	<div class="row g-3">
         <div class="col-12">
-            {% include 'spireparentapp/spirechildapp/card/spirechildapp_detail_card.html' %}
+            {% include 'spire_parent_app/spire_app_name/card/spire_app_name_detail_card.html' %}
         </div>
 
         <div class="col-4">
-            {% include 'history/card/activity_list_card.html' with activity_log=spirechildapp.activity_log.prefetch_user %}
+            {% include 'history/card/activity_list_card.html' with activity_log=spire_app_name.activity_log.prefetch_user %}
         </div>
     </div>
 {% endblock %}

django_spire/core/static/django_spire/css/app-default.css

@@ -13,4 +13,5 @@ a:visited:hover {
 
 body {
     color: var(--app-default-text-color);
+    scrollbar-color: var(--app-bg-secondary) transparent;
 }

django_spire/core/static/django_spire/css/bootstrap-extension.css

@@ -26,6 +26,21 @@ h1, h2, h3, h4, h5, h6 {
     box-shadow: rgba(0, 0, 0, 0.1) 0 0.25rem 0.375rem -0.0625rem, rgba(0, 0, 0, 0.06) 0 0.125rem 0.25rem -0.0625rem !important;
 }
 
+.dropdown-item {
+    border-bottom: var(--bs-border-width) var(--bs-border-style) var(--bs-border-color);
+}
+
+.dropdown-item:first-child {
+    border-top-left-radius: 0.30rem !important;
+    border-top-right-radius: 0.30rem !important;
+}
+
+.dropdown-item:last-child {
+    border-bottom: 0;
+    border-bottom-left-radius: 0.30rem !important;
+    border-bottom-right-radius: 0.30rem !important;
+}
+
 .cursor-pointer {
     cursor: pointer !important;
 }

django_spire/core/templates/django_spire/badge/accent_badge.html

@@ -1,3 +1,3 @@
 {% extends 'django_spire/badge/base_badge.html' %}
 
-{% block badge_class %}bg-app-accent text-white{% endblock %}
+{% block badge_class %}bg-app-accent{% endblock %}

django_spire/core/templates/django_spire/badge/primary_badge.html

@@ -1,3 +1,3 @@
 {% extends 'django_spire/badge/base_badge.html' %}
 
-{% block badge_class %}bg-app-primary text-white{% endblock %}
+{% block badge_class %}bg-app-primary{% endblock %}

django_spire/core/templates/django_spire/badge/secondary_badge.html

@@ -1,3 +1,3 @@
 {% extends 'django_spire/badge/base_badge.html' %}
 
-{% block badge_class %}bg-app-secondary text-white{% endblock %}
+{% block badge_class %}bg-app-secondary{% endblock %}

django_spire/core/templates/django_spire/badge/warning_badge.html

@@ -1,3 +1,3 @@
 {% extends 'django_spire/badge/base_badge.html' %}
 
-{% block badge_class %}bg-app-warning text-dark{% endblock %}
+{% block badge_class %}bg-app-warning {% endblock %}

django_spire/core/templates/django_spire/card/delete_confirmation_form_card.html

@@ -18,7 +18,7 @@
             <input hidden id="delete_confirmation_should_delete" value="false" name="should_delete" type="text">
 
             <div class="col-auto me-3">
-                {% include 'django_spire/button/danger_dark_button.html' with x_button_click='submit_value(true)' button_text='Delete' %}
+                {% include 'django_spire/button/danger_button.html' with x_button_click='submit_value(true)' button_text='Delete' %}
             </div>
             <div class="col-auto">
                 {% include 'django_spire/button/secondary_button.html' with x_button_click='submit_value(false)' button_text='Cancel' %}

django_spire/core/templates/django_spire/card/infinite_scroll_card.html

@@ -114,7 +114,7 @@
 
         <div class="row justify-content-between align-items-center {% block card_title_class %}mb-2 pb-2 border-bottom-secondary{% endblock %}">
             <div class="col">
-                <div class="card-title text-uppercase text-black mb-0">{% block card_title %}{% endblock %}</div>
+                <div class="card-title text-uppercase mb-0">{% block card_title %}{% endblock %}</div>
             </div>
             <div class="col-auto d-flex align-items-center" style="min-height: 2.0rem;">
                 {% block card_button %}

django_spire/core/templates/django_spire/card/title_card.html

@@ -17,8 +17,7 @@
                 </div>
             </div>
             <div class="col-auto d-flex">
-                {% block card_button %}
-                {% endblock %}
+                {% block card_button %}{% endblock %}
             </div>
         </div>
         <div x-show="card_title_dropdown" x-cloak x-collapse>

django_spire/core/templates/django_spire/dropdown/dropdown.html

@@ -5,7 +5,7 @@
     {% endblock %}
     <div
         style="{% block dropdown_style %}{% endblock  %} z-index: 4;"
-        class="position-absolute shadow-lg card border-1 mt-1 {% block dropdown_position %}top-100{% endblock %}"
+        class="position-absolute shadow-lg card border border-bott mt-1 {% block dropdown_position %}top-100{% endblock %}"
         x-bind="dialogue"
         x-cloak
     >