Merge 51cc205 into e127eb5

apps/cms/contacts/templates/a4_candy_cms_contacts/form_page.html

@@ -1,4 +1,4 @@
-{% extends 'base_cms.html' %}
+{% extends 'base.html' %}
 
 {% block content %}
     <div class="l-wrapper">

apps/cms/contacts/templates/a4_candy_cms_contacts/form_page_landing.html

@@ -1,4 +1,4 @@
-{% extends 'base_cms.html' %}
+{% extends 'base.html' %}
 {% load wagtailcore_tags %}
 
 {% block content %}

apps/cms/news/templates/a4_candy_cms_news/news_index_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags %}
 
 {% block title %}

apps/cms/news/templates/a4_candy_cms_news/news_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags wagtailimages_tags i18n %}
 
 {% block title %}

apps/cms/pages/templates/a4_candy_cms_pages/home_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load i18n wagtailcore_tags wagtailimages_tags %}
 
 {% block content %}

apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags %}
 
 {% block title %}{% if self.seo_title %}{{ self.seo_title }}{% else %}

apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_index_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load static wagtailcore_tags wagtailimages_tags i18n absolute_url %}
 
 {% block title %}

apps/cms/use_cases/templates/a4_candy_cms_use_cases/use_case_page.html

@@ -1,4 +1,4 @@
-{% extends "base_cms.html" %}
+{% extends "base.html" %}
 {% load wagtailcore_tags wagtailimages_tags i18n absolute_url %}
 
 {% block title %}

apps/users/templates/a4_candy_users/indicator.html

@@ -3,16 +3,16 @@
 {% if request.user.is_authenticated %}
     <div class="dropdown dropdown--right userindicator__dropdown">
         <button
-                type="button"
-                class="dropdown-toggle btn {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--align-left"
-                data-toggle="dropdown"
-                data-flip="false"
-                aria-haspopup="true"
-                aria-expanded="false"
-                id="user-actions"
+            type="button"
+            class="dropdown-toggle btn {% if ORGANISATION %}btn--bg-tertiary{% else %}btn--secondary-filled{% endif %} btn--square btn--align-left"
+            data-toggle="dropdown"
+            data-flip="false"
+            aria-haspopup="true"
+            aria-expanded="false"
+            id="user-actions"
         >
             <div class="userindicator__btn-img" style="background-image: {% if request.user.avatar %} url({{ request.user.avatar|thumbnail_url:'avatar'}}) {% else %}  url({% static 'images/avatar_00.png' %}) {% endif %}"></div>
-            <div class="userindicator__btn-text">
+            <div class="userindicator__btn-text text-left">
                 <span class="userindicator__hello">{% trans "Hello" %}</span>
                 <br>
                 <span>{{ request.user.username }}</span>
@@ -43,7 +43,7 @@
         </div>
     </div>
 {% else %}
-    <div class="navi">
+    <div class="userindicator__navi {% if ORGANISATION %}userindicator__navi--bg-tertiary{% else %}userindicator__navi--secondary{% endif %}">
         <span class="navi__item"><a href="{% url 'account_login' %}?next={{ redirect_field_value }}">{% trans "Login" %}</a></span>
             <span class="d-none d-md-inline">/</span>
         <span class="navi__item"><a href="{% url 'account_signup' %}?next={{ redirect_field_value }}">{% trans "Register" %}</a></span>

liqd_product/assets/scss/components/_main_header.scss

@@ -2,42 +2,27 @@
     min-height: 100px;
 }
 
