Merge branch 'develop' into CD/Added-provisional-CD

Author: EncryptEx

app/static/css/custom-bootstrap.css

@@ -18,7 +18,7 @@
 
 body {
 
-    background: url("../img/background.svg") #f2ede6 center / 640px repeat;
+    background: url("../img/background.jpeg") #f2ede6 center center repeat fixed;
     font-family: ProximaNovaRegular, 'Roboto', sans-serif;
     font-size: 15px;
 }
@@ -71,7 +71,7 @@ a:hover, a:active, a:focus {
     /*-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);*/
     /*box-shadow: 0 0 10px rgba(0, 0, 0, 0.25);*/
     border: 0;
-    border-top: 5px solid #e8e2d7;
+    border-top: 5px solid #E3C3FF;
 }
 
 .btn-primary {
@@ -110,7 +110,7 @@ nav.navbar {
     /*-moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);*/
     /*box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);*/
     border: 0;
-    border-bottom: 5px solid #e8e2d7;
+    border-bottom: 5px solid #E3C3FF;
 }
 
 .table {
@@ -121,7 +121,7 @@ div.panel {
     -webkit-border-radius: 10px;
     -moz-border-radius: 10px;
     border-radius: 10px;
-    border: 5px solid #e8e2d7;
+    border: 5px solid #E3C3FF;
     z-index: 3;
 }
 
@@ -260,7 +260,7 @@ img {
     padding: 0.5em 1em;
     text-align: center;
     transition: bottom 1s;
-    background-color: #e8e2d7;
+    background-color: #E3C3FF;
     z-index:1031; /*footer was set to 1030*/
     box-shadow: 0px 15px 15px 15px black;
     color: black;

app/static/css/main.css

@@ -2,7 +2,7 @@
     -webkit-border-radius: 0;
     -moz-border-radius: 0;
     border-radius: 0;
-    background: #e8e2d7;
+    background: #E3C3FF;
     /*box-shadow: inset 0 -2px 2px rgba(0, 0, 0, 0.1);*/
     margin: 0;
     font-style: normal;

app/static/css/tabs.css

@@ -7,13 +7,18 @@
 
 {% block body %}
     <style>
-        .text-black {
-            color: black;
+        .text-white {
+            color: white;
+        }
+        .custom-a {
+            color: #E3C3FF;
+            font-weight: bold;
+            text-decoration: underline;
         }
     </style>
-    <div class="text-black">
+    <div class="text-white">
         <h1 class="text-center margin-top">YOU SHALL NOT PASS!</h1>
         <h2 class="text-center">403 Access Forbidden</h2>
-        <p class="text-center">Please <a href="{% url 'account_login' %}">log in</a> with a more <b>powerful</b> account to access this page</p>
+        <p class="text-center">Please <a class='custom-a' "{% url 'account_login' %}">log in</a> with a more <b>powerful</b> account to access this page</p>
     </div>
 {% endblock %}

app/static/img/background.jpeg

@@ -7,11 +7,11 @@
 
 {% block body %}
     <style>
-        .text-black {
-            color: black;
+        .text-white {
+            color: white;
         }
     </style>
-    <div class="text-black">
+    <div class="text-white">
         <h1 class="text-center margin-top">¯\_(ツ)_/¯</h1>
         <h2 class="text-center">404 Page not found</h2>
         <p class="text-center">This specified file was not found on this website. Please check the URL for mistakes and

app/static/img/background.svg

@@ -8,19 +8,24 @@
 
 {% block body %}
     <style>
-        .text-black {
-            color: black;
+        .text-white {
+            color: white;
+        }
+        .custom-a {
+            color: #E3C3FF;
+            font-weight: bold;
+            text-decoration: underline;
         }
     </style>
-    <div class="text-black">
+    <div class="text-white">
         <h1 class="text-center margin-top">500 Oops</h1>
         <h2 class="text-center">Server Error </h2>
         <p class="text-center">It seems like you found an error. Please reach us out
             at {{ h_contact_email|urlize }} if the problem persists.</p>
         {% if h_repo %}
             <p class="text-center">
                 Or you can open an issue
-                <a target="_blank" href="{{ h_repo }}issues/new">here</a>.
+                <a class='custom-a' target="_blank" href="{{ h_repo }}issues/new">here</a>.
             </p>
         {% endif %}
     </div>

app/templates/403.html

@@ -31,9 +31,9 @@ class VolunteerApplicationForm(_BaseApplicationForm):
     under_age = forms.TypedChoiceField(
         required=True,
         label="¿Tienes o tendrás la mayoría de edad antes de la fecha del evento?",
-        initial=False,
+        initial=True,
         coerce=lambda x: x == "True",
-        choices=((False, "No"), (True, "Sí")),
+        choices=((True, "Sí"),(False, "No")),
         widget=forms.RadioSelect,
     )
     night_shifts = forms.TypedChoiceField(
@@ -181,11 +181,11 @@ def get_bootstrap_field_info(self):
                 'margin-bottom: 1em;line-height: 1.25em;">Nosotros, Hackers at UPC, '
                 "procesamos tu información para organizar la mejor hackathon posible. "
                 "También incluirá imágenes y videos tuyos durante el evento. "
-                "Tus datos se utilizarán principalmente para admisiones. También podríamos contactarte  "
-                "(enviándote un correo electrónico) sobre otros eventos que estamos organizando y"
-                "que son de una naturaleza similar a los que previamente solicitaste. Para más"
-                "información sobre el procesamiento de tus datos personales y sobre cómo ejercer tus"
-                "derechos de acceso, rectificación, supresión, limitación, portabilidad y oposición, por"
+                "Tus datos se utilizarán principalmente para admisiones. También podríamos contactarte "
+                "(enviándote un correo electrónico) sobre otros eventos que estamos organizando y "
+                "que son de una naturaleza similar a los que previamente solicitaste. Para más "
+                "información sobre el procesamiento de tus datos personales y sobre cómo ejercer tus "
+                "derechos de acceso, rectificación, supresión, limitación, portabilidad y oposición, por "
                 "favor visita nuestra Política de Privacidad y Cookies.</p>",
             }
         return fields
@@ -226,6 +226,7 @@ class Meta(_BaseApplicationForm.Meta):
             "graduation_year": "What year will you graduate?",
             "tshirt_size": "¿Cuál es tu talla de camiseta?",
             "diet": "Restricciones alimentarias",
+            "other_diet": "Otras dietas",
             "origin": "¿Cuál es tu lugar de residencia actual?",
             "which_hack": "¿En qué ediciones de %s has participado como voluntari@?" % settings.HACKATHON_NAME,
             "attendance": "¿Qué días asistirás a HackUPC?",

app/templates/404.html

@@ -10,8 +10,8 @@ <h3>Team code</h3>
         <p>Send this to whoever you want to join this team. Remember that teams have a maximum size of {{ h_max_team }}
             hackers</p>
 
-        <p>Remember this teams are only to apply as a group to make sure your friends are accepted with you. You can change the team afterwards on the event.</p>
-        <p>When one of your teammate is accepted, any hackers <strong>will not be able to join the team</strong>.</p>
+        <p>Remember these teams are only to apply as a group to make sure your friends are accepted with you. You can change the team afterwards on the event.</p>
+        <p>When one of your teammates is accepted, any hackers <strong>will not be able to join the team</strong>.</p>
         <hr>
         <h3>Teammates ({{ teammates|length }}/{{ h_max_team }})</h3>
         <div class="table-responsive">
@@ -48,7 +48,8 @@ <h3>Teammates ({{ teammates|length }}/{{ h_max_team }})</h3>
 
     {% elif not h_app_closed and not team %}
         <p>Do you have already a team? Join it below. Otherwise you can create a new team. </p>
-        <p>This teams are only to apply as a group to make sure your friends are accepted with you. You can change the team afterwards on the event.</p>
+        <p>These teams are only to apply as a group to make sure your friends are accepted with you. You can change the team afterwards on the event.</p>
+        <p>When one of your teammates is accepted, any hackers <strong>will not be able to join the team</strong>.</p>
         <form action="" method="post" class="form">
             {% csrf_token %}
             {% bootstrap_form form %}