update licence url in footer

Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>

.ncignore

@@ -0,0 +1 @@
+deps

config/config.exs

@@ -13,13 +13,13 @@ config :mobilizon,
 config :mobilizon, Mobilizon.Storage.Repo, types: Mobilizon.Storage.PostgresTypes
 
 config :mobilizon, :instance,
-  name: "My Mobilizon Instance",
-  description: "Change this to a proper description of your instance",
+  name: "mobilizon du chapril",
+  description: "instance du chapril",
   hostname: "localhost",
-  registrations_open: false,
+  registrations_open: true,
   registration_email_allowlist: [],
   languages: [],
-  default_language: "en",
+  default_language: "fr",
   demo: false,
   repository: Mix.Project.config()[:source_url],
   allow_relay: true,

js/public/img/mobilizon_logo.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
+    <title>Mobilizon Logo</title>
+    <g data-name="header">
+        <path d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z" />
+        <path d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z" />
+        <path d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z" />
+        <path d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z" fill="#fff" />
+    </g>
+</svg>

js/src/assets/mobilizon_logo_original.svg

@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
+    <title>Mobilizon Logo</title>
+    <g data-name="header">
+        <path d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z" />
+        <path d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z" />
+        <path d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z" fill="#fff" />
+        <path d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z" />
+        <path d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z" fill="#fff" />
+    </g>
+</svg>

js/src/common.scss

@@ -8,24 +8,66 @@
 //   color: $violet-2;
 // }
 
+.title {
+  margin: 30px auto 45px;
+}
+
+.subtitle {
+  background: $secondary;
+  display: inline;
+  padding: 3px 8px;
+  margin: 15px auto 30px;
+}
+
+main > .container {
+  background: $whitest;
+  min-height: 70vh;
+}
+.step-content{
+  height: auto;
+}
+
+
 a.out,
 .content a,
 .ProseMirror a {
   text-decoration: underline;
-  text-decoration-color: #ed8d07;
+  text-decoration-color: $secondary;
   text-decoration-thickness: 2px;
 }
 
-// input.input {
-//   border-color: $input-border-color !important;
-// }
+main {
+  > section > .columns {
+    min-height: 50vh;
+  }
+  > section {
+    &.container {
+      min-height: 80vh;
+    }
+  }
+  > #homepage{
+    background: $whitest;
+    #featured_events{
+      background: $whitest;
+    }
+    #picture{
+      .container, .section{
+        background: $whitest;
+      }
+    }
+    > .container{
+      min-height: 25vh;
+    }
+  }
+}
 
 .section {
   padding: 1rem 1% 4rem;
+
 }
 
 figure img.is-rounded {
-  border: 1px solid #cdcaea;
+  border: 1px solid $chapril_blue;
 }
 
 $color-black: #000;
@@ -64,21 +106,22 @@ $color-black: #000;
 }
 
 body {
-  // background: #f7f8fa;
   background: $body-background-color;
   font-family: BlinkMacSystemFont, Roboto, Oxygen, Ubuntu, Cantarell, "Segoe UI",
     "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 
-  /*main {*/
-  /*  margin: 1rem auto 0;*/
-  /*}*/
 }
 
