Explorar el Código

style with gernot color

Juan Carlos hace 5 años
padre
commit
82a4fe059d

+ 2 - 1
marktplatz/forms.py

@@ -6,6 +6,7 @@ from django.contrib.auth.forms import UserCreationForm
 from django_file_form.forms import UploadedFileField, FileFormMixin, CharField, MultipleUploadedFileField
 from django.contrib.auth.models import User
 from crispy_forms.helper import FormHelper
+# from crispy_forms.layout.buttons import Submit, InputButton
 from crispy_forms.layout import Layout, Field, Fieldset, Div, Row, Column, HTML, ButtonHolder, Submit
 from crispy_forms.bootstrap import InlineField
 from django.forms.models import inlineformset_factory
@@ -42,7 +43,7 @@ class textSearchForm(forms.Form):
                Div('searchText',  css_class='col-sm-6 col-6'),
                Div(
                    ButtonHolder(
-                       Submit('submit', 'Submit', css_class='btn border-thin border-dark rounded-0 mybtn')
+                       Submit('submit', 'Suche', css_class='border-thin border-dark rounded-0 mybtn')
                    ),
                css_class='col-sm-6 col-6'),
                css_class='form-row  row'),

+ 1 - 1
marktplatz/models.py

@@ -82,7 +82,7 @@ class Product(models.Model):
     ]
 
     FREI = [
-        ('JAJA', 'Ja, bitte melden'),
+        ('JAJA', 'Platz frei'),
         ('WART', 'Nein, aber es gibt eine Warteliste'),
         ('NEIN', 'Nein und es gibt keine Warteliste'),
     ]

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 4
marktplatz/static/css/bootstrap.min.css


+ 27 - 9
marktplatz/static/css/styles.css

