Merge branch 'release/[email protected]'

CONTRIBUTING.md

@@ -69,6 +69,10 @@ When contributing, please follow this branch naming convention:
 
 This rule applies to all repositories.
 
+### Tags
+
+Each merge on the `master` branch that updates a **package** should be tagged by the name of the package, "@" and the version number. Ex: `[email protected]`
+
 ### Getting started
 
 From the root of the repository, run:

packages/add-manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-manifest",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "author": "Manifest",
   "description": "Add Manifest backend",
   "homepage": "https://manifest.build",

packages/add-manifest/src/commands/index.ts

@@ -94,7 +94,7 @@ export class MyCommand extends Command {
       updatePackageJsonFile({
         fileContent: packageJson,
         newPackages: {
-          manifest: '^4.1.4'
+          manifest: '^4.1.5'
         },
         newScripts: {
           manifest: 'node node_modules/manifest/scripts/watch/watch.js',

packages/core/admin/src/app/modules/layout/side-menu/side-menu.component.html

@@ -77,5 +77,26 @@
       </ul>
     </li>
   </ul>
+  <div class="ad">
+    <div class="card is-bordered is-shadowless has-background-primary">
+      <div class="card-content is-size-6">
+        <div class="content">
+          <h4 class="title is-4 has-text-light">
+            Want to shape the future of Manifest?
+          </h4>
+          <p class="subtitle is-5 has-text-light">
+            Be one of 50 developers for a quick video call and shape the product
+            with your insights!
+          </p>
+          <a
+            href="https://forms.gle/yKgUTYhuEacgx8i26"
+            target="_blank"
+            class="button is-small is-success"
+            >Get involved</a
+          >
+        </div>
+      </div>
+    </div>
+  </div>
   <app-user-menu-item></app-user-menu-item>
 </div>

packages/core/admin/src/app/modules/layout/side-menu/side-menu.component.scss

@@ -19,12 +19,14 @@
   overflow-x: hidden;
 
   @include mixins.desktop {
-    height: calc(100vh - var(--logo-height) - var(--footer-height) + 1px);
+    height: calc(
+      100vh - var(--logo-height) - var(--footer-height) + 1px - 220px
+    );
   }
 
   @include mixins.touch {
     height: calc(
-      100vh - #{all.$navbar-height-touch} - var(--footer-height) + 1px
+      100vh - #{all.$navbar-height-touch} - var(--footer-height) + 1px - 220px
     );
   }
 
@@ -107,7 +109,6 @@ app-user-menu-item {
   @include mixins.tablet {
     position: fixed;
     bottom: 0;
-    left: 0;
   }
 }
 

packages/core/admin/src/styles/components/_nav.scss

@@ -75,15 +75,14 @@ a {
   width: 100%;
 }
 
-
 li a {
-
   i + span,
   span + i {
     opacity: 1;
     visibility: visible;
-    transition: opacity $transition-duration $transition-timing .18s, visibility 0.01s linear;
-
+    transition:
+      opacity $transition-duration $transition-timing 0.18s,
+      visibility 0.01s linear;
   }
 }
 
@@ -100,9 +99,14 @@ aside .has-submenu + ul {
   }
 }
 
-app-user-menu-item {
+app-user-menu-item,
+.ad {
   background-color: $white;
 
+  @include tablet-only {
+    width: 260px;
+  }
+
   @include desktop {
     width: $aside-width-desktop;
   }
@@ -115,3 +119,17 @@ app-user-menu-item {
     width: $aside-width-fullhd;
   }
 }
+
+.ad {
+  bottom: 53px;
+  position: fixed;
+  padding: 8px;
+  background: transparent;
+
+  @include tablet-only {
+    width: 260px;
+  }
+  @include mobile {
+    width: 100%;
+  }
+}

packages/core/manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manifest",
-  "version": "4.1.4",
+  "version": "4.1.5",
   "description": "A complete backend that fits into 1 YAML file",
   "author": "Manifest",
   "license": "MIT",