fresher bootstrap

IsharMud · Oct 31, 2023 · fd1a660 · fd1a660
1 parent 3777dc5
commit fd1a660
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/ishar/apps/events/templates/events.html b/ishar/apps/events/templates/events.html
@@ -7,7 +7,7 @@
 {% block header %}Global Events{% endblock header %}
 {% block content %}
     {% if global_events %}
-                <ul>
+                <ul class="card-text">
         {% for global_event in global_events %}
                     <li title="{{ global_event.event_desc }}">
                         <h3>

diff --git a/ishar/apps/leaders/templates/leaders.html b/ishar/apps/leaders/templates/leaders.html
@@ -85,7 +85,9 @@
             </div>
         </div>
         <div class="card bg-dark">
-             <div class="card-body" id="leaders"></div>
+             <div class="card-body">
+                  <div class="card-text" id="leaders"></div>
+             </div>
         </div>
     </div>
     <script>

diff --git a/ishar/static/style.css b/ishar/static/style.css
@@ -1,8 +1,10 @@
-body, .dropdown-menu { background-color: #323639; color: #d6d6d7; }
+input, body { background-color: #323639; color: #d6d6d7; }
+.card-header, .card-title { color: #fa7; }
+card, .card-text, .card-footer { color: #d6d6d7; }
+button, textarea, input, select { border: 0.1rem solid #fa7; background-color: #323639; color: #fa7; }
+h1, h2, h3, h4, h5, strong, th, label, th, .gridjs-th-content, .gridjs-td[data-column-id="name"] { color: #fa7; }
 
-h2, h3, h4, h5, strong, th, label, button, input, textarea { color: #fa7; }
-
-button, input, textarea { background-color: #323639; border: 1px solid #d6d6d7; }
+.navbar-dark .navbar-toggler-icon { background-image: url("/static/images/cropped_ishar_logo_dark.png"); }
 
 a[target="_blank"]::after {
     content: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAQElEQVR42qXKwQkAIAxDUUdxtO6/RBQkQZvSi8I/pL4BoGw/XPkh4XigPmsUgh0626AjRsgxHTkUThsG2T/sIlzdTsp52kSS1wAAAABJRU5ErkJggg==);
@@ -12,7 +14,7 @@ a[target="_blank"]::after {
 
 a { color: #09f; text-decoration: none; }
 a:active, a:visited { color: #6082b6; }
-a:hover, #active-nav { color: #d6d6d7; }
+a:hover { color: #d6d6d7; }
 
 pre { padding-left: 2vw; white-space: pre-wrap; }
 

diff --git a/ishar/templates/layout.html b/ishar/templates/layout.html
@@ -1,4 +1,3 @@
-{% load bootstrap5 %}
 {% load humanize %}
 {% load static %}
 <!DOCTYPE html>
@@ -17,26 +16,26 @@
         <meta property="og:url" content="{% block meta_url %}{% url "index" %}{% endblock meta_url %}">
         <meta property="og:image" content="{% block meta_image %}{% static "images/cropped_ishar_logo_dark.png" %}{% endblock meta_image %}">
         <title>{% block title %}Welcome{% endblock title %} - Ishar MUD</title>
-        {% bootstrap_css %}
-        {% bootstrap_javascript %}
-        <link rel="stylesheet" type="text/css" href="{% static "style.css" %}">
         <link rel="shortcut icon" href="{% static "images/favicon.ico" %}" type="image/x-icon">
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+        <link rel="stylesheet" type="text/css" href="{% static "style.css" %}">
+        <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
     {% endblock head %}
     {% block scripts %}
     {% endblock scripts %}
     </head>
     <body>
-        <nav class="card-group navbar navbar-expand-lg container-fluid">
+        <nav class="card-group navbar navbar-dark navbar-expand-lg container-fluid">
             <div class="card bg-dark">
                 <h1 class="card-header">
-                    <a href="{% url "index" %}" title="Ishar MUD">
+                    <button class="navbar-toggler navbar-dark" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+                        <span class="navbar-toggler-icon"></span>
+                    </button>
+                    <a class="collapse navbar-collapse" href="{% url "index" %}" title="Ishar MUD">
                         <img class="navbar-brand" id="logo" alt="Ishar MUD" src="{% static "images/header_alpha.png" %}" style="width: 20rem;">
                     </a>
                 </h1>
                 <div class="card-body">
-                    <button class="navbar-toggler navbar-dark" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-                        <span class="navbar-toggler-icon"></span>
-                    </button>
                     <div class="collapse bg-dark navbar-collapse" id="navbarNavDropdown">
                         <ul class="navbar-nav bg-dark">
 {% if user.is_staff %}

diff --git a/requirements.txt b/requirements.txt
@@ -1,13 +1,11 @@
 asgiref==3.7.2
-beautifulsoup4==4.12.2
 Django==4.2.6
-django-bootstrap-v5==1.0.11
 django-filter==23.3
 djangorestframework==3.14.0
 gunicorn==21.2.0
 packaging==23.2
 passlib==1.7.4
 PyMySQL==1.1.0
 pytz==2023.3.post1
-soupsieve==2.5
 sqlparse==0.4.4
+typing_extensions==4.8.0