Merge 8bbbbda into 6c5aff4

liqd · May 28, 2019 · a4feb4e · a4feb4e
2 parents 6c5aff4 + 8bbbbda
commit a4feb4e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/apps/partners/templates/partner_landing_page.html b/apps/partners/templates/partner_landing_page.html
@@ -6,11 +6,13 @@
 {% block super_content %}
     <div class="hero-unit" style="background-image: url({% thumbnail partner.image "1500x610" crop %});"></div>
 
+    {% if PARTNER.logo %}
     <div class="l-wrapper">
         <div class="partner__logo-box">
             <img src="{% thumbnail PARTNER.logo '0x160' %}" height="80" alt="{{ PARTNER.name }}" class="partner__logo-img" />
         </div>
     </div>
+    {% endif %}
 
     <div class="l-wrapper partner__header">
         <div class="l-col-6-0">
@@ -23,7 +25,7 @@ <h2 class="u-no-margin partner__slogan">{{ partner.slogan }}</h2>
     </div>
 
     <div class="l-wrapper">
-        <div class="l-col-9-0">
+        <div class="l-col-8-0">
             <ul class="u-list-reset">
                 {% for project in project_list %}
                     <li>
@@ -33,7 +35,7 @@ <h2 class="u-no-margin partner__slogan">{{ partner.slogan }}</h2>
             </ul>
         </div>
 
-        <aside class="l-col-3-9 aside">
+        <aside class="l-col-4-8 aside">
             <div class="aside__block">
                 <h2 class="aside__block__title heading3">{% trans 'Activity' %}</h2>
                 <div>

diff --git a/liqd_product/assets/scss/_shame.scss b/liqd_product/assets/scss/_shame.scss
@@ -51,3 +51,14 @@ input[type="search"] {
 .map-list [data-map] {
     min-height: 500px;
 }
+
+//follow dropdown overwrite so it drops on left side so doesn't go off screen
+@media screen and (max-width: $breakpoint-lg-down) {
+    .btngroup-gray {
+        .dropdown-menu {
+            right: 0 !important;
+            left: auto !important;
+            transform: translate3d(0, 25px, 0) !important;
+        }
+    }
+}
diff --git a/liqd_product/templates/header.html b/liqd_product/templates/header.html
@@ -6,17 +6,19 @@
     <div class="l-wrapper">
         <div class="platform-brand main-header__brand">
             {% spaceless %}
-                <a href="{% if PARTNER %}{% url 'partner' partner_slug=PARTNER.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if PARTNER %}<h2 class="heading--sm-margin">{{ PARTNER.name }}</h2>{% else %}Beteiligung.in{% endif %}</a>
+                <a href="{% if PARTNER %}{% url 'partner' partner_slug=PARTNER.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if PARTNER %}<h3 class="heading--sm-margin marked">{{ PARTNER.name }}</h3>{% else %}Beteiligung.in{% endif %}</a>
             {% endspaceless %}
         </div>
         <nav class="main-header__nav">
             {% if PARTNER %}
+                {% if PARTNER.logo %}
                 {% url 'partner' partner_slug=PARTNER.slug as partner_url %}
                 {% if not request.get_full_path == partner_url %}
                 <a href="{% url 'partner' partner_slug=PARTNER.slug %}" class="main-header__logo-box" rel="home">
                     <img src="{% thumbnail PARTNER.logo '0x160' %}" height="80" alt="{{ PARTNER.name }}" class="main-header__logo-img" />
                 </a>
                 {% endif %}
+                {% endif %}
             {% endif %}
             <div class="main-header__mobile-menu {% if not PARTNER %}main-header__mobile-menu--platform{% endif %} collapse" id="main-header-collapse">
                 {% if PARTNER %}

diff --git a/liqd_product/templates/header_dashboard.html b/liqd_product/templates/header_dashboard.html
@@ -6,7 +6,7 @@
     <div class="l-wrapper">
         <div class="platform-brand main-header__brand">
             {% spaceless %}
-                <a href="{% if view.organisation.partner %}{% url 'partner' partner_slug=view.organisation.partner.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if view.organisation.partner %}<h2 class="heading--sm-margin">{{ view.organisation.partner.name }}</h2>{% else %}Beteiligung.in{% endif %}</a>
+                <a href="{% if view.organisation.partner %}{% url 'partner' partner_slug=view.organisation.partner.slug %}{% else %}/{% endif %}" class="platform-brand__link">{% if view.organisation.partner %}<h3 class="heading--sm-margin">{{ view.organisation.partner.name }}</h3>{% else %}Beteiligung.in{% endif %}</a>
             {% endspaceless %}
         </div>
         <nav class="main-header__nav">