-#mobilizon > .container > .message {
-  margin: 1rem auto auto;
-  .message-header {
-    button.delete {
-      background: #4a4a4a;
+#mobilizon{
+  > main{
+    background: $body-background-color;
+  }
+  > .container > .message {
+    margin: 1rem auto auto;
+    .message-header {
+      button.delete {
+        background: $chapril_grey;
+      }
     }
   }
 }
@@ -95,7 +138,7 @@ $list-radius: $radius !default;
 
 $list-item-border: 1px solid $border !default;
 $list-item-color: $text !default;
-$list-item-active-background-color: $link !default;
+$list-item-active-background-color: $purple-1 !default;
 $list-item-active-color: $link-invert !default;
 $list-item-hover-background-color: $background !default;
 
@@ -130,12 +173,67 @@ a.list-item {
 .setting-title {
   margin-top: 2rem;
   margin-bottom: 1rem;
-
+  h1,h2,h3,h4,h5,h6{
+    background: $secondary;
+    color : $white;
+    span{
+      background: $secondary !important;
+      color : $white !important;
+    }
+  }
   h2 {
     display: inline;
-    background: $secondary;
+
     padding: 2px 7.5px;
     text-transform: uppercase;
     font-size: 1.25rem;
   }
 }
+
+.hero-body{
+  background-color: $chapril_blue_light;
+}
+
+.columns{
+  background: $whitest;
+}
+.setting-menu-item {
+  background-color: $yellow-4;
+
+  .router-link-active,
+  .router-link-active {
+    background-color: $info;
+    color: $white;
+
+    a {
+      color: $white;
+      font-weight: 600 !important;
+      text-decoration: none;
+    }
+  }
+}
+
+.date-component-container {
+  .datetime-container {
+    margin-right: 1em;
+  }
+}
+
+
+
+.time.datetime-container{
+  color: $white;
+  background: $chapril_blue_light;
+  span.month {
+    color: $whitest;
+  }
+}
+
+/**
+footer
+
+ */
+footer.footer[data-v-40ab164b] span.select select{
+  background: $chapril_blue_light;
+  color: $footer-text-color;
+}

js/src/components/Account/ProfileOnboarding.vue

@@ -40,8 +40,8 @@
           )
         }}
       </p>
-      <div class="has-text-centered">
-        <code>{{ `${currentActor.preferredUsername}@${domain}` }}</code>
+      <div class="has-text-centered has-text-primary has-background-success">
+        <pre>{{ `${currentActor.preferredUsername}@${domain}` }}</pre>
       </div>
     </div>
   </div>

js/src/components/Event/DateCalendarIcon.vue

