[8022] change platform styling

adhocracy-plus/assets/scss/_fonts.scss

@@ -1,46 +1,30 @@
 @font-face {
-    font-family: "SourceSerifPro";
-    src: url("../fonts/SourceSerifPro-Regular.otf");
+    font-family: "Cabin";
+    src: url("../fonts/Cabin-Regular.woff2");
     font-style: normal;
     font-weight: 400;
     font-display: swap;
 }
 
 @font-face {
-    font-family: "SourceSerifPro";
-    src: url("../fonts/SourceSerifPro-It.otf");
+    font-family: "Cabin";
+    src: url("../fonts/Cabin-Italic.woff2");
     font-style: italic;
     font-weight: 400;
     font-display: swap;
 }
 
 @font-face {
-    font-family: "SourceSansPro";
-    src: url("../fonts/SourceSansPro-Regular.otf");
-    font-style: normal;
-    font-weight: 400;
-    font-display: swap;
-}
-
-@font-face {
-    font-family: "SourceSansPro";
-    src: url("../fonts/SourceSansPro-It.otf");
-    font-style: italic;
-    font-weight: 400;
-    font-display: swap;
-}
-
-@font-face {
-    font-family: "SourceSansPro";
-    src: url("../fonts/SourceSansPro-Semibold.otf");
+    font-family: "Cabin";
+    src: url("../fonts/Cabin-SemiBold.woff2");
     font-style: normal;
     font-weight: 600;
     font-display: swap;
 }
 
 @font-face {
-    font-family: "SourceSansPro";
-    src: url("../fonts/SourceSansPro-Bold.otf");
+    font-family: "Cabin";
+    src: url("../fonts/Cabin-Bold.woff2");
     font-style: normal;
     font-weight: 900;
     font-display: swap;

adhocracy-plus/assets/scss/_utility.scss

@@ -108,7 +108,7 @@
 }
 
 .u-page-ribbon {
-    background: linear-gradient(to right, $brand-primary, $brand-primary 33%, $brand-secondary 66%, $brand-secondary);
+    background: $brand-primary;
     height: 0.5em;
 }
 

adhocracy-plus/assets/scss/_variables.scss

@@ -1,9 +1,9 @@
 // subset of bootstrap variables
-$brand-primary: #2d40cc; // ultramarine
+$brand-primary: lighten(#d60456, 3%); // purpur
 
-$brand-secondary: #90efe4 !default; // terquoise
+$brand-secondary: $brand-primary !default; // purpur
 
-$brand-tertiary: #008dc5 !default; // prussian blue
+$brand-tertiary: $brand-primary !default; // prussian blue
 
 /* Don't use variables but hex-values here as they should not be overwritten on organisation pages */
 $brand-success: #a3ef90 !default;
@@ -42,7 +42,7 @@ $print-link: #005cb4 !default;
 
 $brand-primary-tint: lighten($brand-primary, 47%) !default;
 $brand-secondary-tint: lighten($brand-secondary, 20%) !default;
-$brand-tertiary-tint: lighten($brand-tertiary, 55%) !default;
+$brand-tertiary-tint: lighten($brand-tertiary, 50%) !default;
 
 $bg-light: #f7f7f7;
 $bg-tertiary: $brand-tertiary-tint !default;
@@ -61,8 +61,8 @@ $feedback-color-accepted: #0a820a !default;
 $feedback-color-rejected: #dc3818 !default;
 $feedback-color-consideration: #ffae00 !default;
 
-$font-family-base: "SourceSansPro", sans-serif !default;
-$font-family-serif: "SourceSerifPro", serif !default;
+$font-family-base: "Cabin", sans-serif !default;
+$font-family-serif: "Cabin", sans-serif !default;
 
 $font-size-xxxl: 2.5rem !default; //40px
 $font-size-xxl: 2rem !default; // 32px

adhocracy-plus/assets/scss/components/_footer.scss

@@ -16,6 +16,12 @@
 
 .footer__description {
     font-family: $font-family-serif;
+
+    img {
+        vertical-align: bottom;
+        width: 2rem;
+        height: 1.5rem;
+    }
 }
 
 .footer__no-banner > .row {

adhocracy-plus/assets/scss/components/_header_upper.scss

@@ -59,6 +59,10 @@
 
 @media screen and (min-width: $breakpoint) {
     .header-upper__brand-img {
-        height: 2.5rem;
+        height: 3.0rem;
+    }
+
+    .header-upper__nav {
+        min-height: 3.5rem;
     }
 }

adhocracy-plus/templates/footer.html

@@ -7,7 +7,7 @@
         <div class="row mt-3 mb-2 justify-content-lg-center">
             <div class="col-lg-6">
                 <p class="footer__description">
-                    {% blocktranslate with platformname=settings.a4_candy_cms_settings.OrganisationSettings.platform_name %}<a href="/">{{ platformname }}</a> is a platform provided by <a href="https://liqd.net/de/">Liquid Democracy e.V.</a> in Berlin.{% endblocktranslate %} {% if ORGANISATION %}{% blocktranslate %}Only the respective operator of the offer is responsible for the editorial content.{% endblocktranslate %}{% endif %}
+                <a href="/"><img src={% static 'images/logo_plain.svg' %} alt="kfd" /></a>{% blocktranslate %} is a platform provided by <a href="https://liqd.net/de/">Liquid Democracy e.V.</a> in Berlin.{% endblocktranslate %} {% if ORGANISATION %}{% blocktranslate %}Only the respective operator of the offer is responsible for the editorial content.{% endblocktranslate %}{% endif %}
                 </p>
             </div>
             <div class="col-lg-6">

apps/organisations/views.py

@@ -132,7 +132,6 @@ def get_success_url(self):
 class DashboardCommunicationProjectChoiceView(
     a4dashboard_mixins.DashboardBaseMixin, generic.FormView
 ):
-
     menu_item = "communication"
     form_class = forms.CommunicationProjectChoiceForm
     permission_required = "a4_candy_organisations.change_organisation"
@@ -178,7 +177,6 @@ def get_context_data(self, **kwargs):
 class DashboardCommunicationContentCreateView(
     a4dashboard_mixins.DashboardBaseMixin, generic.FormView
 ):
-
     menu_item = "communication"
     form_class = forms.CommunicationContentCreationForm
     permission_required = "a4_candy_organisations.change_organisation"
@@ -273,14 +271,14 @@ def generate_image(self, data):
         font = ImageFont.truetype(
             os.path.join(
                 settings.BASE_DIR,
-                "adhocracy-plus/assets/fonts/SourceSansPro-Semibold.otf",
+                "adhocracy-plus/assets/fonts/Cabin-SemiBold.woff2",
             ),
             sharepic_format["title_size"],
         )
         fontsm = ImageFont.truetype(
             os.path.join(
                 settings.BASE_DIR,
-                "adhocracy-plus/assets/fonts/SourceSansPro-Regular.otf",
+                "adhocracy-plus/assets/fonts/Cabin-Regular.woff2",
             ),
             sharepic_format["description_size"],
         )

changelog/8022.md

@@ -0,0 +1,5 @@
+### Changed
+
+- change font to Cabin
+- change logo to kfd logo
+- change brand colors to kfd ci