Merge pull request #521 from rl-institut/release/v1.1.0

Release/v1.1.0
rl-institut · Sep 2, 2020 · d736916 · d736916
2 parents 97678b3 + 68285f9
commit d736916
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project tries to adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.0] - 2020-09-02
+### Changed
+- legal and dgstvo links are not shown on summary page
+### Fixed
+- On some devices desktop parts were hidden 
+
 ## [1.0.3] - 2020-08-26
 ### Fixed
 - twice answers in category "me"

diff --git a/e_metrobus/__init__.py b/e_metrobus/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "1.0.3"
+__version__ = "1.1.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

diff --git a/e_metrobus/templates/includes/desktop.html b/e_metrobus/templates/includes/desktop.html
@@ -10,7 +10,7 @@ <h1 class="a-desktop a-desktop--header">{% trans 'E-MetroBus Berlin' %}</h1>
       <span class="a-desktop a-desktop--subheader">{% trans 'Elektrifizierung von Gelenkbussen im Berliner ÖPNV mit Schnellladeinfrastruktur' %}</span>
     </div>
     {% if not summary %}
-      <div class="language-flag show-for-medium a-desktop a-desktop--lang">
+      <div class="language-flag a-desktop a-desktop--lang">
         {% get_current_language as LANGUAGE_CODE %}
         {% if LANGUAGE_CODE == "de" %}
           <a href="en/?visited" data-open="language_popup">
@@ -174,7 +174,8 @@ <h2>{% trans 'Projektziele' %}</h2>
   </div>
 </section>
 
-  <section class="desktop desktop-footer show-for-medium">
+{% if not summary %}
+  <section class="desktop desktop-footer">
     <div class="grid-x align-center grid-width--medium">
       <div class="cell">
         <ul>
@@ -184,37 +185,38 @@ <h2>{% trans 'Projektziele' %}</h2>
       </div>
     </div>
   </section>
+{% endif %}
 
-  <div class="reveal" id="feedback_reveal" data-reveal>
-    <button class="close-button" data-close aria-label="Close modal" type="button">
-      <span aria-hidden="true">&times;</span>
-    </button>
-    <form method="post" class="feedback__form">
-      {% csrf_token %}
-      {{feedback}}
-      <input type="hidden" name="feedback">
-      <div class="cell feedback__btn">
-        <div class="grid-x align-center text-center">
-          <div class="cell">
-            <button class="button--yellow" type="submit" style= "cursor:pointer">{% trans 'Meinung schicken' %}</button>
-          </div>
+<div class="reveal" id="feedback_reveal" data-reveal>
+  <button class="close-button" data-close aria-label="Close modal" type="button">
+    <span aria-hidden="true">&times;</span>
+  </button>
+  <form method="post" class="feedback__form">
+    {% csrf_token %}
+    {{feedback}}
+    <input type="hidden" name="feedback">
+    <div class="cell feedback__btn">
+      <div class="grid-x align-center text-center">
+        <div class="cell">
+          <button class="button--yellow" type="submit" style= "cursor:pointer">{% trans 'Meinung schicken' %}</button>
         </div>
       </div>
-    </form>
-  </div>
+    </div>
+  </form>
+</div>
 
-  <div class="full reveal legal" id="imprint_reveal" data-reveal>
-    {% include 'includes/imprint.html' %}
-    <button class="close-button" data-close aria-label="Close modal" type="button">
-      <div class="icon"></div>
-      <span aria-hidden="true">{% trans 'Zurück zur Startseite' %}</span>
-    </button>
-  </div>
+<div class="full reveal legal" id="imprint_reveal" data-reveal>
+  {% include 'includes/imprint.html' %}
+  <button class="close-button" data-close aria-label="Close modal" type="button">
+    <div class="icon"></div>
+    <span aria-hidden="true">{% trans 'Zurück zur Startseite' %}</span>
+  </button>
+</div>
 
-  <div class="full reveal legal" id="privacy_reveal" data-reveal>
-    {% include 'includes/privacy.html' %}
-    <button class="close-button" data-close aria-label="Close modal" type="button">
-      <div class="icon"></div>
-      <span aria-hidden="true">{% trans 'Zurück zur Startseite' %}</span>
-    </button>
-  </div>
+<div class="full reveal legal" id="privacy_reveal" data-reveal>
+  {% include 'includes/privacy.html' %}
+  <button class="close-button" data-close aria-label="Close modal" type="button">
+    <div class="icon"></div>
+    <span aria-hidden="true">{% trans 'Zurück zur Startseite' %}</span>
+  </button>
+</div>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e_metrobus",
-  "version": "1.0.3",
+  "version": "1.1.0",
   "dependencies": {},
   "devDependencies": {
     "autoprefixer": "^9.4.7",