@@ -133,7 +133,7 @@ input[type='checkbox'].check:checked {
 
 
 a {
-    color: black !important;
+    color: #AB5120 !important;
 }
 
 .boldkur {
@@ -220,23 +220,40 @@ img.vote {
     border-color: blue;
 }
 
+.mab-menu-elm{
+
+  color: #AB5120;
+  font-weight: bold;
+}
+
+.mab-menu-elm a{
+
+  color: #AB5120 !important;
+  font-weight: bold;
+}
+
 .border-thin{
     border-style: solid;
     border-width: 2px;
-    border-color: black;
+    border-color: #AB5120;
+    color: #AB5120;
+    background-color: #FFF;
     border-radius: 0;
     padding-bottom: 0px;
     margin: 0px;
     margin-right:1px ;
     margin-top: 2px;
-
     line-height: 20px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+    padding-right: 4px;
+    padding-left: 4px;
+    height: auto;
+}
 
+.gemain-color {
 
-    padding-top: 1px;
-    padding-bottom: 0px;
-    padding-right: 2px;
-    padding-left: 2px;
+  color: #AB5120;
 
 }
 
@@ -264,9 +281,10 @@ img.vote {
 }
 
 
-.mybtn {
-    color: black;
+.btn-primary {
+    color: #AB5120;
     background-color: white;
+    border-color: #AB5120 !important;
 }
 
 

+ 5 - 5
marktplatz/templates/marktplatz/product_detail.html

@@ -52,11 +52,11 @@
 <!-- <hr style="color: black; background-color: black; margin-top: 0px; width: 130%; display: flex; margin-left: -20px; margin-right:20px "> -->
 
 <div class="container " style="">
-		<div class="row">
+		<div class="row gemain-color">
 				<div class="col-sm-6">
 
 
-					<h2 class="titlepro" style="margin-top: 7px;color: black; font-weight: bold">{{ product.name }}
+					<h2 class="titlepro" style="margin-top: 7px;color: font-weight: bold">{{ product.name }}
 					      <small class="text-muted">{% if product.year %} {{ product.year }}, {% endif %}  {% for country in product.country %} {{ country.name }}, {% endfor %} {% if product.city %} {{ product.city }} {% endif %}</small>
 					</h2>
 
@@ -150,7 +150,7 @@
 
 
 					<br />
-					<h5 class="black mediumkur">Steckbrief</h5>
+					<h5 class=" mediumkur">Steckbrief</h5>
 					<br />
 
 					<p>{{ product.wohnprojekt.kind_of_product }}, gegründet {{ product.wohnprojekt.gruendungsjahr }}, in Betrieb genommen: {{ product.wohnprojekt.betriebgenommen }}.</p>
@@ -171,7 +171,7 @@
 
 
 					<br />
-					<h5 class="black mediumkur">Kenndaten</h5>
+					<h5 class=" mediumkur">Kenndaten</h5>
 					<br />
 
 					<p>{{ product.wohnprojekt.get_altneu_display }}, {{ product.wohnprojekt.bauweise }}</p>
@@ -193,7 +193,7 @@
 			    <p>{% if product.wohnprojekt.kraumangebot  %}{% field_name product.wohnprojekt 'kraumangebot' %}: {{ product.wohnprojekt.kraumangebot }}{% endif %}</p>
 
 					<br />
-					<h5 class="black mediumkur">Kontakt</h5>
+					<h5 class=" mediumkur">Kontakt</h5>
 					<br />
 
 					<p>{{ product.wohnprojekt.adresse }}, {{ product.wohnprojekt.get_ort_display }}</p>

+ 1 - 1
marktplatz/templates/marktplatz/product_overview.html

@@ -149,7 +149,7 @@ $(document).ready(function(){
     position: absolute;
     bottom: 8px;
     left: 16px;
-    color: white;
+    color: #AB5120;
     font-size: large;
     font-weight: bold;
     text-align: left;

+ 12 - 9
project_base/templates/base_generic.html

@@ -33,7 +33,8 @@
         	z-index: 2;
         	background-color: #FCFCFC;
         	padding-right: 15px;
-          box-shadow: 0 8px 4px -6px gray;
+          border-bottom: 1px solid #AB5120;
+          /* box-shadow: 0 8px 4px -6px gray; */
       }
 
       .cursor-pointer {
@@ -105,29 +106,31 @@
           <img src="{% static 'newMAB.png' %}" alt="MAB20" height="40px" width="auto" style="margin: auto; padding-bottom: 2px">
         </a>
 
-        <button class="navbar-toggler" type="button " data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler gemain-color" type="button " data-toggle="collapse" data-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span> ⋁
         </button>
         <div class="collapse navbar-collapse" id="navbarNavAltMarkup">
 
           <div class="navbar-nav navbar-right">
-            <a class="nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'products' %}">MARKTPLATZ</a>
-            <a class="nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'submit' %}">EINREICHEN</a>
+            <a class="nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'products' %}">MARKTPLATZ</a>
+            <a class="nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'submit' %}">EINREICHEN</a>
 
-            <a class=" nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'about' %}">ÜBER UNS</a>
+            <a class=" nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'about' %}">ÜBER UNS</a>
             {% if not user.is_authenticated %}
-            <a class=" nav-link active nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'login' %}">EINLOGGEN</a>
+            <a class=" nav-link active nav-right boldkur mab-menu-elm" style="" href="{% url 'login' %}">EINLOGGEN</a>
             {% endif %}
 
             {% if user.is_authenticated %}
-            <a class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'new-submit-view'%}?">PROJEKT EINREICHEN</a>
-            <a class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'my-products'%}">MEINE PROJEKTE</a>
-            <a class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'logout'%}?next={{request.path}}">AUSLOGGEN</a>
+            <a class="nav-link nav-right boldkur mab-menu-elm" style="" href="{% url 'new-submit-view'%}?">PROJEKT EINREICHEN</a>
+            <a class="nav-link nav-right boldkur mab-menu-elm" style="" href="{% url 'my-products'%}">MEINE PROJEKTE</a>
+            <a class="nav-link nav-right boldkur mab-menu-elm" style="" href="{% url 'logout'%}?next={{request.path}}">AUSLOGGEN</a>
             {% endif %}
 
           </div>
         </div>
       </div>
+      <hr>
+      <br>
     </nav>
     {% endblock %}
     {% endif %}

+ 1 - 1
requirements.txt

@@ -5,7 +5,7 @@ django-smtp-ssl==1.0
 django-imagekit==4.0.2
 mysqlclient==1.3.13
 django-file-form==0.5.0
-django-crispy-forms==1.7.2
+django-crispy-forms==1.9.2
 django-constance[database]==2.6.0
 django-picklefield==2.1.1
 django-countries==5.5

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio