customizations

Green-Party-of-Canada-Members · Nov 2, 2023 · 64491c1 · 64491c1
1 parent 243e440
commit 64491c1
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 8 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - staging
   pull_request:
 
 env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - staging
   pull_request:
 
 env:

diff --git a/app/overrides/decidim/proposals/proposals/show/add_donate.html.erb.deface b/app/overrides/decidim/proposals/proposals/show/add_donate.html.erb.deface
@@ -1,4 +1,4 @@
-<!-- insert_top '.columns.section.view-side.mediumlarge-4.large-3' -->
+<!-- insert_before 'erb[loud]:contains("resource_reference(@proposal)")' -->
 
 <% if show_donate_on_proposal? %>
 	<%= render "decidim/donate" %>

diff --git a/app/overrides/layouts/decidim/_wrapper/fixed_logos.html.erb.deface b/app/overrides/layouts/decidim/_wrapper/fixed_logos.html.erb.deface
@@ -0,0 +1,8 @@
+<!-- replace '.logo-wrapper' -->
+
+<div class="logo-wrapper">
+	<%= content_tag :svg, role: "img" do
+      content_tag(:title, current_organization.name) + 
+      content_tag(:use, "", "href" => asset_pack_path("media/images/greenparty-#{locale}.svg") + "#logo")
+    end %>
+</div>
diff --git a/app/packs/images/greenparty-en.svg b/app/packs/images/greenparty-en.svg
diff --git a/app/packs/images/greenparty-fr.svg b/app/packs/images/greenparty-fr.svg
diff --git a/app/packs/stylesheets/decidim/decidim_application.scss b/app/packs/stylesheets/decidim/decidim_application.scss
@@ -6,6 +6,13 @@
 //
 // By default this is empty.
 
+.logo-wrapper {
+	> svg {
+		height: 45px;
+		width: auto;
+		fill: #3d9f3b;
+	}
+}
 .wrapper {
 	&.watch_race {
 		padding:0;

diff --git a/public/greenparty-en.svg b/public/greenparty-en.svg
diff --git a/public/greenparty-fr.svg b/public/greenparty-fr.svg
diff --git a/public/robots.txt b/public/robots.txt
@@ -1,11 +1,4 @@
 User-agent: *
-Disallow: /processes/
-Disallow: /assemblies/
-Disallow: /conferences/
-Disallow: /consultations/
-Disallow: /calendar/
-Disallow: /meetings/
 Disallow: /admin/
 Disallow: /system/
-Disallow: /pages/
 Disallow: /search
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ on: @@
       push:
         branches:
           - main
+          - staging
       pull_request:
     env:
@@ Expand Down @@