unify styling #2

wurstbroteater · Jul 19, 2024 · 395ad5f · 395ad5f
1 parent ca88507
commit 395ad5f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 31 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -19,7 +19,7 @@
             display: inline-block;
             padding: 10px 15px;
             background-color: #13A256;
-            color: #fff;
+            color: #F0F0F0;
             text-decoration: none;
             border: none;
             border-radius: 5px;
@@ -53,7 +53,7 @@
             border-color: #0E753E;
         }
 
-        input[type=text], input[type=password], textarea {
+        input[type=text], input[type=password], textarea, select {
             display: inline-block;
             padding: 10px 15px;
             margin-bottom: 15px;
@@ -65,7 +65,7 @@
             box-sizing: border-box; /* Ensures padding doesn't affect width */
         }
 
-        input[type=text]:focus, input[type=password]:focus, textarea:focus {
+        input[type=text]:focus, input[type=password]:focus, textarea:focus,  select:focus  {
             border-color: #0E753E;
             outline: none;
         }

diff --git a/templates/base_highlighting.html → templates/quiz/base_highlighting.html b/templates/base_highlighting.html → templates/quiz/base_highlighting.html
@@ -9,39 +9,18 @@
         label {
             display: block;
             margin-bottom: 5px;
-            color: #ffffff;
+            color: #F0F0F0;
             font-size: 15px;
         }
 
-        select {
-            display: inline-block;
-            padding: 10px 15px;
-            background-color: #fff;
-            color: #333;
-            border: 1px solid #ccc;
-            border-radius: 5px;
-            transition: border-color 0.3s ease;
-            box-sizing: border-box;
-            font-size: 15px;
-        }
-
-        /* Styling the select element to affect options */
-        select:focus {
-            border-color: #13A256;
-            outline: none;
-        }
-
         .fill-in-area-marker {
             font-weight: bold;
             color: black;
         }
-
-        /* Used in detail.html */
-        .choice-text {
-            font-weight: bold;
-            color: #ffc66d;
-        }
     </style>
+    {% block extendHighlightingHeader %}
+    {% endblock %}
+
 {% endblock %}
 
 {% block menu_after_report_problem %}

diff --git a/templates/quiz/detail.html b/templates/quiz/detail.html
@@ -1,7 +1,22 @@
-{% extends "quiz/../base_highlighting.html" %}
+{% extends "quiz/base_highlighting.html" %}
 
 {% block title %}Question Detail{% endblock %}
 
+{% block extendHighlightingHeader %}
+    <style>
+        .choice-symbol {
+            font-weight: bold;
+            color: #13A256;
+        }
+
+        .choice-text {
+            font-weight: bold;
+            color: #F0F0F0;
+
+        }
+    </style>
+{% endblock %}
+
 {% block highlight_content %}
     <h1>Question {{ question.id }}</h1>
     <h2>{{ question.question }}</h2>
@@ -15,7 +30,8 @@ <h2>{{ question.question }}</h2>
 
     <ul>
         {% for choice in question.choice_set.all %}
-            <li><span class="choice-text">{{ choice.choice_text }}</span></li>
+            <li><span class="choice-symbol">{{ choice.answer_symbol }}</span> : <span
+                    class="choice-text">{{ choice.choice_text }}</span></li>
         {% endfor %}
     </ul>
     <p>The question was submitted on {{ question.submit_date }}</p>

diff --git a/templates/quiz/question.html b/templates/quiz/question.html
@@ -1,4 +1,4 @@
-{% extends "quiz/../base_highlighting.html" %}
+{% extends "quiz/base_highlighting.html" %}
 
 {% block title %}Question {{ question.id }}{% endblock %}