-.main-header--cms {
-    background-color: $bg-light;
-    margin: $r-spacer $r-spacer 0 $r-spacer;
-    padding-left: 1*$r-spacer;
-
-    @media screen and (min-width: $breakpoint) {
-        padding-left: 2*$r-spacer;
-    }
+.main-header__brand {
+    font-size: $font-size-lg;
+    line-height: inherit;
+    white-space: nowrap;
+}
 
-    @media screen and (min-width: $breakpoint-xl) {
-        margin: 2*$r-spacer 2*$r-spacer 0 2*$r-spacer;
-    }
+.main-header__brand-img {
+    padding-top: 0.5 * $padding;
+    display: block;
+    height: 2rem;
+    width: auto;
 }
 
 .main-header__nav {
     clear: left;
 }
 
-.main-header__logo-box {
-    display: inline-block;
-    margin-right: $spacer;
-    margin-bottom: -2em;
-    padding: $padding;
-    vertical-align: middle;
-
-    background-color: $body-bg;
-    z-index: 1;
-    position: relative;
-
-    box-shadow: 0 0 8px 0 $shadow;
-}
-
-.main-header__logo-img {
-    display: block;
-    height: 2rem;
-    width: auto;
+.main-header__lang {
+    position: absolute;
+    right: 50px;
+    top: 0;
 }
 
 .main-header__mobile-menu {
@@ -112,51 +97,20 @@
     background-color: mix($brand-secondary, $body-bg, 50%);
 }
 
-.main-header__organisation-nav {
-    list-style: none;
-    padding: 0;
-    margin: 0;
-
-    @media screen and (min-width: $breakpoint) {
-        display: inline-block;
-    }
-}
-
-.main-header__organisation-nav__item {
-    display: block;
-
-    .is-active {
-        padding-bottom: 0.1em;
-        border-bottom: 0.2em solid $brand-primary;
-    }
-}
-
-.main-header__lang {
-    position: absolute;
-    right: 50px;
-}
-
-.main-header__lang--org {
-    top: 0;
-}
-
-.main-header__lang--cms {
-    top: 1.5*$r-spacer;
-}
-
 @media screen and (min-width: $breakpoint-xs) {
     .main-header__lang {
         right: 100px;
     }
 }
 
 @media screen and (min-width: $breakpoint) {
-    .main-header__logo-img {
+    .main-header__brand-img {
         height: 3rem;
     }
 
-    .main-header__organisation-nav {
-        line-height: 4em;
+    .main-header__lang {
+        right: 250px;
+        top: 0.5*$r-spacer;
     }
 
     .main-header__mobile-menu {
@@ -170,7 +124,7 @@
             display: inline-block;
         }
 
-        .main-header__organisation-nav__link {
+        .organisation-header__nav-link {
             display: inline;
         }
     }
@@ -179,56 +133,22 @@
         display: none;
     }
 
-    .main-header__organisation-nav__item {
-        display: inline;
-        margin-right: $spacer;
-    }
-
-    .main-header__organisation-nav__link:first-child {
-        padding-left: 0;
-    }
-
-    .main-header__user--org {
+    .main-header__user {
         position: absolute;
         top: 0;
         right: 0;
     }
-
-    .main-header__user--cms {
-        position: absolute;
-        top: 1.5*$r-spacer;
-        right: 0;
-    }
-
-    .main-header__lang--org {
-        right: 250px;
-        top: 0.5*$r-spacer;
-    }
-
-    .main-header__lang--cms {
-        right: 300px;
-        top: 2.5*$r-spacer;
-    }
 }
 
 @media screen and (min-width: $breakpoint-xl) {
     .main-header__lang {
         right: 350px;
     }
-
-    .main-header__lang--cms {
-        top: 3.5*$r-spacer;
-    }
-
-    .main-header__user--cms {
-        top: 2.5*$r-spacer;
-    }
 }
 
-.main-header__user {
-    @media screen and (max-width: $breakpoint-down) {
-        // overwrite dropdown style on mobile
-
+// overwrite dropdown style on mobile
+@media screen and (max-width: $breakpoint-down) {
+    .main-header__user {
         .dropdown {
             margin-bottom: 0;
         }

liqd_product/assets/scss/components/_navi.scss

@@ -16,10 +16,3 @@
         display: inline-block;
     }
 }
-
-.main-header--cms {
-    .navi {
-        margin-top: $r-spacer;
-        margin-right: 3.5*$r-spacer;
-    }
-}

liqd_product/assets/scss/components/_organisation_header.scss

@@ -0,0 +1,54 @@
+.organisation-header__logo-box {
+    display: inline-block;
+    margin-right: $spacer;
+    margin-bottom: -2em;
+    padding: $padding;
+    vertical-align: middle;
+
+    background-color: $body-bg;
+    z-index: 1;
+    position: relative;
+
+    box-shadow: 0 0 8px 0 $shadow;
+}
+
+.organisation-header__logo-img {
+    display: block;
+    height: 2rem;
+    width: auto;
+}
+
+.organisation-header__nav {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+}
+
+.organisation-header__nav-item {
+    display: block;
+
+    .is-active {
+        padding-bottom: 0.1em;
+        border-bottom: 0.2em solid $brand-primary;
+    }
+}
+
+@media screen and (min-width: $breakpoint) {
+    .organisation-header__logo-img {
+        height: 3rem;
+    }
+
+    .organisation-header__nav {
+        line-height: 4em;
+        display: inline-block;
+    }
+
+    .organisation-header__nav-item {
+        display: inline;
+        margin-right: $spacer;
+    }
+
+    .organisation-header__nav-link:first-child {
+        padding-left: 0;
+    }
+}

liqd_product/assets/scss/components/_userindicator.scss

@@ -48,3 +48,17 @@
     background-color: $brand-secondary;
     color: contrast-color($brand-secondary);
 }
+
+.userindicator__navi {
+    @media screen and (min-width: $breakpoint) {
+        padding: 0.5*$r-spacer $r-spacer 0.5*$r-spacer $r-spacer;
+    }
+}
+
+.userindicator__navi--bg-tertiary {
+    background-color: $bg-tertiary;
+}
+
+.userindicator__navi--secondary {
+    background-color: $brand-secondary;
+}

liqd_product/assets/scss/style.scss

@@ -59,9 +59,9 @@
 @import 'components/multiform';
 @import 'components/navi';
 @import 'components/organisation';
+@import 'components/organisation_header';
 @import 'components/pagination';
 @import 'components/participation-tile';
-@import 'components/platform_brand';
 @import 'components/poll';
 @import 'components/progress';
 @import 'components/project_header';

liqd_product/templates/500.html

@@ -12,8 +12,8 @@
         <header class="main-header" aria-label="Header">
             <div class="u-page-ribbon u-page-ribbon--platform"></div>
             <div class="container">
-                <div class="navbar-brand main-header__brand">
-                    <a href="/" class="platform-brand__link">adhocracy+</a>
+                <div class="main-header__brand">
+                    <a href="/">adhocracy+</a>
                 </div>
             </div>
         </header>