@@ -43,13 +43,12 @@ export default class DateCalendarIcon extends Vue {
 
 <style lang="scss" scoped>
 time.datetime-container {
-  background: $backgrounds;
+  background: $chapril_blue_light;
   border: 1px solid $borders;
   border-radius: 8px;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  /*height: 50px;*/
   width: 50px;
   padding: 8px;
   text-align: center;

js/src/components/Event/EventListCard.vue

@@ -344,10 +344,39 @@ article.box {
   .list-card {
     display: flex;
     align-items: center;
+    padding: 0 1.5em;
 
     .actions {
       padding-right: 7.5px;
       cursor: pointer;
+      ul li {
+        margin: 0 auto;
+
+        .is-link {
+          cursor: pointer;
+        }
+
+        .button.is-text {
+          text-decoration: none;
+
+          ::v-deep span:first-child i.mdi::before {
+            font-size: 24px !important;
+          }
+
+          ::v-deep span:last-child {
+            padding-left: 4px;
+          }
+
+          &:hover {
+            background: #f5f5f5;
+          }
+        }
+
+        * {
+          font-size: 0.8rem;
+          color: $background-color;
+        }
+      }
     }
 
     div.content {
@@ -407,4 +436,11 @@ article.box {
   }
   padding: 0;
 }
+.content h3.event-title-card {
+  line-height: 1em;
+  margin-top: 0.5em;
+}
+.participation-actor{
+  margin-top: 1em;
+}
 </style>

js/src/components/Event/EventMetadataBlock.vue

@@ -23,7 +23,6 @@ export default class EventMetadataBlock extends Vue {
 h2 {
   font-size: 1.8rem;
   font-weight: 500;
-  color: #f7ba30;
 }
 
 div.eventMetadataBlock {

js/src/components/Footer.vue

@@ -35,14 +35,17 @@
         }}</router-link>
       </li>
       <li>
-        <router-link :to="{ name: RouteName.TERMS }">{{
-          $t("Terms")
-        }}</router-link>
+        <a href='https://www.chapril.org/Mentions-legales.html' >
+          Mentions légales
+        </a >
+      </li>
+      <li>
+        <router-link :to="{ name: RouteName.TERMS }">{{ $t("Terms") }}</router-link>
       </li>
       <li>
         <a
           hreflang="en"
-          href="https://framagit.org/framasoft/mobilizon/blob/master/LICENSE"
+          href="https://forge.april.org/Chapril/mobilizon.chapril.org-mobilizon/src/branch/chapril/LICENSE"
         >
           {{ $t("License") }}
         </a>

js/src/components/Logo.vue

@@ -1,34 +1,12 @@
 <template>
-  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 248.16 46.78">
-    <title>Mobilizon Logo</title>
-    <g data-name="header">
-      <path
-        d="M0 45.82l3.18-40.8a29.88 29.88 0 015.07-.36 27.74 27.74 0 014.95.36l4.86 17.16a92.19 92.19 0 012.34 10.08h.36a92.19 92.19 0 012.34-10.08L28 5.02a29.23 29.23 0 015-.36 29.23 29.23 0 015 .36l3.18 40.8a13.61 13.61 0 01-3.63.42 23.41 23.41 0 01-3.63-.24l-1.2-19.92q-.36-5.52-.48-12.84h-.44l-7.32 26.51a25.62 25.62 0 01-4 .3 23.36 23.36 0 01-3.84-.3L9.36 13.24H9q-.3 8.94-.48 12.84L7.26 46a22.47 22.47 0 01-3.6.24A13.75 13.75 0 010 45.82zM74 31.06q0 8-4.26 12.3a12.21 12.21 0 01-9 3.42 12.21 12.21 0 01-9-3.42q-4.26-4.26-4.26-12.3t4.24-12.31a12.21 12.21 0 019-3.42 12.21 12.21 0 019 3.42Q74 23.02 74 31.06zM60.75 20.98q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM103.2 19.75q2.7 4.11 2.7 11.28T102 42.31a13.18 13.18 0 01-10 4.11 31.41 31.41 0 01-11.34-2V2.2l.4-.45h2.76A4 4 0 0187 2.83a5.38 5.38 0 01.93 3.57v11.94a12.08 12.08 0 017.56-2.7 8.71 8.71 0 017.71 4.11zm-9.72 2a7.28 7.28 0 00-5.58 2.82v16a15 15 0 004.08.54 5.25 5.25 0 004.68-2.67q1.68-2.67 1.68-7.59 0-9.03-4.86-9.1zM121 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014 1.62A6.27 6.27 0 01121 22z"
-      />
-      <path
-        d="M119.82.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z"
-        fill="#fff"
-      />
-      <path
-        d="M139.08 40.42h2a10.23 10.23 0 01.6 3.18 9.24 9.24 0 01-.18 2.1 38.47 38.47 0 01-5.64.54q-6.48 0-6.48-7v-37l.36-.42h2.88a3.94 3.94 0 013.12 1.05 5.52 5.52 0 01.9 3.57v31.31q-.02 2.67 2.44 2.67zM155.94 22v23.94a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3V24.75q0-3.24-2.7-3.24h-.72a9.32 9.32 0 01-.3-2.58 10.7 10.7 0 01.3-2.7 39.63 39.63 0 014.38-.24h1a5.19 5.19 0 014.05 1.62 6.27 6.27 0 011.43 4.39z"
-      />
-      <path
-        d="M154.8 2.84a7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.93 7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.93z"
-        fill="#fff"
-      />
-      <path
-        d="M163.08 39.22l8.76-11.82q1.32-1.8 4.8-5.7l-.18-.3a63.09 63.09 0 01-7.74.42H163a9.79 9.79 0 01-.24-2.34 15.8 15.8 0 01.42-3.3h20.4a16.31 16.31 0 011 4.26 4.1 4.1 0 01-.78 2.34L175 34.66a64.65 64.65 0 01-4.56 5.7l.18.24q3.12-.3 5.22-.3h2.58a15.35 15.35 0 006.12-.9 9.4 9.4 0 01.72 3.12q0 3.42-4.32 3.42h-18a14.27 14.27 0 01-.9-3.93 5.08 5.08 0 011.04-2.79zM215.88 31.06q0 8-4.26 12.3a13.63 13.63 0 01-18.06 0q-4.26-4.26-4.26-12.3t4.26-12.31a13.63 13.63 0 0118.06 0q4.26 4.27 4.26 12.31zm-13.29-10.08q-5.67 0-5.67 10.08t5.67 10.08q5.67 0 5.67-10.08t-5.67-10.08zM247 25.84v13.32a11 11 0 001.2 5.64 7 7 0 01-4.41 1.56q-2.43 0-3.33-1.14a5.69 5.69 0 01-.9-3.54V27.4a7.74 7.74 0 00-.72-3.87 2.78 2.78 0 00-2.58-1.17 8.62 8.62 0 00-6.3 3v20.58a20.85 20.85 0 01-3.66.3 23 23 0 01-3.78-.3v-29.7l.42-.36h2.76q3.42 0 4.08 3.6 4.38-3.84 8.73-3.84t6.42 2.82a12.17 12.17 0 012.07 7.38z"
-      />
-      <path
-        d="M57.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84zM198.26 10.75a7.37 7.37 0 01-.6-3 7.37 7.37 0 01.6-3 8.09 8.09 0 013.87-.84 7.05 7.05 0 013.69.84 7.37 7.37 0 01.6 3 7.37 7.37 0 01-.6 3 7.46 7.46 0 01-3.87.84 6.49 6.49 0 01-3.69-.84z"
-        fill="#fff"
-      />
-    </g>
-  </svg>
+  <img src="img/pics/logo_chapril_mobilizon.png" alt="logo chapril" />
 </template>
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-property-decorator";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
+import MobilizonLogo from "../assets/logo_chapril_mobilizon.png";
 
 @Component
 export default class Logo extends Vue {

js/src/components/NavBar.vue

@@ -5,27 +5,30 @@
     :active.sync="mobileNavbarActive"
   >
     <template slot="brand">
-      <b-navbar-item
-        tag="router-link"
-        :to="{ name: RouteName.HOME }"
+      <b-navbar-item tag="router-link"
         :aria-label="$t('Home')"
-      >
-        <logo />
+                     :to="{ name: RouteName.HOME }">
+        <img
+          src="/img/long_logo_chapril_mobilizon.png"
+          alt="logo mobilizon"
+          style="width: 5em"
+        />
       </b-navbar-item>
     </template>
     <template slot="start">
-      <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
-        $t("Explore")
-      }}</b-navbar-item>
-      <b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }">{{
-        $t("My events")
-      }}</b-navbar-item>
+      <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }"
+        >{{ $t("Explore") }}
+      </b-navbar-item>
+      <b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }"
+        >{{ $t("My events") }}
+      </b-navbar-item>
       <b-navbar-item
         tag="router-link"
         :to="{ name: RouteName.MY_GROUPS }"
         v-if="config && config.features.groups"
-        >{{ $t("My groups") }}</b-navbar-item
-      >
+        >{{ $t("My groups") }}
+      </b-navbar-item>
+
       <b-navbar-item tag="span" v-if="config && config.features.eventCreation">
         <b-button
           tag="router-link"
@@ -36,6 +39,12 @@
       </b-navbar-item>
     </template>
     <template slot="end">
+      <b-navbar-item
+        href="https://www.chapril.org"
+        :aria-label="'www.chapril.org'"
+      >
+        <img src="/img/pics/logo_chapril_mobilizon.png" alt="logo chapril mobilizon" />
+      </b-navbar-item>
       <b-navbar-item tag="div">
         <search-field @navbar-search="mobileNavbarActive = false" />
       </b-navbar-item>
@@ -98,8 +107,8 @@
           v-if="currentUser.role === ICurrentUserRole.ADMINISTRATOR"
           tag="router-link"
           :to="{ name: RouteName.ADMIN_DASHBOARD }"
-          >{{ $t("Administration") }}</b-navbar-item
-        >
+          >{{ $t("Administration") }}
+        </b-navbar-item>
 
         <b-navbar-item tag="span">
           <span @click="logout">{{ $t("Log out") }}</span>

js/src/components/Utils/Subtitle.vue

@@ -17,10 +17,8 @@ h2 {
   margin: 15px 0 30px;
 
   span {
-    background: $secondary;
     display: inline;
     padding: 3px 8px;
-    color: #3a384c;
     font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
       serif;
     font-weight: 400;

js/src/variables.scss

@@ -1,7 +1,14 @@
 @import "~bulma/sass/utilities/functions.sass";
 @import "~bulma/sass/utilities/initial-variables.sass";
 @import "~bulma/sass/utilities/derived-variables.sass";
-
+// chapril colors
+$chapril_blue: #2e5281;
+$chapril_blue_light: #bcd0e5;
+$white: mix( #fff,#bcd0e5);
+$whitest:   #fff;
+$chapril_orange: #ff5e00;
+$chapril_grey: #5f5f5f;
+// other
 $bleuvert: #1e7d97;
 $jaune: #ffd599;
 $violet: #424056;
@@ -20,73 +27,74 @@ $violet-3: #3c376e;
 /**
  * Borders
  */
-$borders: #d7d6de;
-$backgrounds: #ecebf2;
+$borders: mix($chapril_blue, #d7d6de);
+$backgrounds: mix($chapril_blue, #ecebf2);
 
 /**
  * Text
  */
-$purple-1: #757199;
+$purple-1: mix($chapril_blue, #757199);
 
 /**
  * Background
  */
-$purple-2: #cdcaea;
-$purple-3: #e6e4f4;
+$purple-2: mix($chapril_blue, #cdcaea);
+$purple-3: mix($chapril_blue, #e6e4f4);
 
-$orange-2: #ed8d07;
-$orange-3: #d35204;
+$orange-2: mix($chapril_blue, #ed8d07);
+$orange-3: mix($chapril_blue, #d35204);
 
-$yellow-1: #ffd599;
-$yellow-2: #fff1de;
-$yellow-3: #fbd5cb;
-$yellow-4: #f7ba30;
+$yellow-1: mix($chapril_blue, #fff1e8);
+$yellow-2: mix($chapril_blue, #fff1de);
+$yellow-3: mix($chapril_blue, #fff8f6);
+$yellow-4: mix($chapril_blue, #b4f0ff);
 
-$primary: $bleuvert;
+$primary: $chapril_blue;
 $primary-invert: findColorInvert($primary);
-$secondary: $jaune;
+$secondary: lighten($chapril_blue, 20%);
 $secondary-invert: findColorInvert($secondary);
 
-$background-color: $violet-2;
+$background-color: mix($chapril_blue, $violet-2);
+$background-color-darker: darken($background-color,10%);
 
-$success: #0d8758;
+$success: mix($chapril_blue, #0d8758);
 $success-invert: findColorInvert($success);
-$info: #36bcd4;
+$info: mix($chapril_blue, #36bcd4);
 $info-invert: findColorInvert($info);
-$danger: #ff2e54;
+$danger: mix($chapril_blue, #ff2e54);
 $danger-invert: findColorInvert($danger);
 $link: $primary;
 $link-invert: $primary-invert;
-$text: $violet-1;
+$text: mix($chapril_blue, $violet-1);
 
 $colors: map-merge(
-  $colors,
-  (
-    "primary": (
-      $primary,
-      $primary-invert,
-    ),
-    "secondary": (
-      $secondary,
-      $secondary-invert,
-    ),
-    "success": (
-      $success,
-      $success-invert,
-    ),
-    "info": (
-      $info,
-      $info-invert,
-    ),
-    "danger": (
-      $danger,
-      $danger-invert,
-    ),
-    "link": (
-      $link,
-      $link-invert,
-    ),
-  )
+                $colors,
+                (
+                        "primary": (
+                                $primary,
+                                $primary-invert,
+                        ),
+                        "secondary": (
+                                $secondary,
+                                $secondary-invert,
+                        ),
+                        "success": (
+                                $success,
+                                $success-invert,
+                        ),
+                        "info": (
+                                $info,
+                                $info-invert,
+                        ),
+                        "danger": (
+                                $danger,
+                                $danger-invert,
+                        ),
+                        "link": (
+                                $link,
+                                $link-invert,
+                        ),
+                )
 );
 
 // Navbar
@@ -96,45 +104,30 @@ $navbar-height: 4rem;
 
 // Footer
 $footer-padding: 3rem 1.5rem 1rem;
-$footer-background-color: $background-color;
+$footer-background-color: $violet-2;
+$footer-text-color: mix( #000, $violet-2);
 
-$body-background-color: #efeef4;
+$body-background-color: mix( $chapril_blue, #efeef4);
 $fullhd-enabled: false;
 $hero-body-padding-medium: 6rem 1.5rem;
 
-main > .container {
-  background: $body-background-color;
-  min-height: 70vh;
-}
-
-$title-color: #3c376e;
+$title-color: $chapril_blue;
 $title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
-  serif;
+serif;
 $title-weight: 700;
 $title-size: 40px;
 $title-sub-size: 45px;
 $title-sup-size: 30px;
 
-$subtitle-color: #3a384c;
+$subtitle-color: $chapril_grey;
 $subtitle-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
-  serif;
+serif;
 $subtitle-weight: 400;
 $subtitle-size: 32px;
 $subtitle-sub-size: 30px;
 $subtitle-sup-size: 15px;
 
-.title {
-  margin: 30px auto 45px;
-}
-
-.subtitle {
-  background: $secondary;
-  display: inline;
-  padding: 3px 8px;
-  margin: 15px auto 30px;
-}
-
 //$input-border-color: #dbdbdb;
 $breadcrumb-item-color: $primary;
 $checkbox-background-color: #fff;
-$title-color: $violet-3;
+$title-color: $chapril_blue;

js/src/variables_original.scss

@@ -0,0 +1,140 @@
+@import "~bulma/sass/utilities/functions.sass";
+@import "~bulma/sass/utilities/initial-variables.sass";
+@import "~bulma/sass/utilities/derived-variables.sass";
+
+$bleuvert: #1e7d97;
+$jaune: #ffd599;
+$violet: #424056;
+
+/**
+ * Text body, paragraphs
+ */
+$violet-1: #3a384c;
+$violet-2: #474467;
+
+/**
+ * Titles, dark borders, buttons
+ */
+$violet-3: #3c376e;
+
+/**
+ * Borders
+ */
+$borders: #d7d6de;
+$backgrounds: #ecebf2;
+
+/**
+ * Text
+ */
+$purple-1: #757199;
+
+/**
+ * Background
+ */
+$purple-2: #cdcaea;
+$purple-3: #e6e4f4;
+
+$orange-2: #ed8d07;
+$orange-3: #d35204;
+
+$yellow-1: #ffd599;
+$yellow-2: #fff1de;
+$yellow-3: #fbd5cb;
+$yellow-4: #f7ba30;
+
+$primary: $bleuvert;
+$primary-invert: findColorInvert($primary);
+$secondary: $jaune;
+$secondary-invert: findColorInvert($secondary);
+
+$background-color: $violet-2;
+
+$success: #0d8758;
+$success-invert: findColorInvert($success);
+$info: #36bcd4;
+$info-invert: findColorInvert($info);
+$danger: #ff2e54;
+$danger-invert: findColorInvert($danger);
+$link: $primary;
+$link-invert: $primary-invert;
+$text: $violet-1;
+
+$colors: map-merge(
+  $colors,
+  (
+    "primary": (
+      $primary,
+      $primary-invert,
+    ),
+    "secondary": (
+      $secondary,
+      $secondary-invert,
+    ),
+    "success": (
+      $success,
+      $success-invert,
+    ),
+    "info": (
+      $info,
+      $info-invert,
+    ),
+    "danger": (
+      $danger,
+      $danger-invert,
+    ),
+    "link": (
+      $link,
+      $link-invert,
+    ),
+  )
+);
+
+// Navbar
+$navbar-background-color: $secondary;
+$navbar-item-color: $background-color;
+$navbar-height: 4rem;
+
+// Footer
+$footer-padding: 3rem 1.5rem 1rem;
+$footer-background-color: $background-color;
+
+$body-background-color: #efeef4;
+$fullhd-enabled: false;
+$hero-body-padding-medium: 6rem 1.5rem;
+
+main > .container {
+  background: $body-background-color;
+  min-height: 70vh;
+}
+
+$title-color: #3c376e;
+$title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
+  serif;
+$title-weight: 700;
+$title-size: 40px;
+$title-sub-size: 45px;
+$title-sup-size: 30px;
+
+$subtitle-color: #3a384c;
+$subtitle-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
+  serif;
+$subtitle-weight: 400;
+$subtitle-size: 32px;
+$subtitle-sub-size: 30px;
+$subtitle-sup-size: 15px;
+
+.title {
+  margin: 30px auto 45px;
+}
+
+.subtitle {
+  background: $secondary;
+  display: inline;
+  padding: 3px 8px;
+  margin: 15px auto 30px;
+}
+
+//$input-border-color: #dbdbdb;
+$breadcrumb-item-color: $primary;
+$checkbox-background-color: #fff;
+$title-color: $violet-3;

js/src/views/Event/Edit.vue

@@ -371,7 +371,6 @@ h2.subtitle {
   span {
     padding: 5px 7px;
     display: inline;
-    background: $secondary;
   }
 }
 

js/src/views/Group/Group.vue

@@ -841,7 +841,7 @@ div.container {
 
           .media-content {
             h2 {
-              color: #3c376e;
+
               font-family: "Liberation Sans", "Helvetica Neue", Roboto,
                 Helvetica, Arial, serif;
               font-size: 1.5rem;

js/src/views/Home.vue

@@ -18,6 +18,11 @@
             "
           />
           <p class="instance-description">{{ config.description }}</p>
+          <p class='contact contact-home'>
+            <a href='mailto:mobilizon-support@chapril.org' >
+              {{ $t("Contact") }}
+            </a >
+          </p>
           <!-- We don't invite to find other instances yet -->
           <!-- <p v-if="!config.registrationsOpen">
               {{ $t("This instance isn't opened to registrations, but you can register on other instances.") }}
@@ -540,7 +545,7 @@ export default class Home extends Vue {
 @import "~bulma/sass/utilities/mixins.sass";
 
 main > div > .container {
-  background: $white;
+  background: $whitest;
   padding: 1rem 1.5rem 3rem;
 }
 
@@ -664,7 +669,6 @@ section.hero {
   }
 
   .container.section {
-    background: $white;
 
     @include tablet {
       margin-top: -4rem;
@@ -682,8 +686,4 @@ section.hero {
     }
   }
 }
-
-#homepage {
-  background: $white;
-}
 </style>

js/src/views/Search.vue

@@ -409,6 +409,8 @@ export default class Search extends Vue {
   }
 
   get geohash(): string | undefined {
+    console.info("geohash location", this.location);
+
     if (this.location && this.location.geom) {
       const [lon, lat] = this.location.geom.split(";");
       return ngeohash.encode(lat, lon, 6);

js/src/views/User/Register.vue

@@ -292,10 +292,9 @@ export default class Register extends Vue {
 }
 
 h2.title {
-  color: $primary;
+
   font-size: 2.5rem;
   text-decoration: underline;
-  text-decoration-color: $secondary;
   display: inline;
 }
 

js/src/views/User/ResendConfirmation.vue

@@ -90,11 +90,13 @@ export default class ResendConfirmation extends Vue {
     e.preventDefault();
     this.error = false;
 
+    console.log("this.credentials.email", this.credentials.email);
+    console.log("this.email", this.email);
     try {
       await this.$apollo.mutate({
         mutation: RESEND_CONFIRMATION_EMAIL,
         variables: {
-          email: this.credentials.email,
+          email: this.credentials.email || this.email,
         },
       });
     } catch (err) {

js/src/views/User/SettingsOnboard.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="section container">
+  <div class="section container bg-white">
     <h1 class="title">{{ $t("Let's define a few settings") }}</h1>
     <b-steps v-model="realActualStepIndex" :has-navigation="false">
       <b-step-item step="1" :label="$t('Settings')">
@@ -90,6 +90,7 @@ export default class SettingsOnboard extends Vue {
 </script>
 <style scoped lang="scss">
 .section.container {
+  background: white;
   .has-text-centered.section.buttons {
     justify-content: center;
   }