conflict files removed

src/menu.pug.orig

-nav#navbar
-  sib-router#navbar-router(default-route='members')
-    sib-route.menu(name='members')
-      div.menu-notification
-        div 1
-      div.menu-label Members
-      div.menu-icon.icon-people
-    sib-route.menu(hidden, name='member', id-prefix=`${sdn}/members/`)
-    div.divider
-    sib-route.menu(name='job-offers')
-      div.menu-notification
-        div 2
-      div.menu-label Job offers
-      div.menu-icon.icon-briefcase
-    sib-route(hidden, name='job-offer-create')
-    div.divider
-    div.menu-wrapper
-      div.menu
-        div.menu-chevron
-          div.menu-icon.icon-arrow-down
-        div.menu-label Projects
-        div.menu-icon.icon-folder-alt
-      sib-route(hidden,name='project', id-prefix=`${sdn}/projects/`)
-      div.sub-menu
-        sib-display(
-          data-src=`${sdn}/projects/`,
-          data-fields='name',
-          next='project'
-        )
-    div.divider
-    div.menu-wrapper
-      div.menu
-        div.menu-chevron
-          div.menu-icon.icon-arrow-down
-        div.menu-label Groups
-        div.menu-icon.icon-globe
-      sib-route(hidden, name='group', id-prefix=`${sdn}/channels/`)
-      div.sub-menu
-        sib-display(
-          data-src=`${sdn}/channels/`,
-          data-fields='name',
-          next='group'
-        )
-    div.divider
-    div.menu-wrapper
-      div.menu
-        div.menu-chevron
-          div.menu-icon.icon-arrow-down
-        div.menu-label Chat
-        div.menu-icon.icon-envelope-letter
-      sib-route(hidden, name='chat', id-prefix=`${sdn}/users/`)
-      div.sub-menu
-        sib-display(
-<<<<<<< HEAD
-          data-src=`${sdn}/members/`,
-          data-fields='pseudo',
-=======
-          data-src=`${sdn}/users/`,
-          data-fields='username',
->>>>>>> 627b84b... wip
-          next='chat'
-        )
-    div.divider

src/styles/main.scss.orig

-@import 'variables';
-
-[hidden] {
-  display: none !important;
-}
-
-*,
-*::after,
-*::before {
-  //  box-sizing: inherit;
-}
-
-html {
-  //box-sizing: border-box;
-  font-family: Open Sans, sans-serif;
-  font-size: 13px;
-  background-color: $color-grey-light;
-  color: $color-grey;
-}
-// body {
-//   height: 100%;
-//   display:flex;
-//   flex-direction: column;
-// }
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  color: $color-black;
-  font-weight: 600;
-  padding: 0;
-  margin: 0.67em 0;
-
-  span {
-    font-weight: 400;
-    padding-left: 0.5em;
-
-    &:before {
-      content: '// ';
-    }
-  }
-}
-
-h1 {
-  font-size: 1.24em;
-}
-
-h2 {
-  font-size: 20px;
-}
-
-h3 {
-  font-size: 20px;
-}
-
-h4 {
-  font-size: 0.68em;
-}
-
-input, select {
-  -webkit-appearance: none;
-  -moz-appearance: none;
-}
-
-.debug {
-  outline: 2px dotted red;
-}
-
-.frame {
-  @extend %frame;
-  padding: 1em;
-}
-
-.menu-notification {
-  //flex-basis: 3em;
-  align-items: center;
-  display: flex;
-  flex-direction: column;
-  flex-grow: 0;
-  flex-shrink: 0;
-  justify-content: center;
-  width: 2em;
-
-  > div {
-    align-items: center;
-    background-color: $color-yellow-light;
-    border-radius: 100%;
-    color: $color-black;
-    display: flex;
-    font-size: 12px;
-    height: 1.7em;
-    justify-content: center;
-    width: 1.7em;
-  }
-}
-
-.layer {
-  position: absolute;
-  bottom: 0;
-  top: 0;
-  right: 0;
-  left: 0;
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  overflow-x: hidden;
-}
-
-#subContainer {
-  display: flex;
-  flex-grow: 1;
-  align-items: stretch;
-  overflow: hidden;
-}
-
-#mainContainer {
-  flex-grow: 1;
-  flex-shrink: 1;
-  overflow-y: auto;
-}
-
-.limiter {
-  display: block;
-  max-width: 650px;
-}
-/* sub menu (right menu) */
-#mainContainer {
-  display: flex;
-  > div {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: row-reverse;
-    align-items: stretch;
-
-    > sib-router {
-      font-family: monospace;
-      color: $color-black;
-      background-color: $color-grey-light2;
-      display: flex;
-      flex-direction: column;
-
-      sib-route {
-        cursor: pointer;
-
-        > div {
-          position: relative;
-          padding: 1.5em 3em;
-          border-bottom: 1px solid $color-grey;
-        }
-
-        &:hover {
-          background-color: $color-grey;
-        }
-
-        &[active] {
-          font-weight: bold;
-          background-color: $color-black;
-          color: $color-yellow;
-
-          > div:before {
-            opacity: 1;
-            transform: translateX(-150%);
-            transition: 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-          }
-        }
-
-        > div {
-          @include icon(arrow-left);
-
-          &:before {
-            position: absolute;
-            transform: translateX(-50%);
-            opacity: 0;
-          }
-        }
-      }
-    }
-
-    > div {
-      //display: flex;
-      //margin: 2.6em;
-      padding:2.6em;
-      //flex: 1 1 0;
-      flex-grow: 1;
-    }
-  }
-}
-
-#search-bar > div {
-  position: relative;
-}
-
-#search-icon {
-  -webkit-text-stroke: 1px $color-grey-light4;
-  color: $color-grey-light4;
-  pointer-events: none;
-}
-
-#close-search-icon,
-#search-icon {
-  position: absolute;
-  right: 0.8em;
-  top: 50%;
-  transform: translateY(-50%);
-  margin: auto;
-  display: block;
-  font-size: 1.2em;
-}
-
-#search-input {
-  -webkit-appearance: textfield;
-  border-radius: 10em;
-  padding: 0.4em 0.8em;
-  border: 1px solid $color-grey-light4;
-  height: 2.8rem;
-  width: 22rem;
-
-  & ~ #close-search-icon {
-    opacity: 0;
-  }
-
-  &:focus {
-    & ~ #close-search-icon {
-      opacity: 1;
-    }
-
-    & ~ #search-icon {
-      visibility: hidden;
-    }
-  }
-}
-
-sib-route,
-sib-trigger {
-  cursor: pointer;
-}
-
-sib-trigger.back {
-  display: block;
-  @include icon('arrow-left');
-  @extend h1;
-}
-
-.containerH {
-  display: flex;
-  flex-wrap: wrap;
-}
-
-.containerV {
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-}
-
-.grow {
-  flex-grow: 1;
-  flex-shrink: 1;
-}
-
-.fix {
-  flex-grow: 0;
-  flex-shrink: 0;
-}
-
-.containerCenter {
-  justify-content: center;
-  align-items: center;
-}
-
-.reverse {
-  flex-direction: row-reverse;
-}
-
-
-.scrollY {
-  overflow-y: auto;
-}
-
-.grid-layer{
-  display: grid;
-<<<<<<< HEAD
-  grid-template-columns: [start]auto[middle]25%[end];
-  grid-template-rows: [start]10em[middle]auto[end];
-}
-.grid-layer-main{
-  background: green;
-=======
-  font-size: 16px;
-  grid-template-columns: [start]auto[middle]25%[end];
-  grid-template-rows: [start]13em[middle]auto[end];
-}
-.grid-layer-main {
->>>>>>> gm-job-offers
-  grid-column-start: start;
-  grid-column-end: end;
-  grid-row-start: start;
-  grid-row-end: end;
-}
-<<<<<<< HEAD
-.grid-layer-links{
-  background: pink;
-=======
-.grid-layer-links {
->>>>>>> gm-job-offers
-  grid-column-start: middle;
-  grid-column-end: end;
-  grid-row-start: start;
-  grid-row-end: middle;
-}

sib-core @ e38ebf29

-Subproject commit 4e770ca60ffa6c309c375152ee04e34545700970
+Subproject commit e38ebf298b1e1e8f6961feb1163338fd61259312