feature: conflict resolved

src/styles/content/_index.scss

@@ -71,6 +71,13 @@ main {
     /* Styles use with JS to open/close the sidebar */
     &.jsRightMenu {
       display: block;
+      solid-link[active] {
+        color: white;
+        background: var(--color-heading);
+      }
+      solid-link:not([active]):hover {
+        background: #e4e4e4;
+      }
     }
 
     &.jsRightMenu:not([open]) {

src/styles/header/_index.scss

@@ -46,13 +46,14 @@ header {
       }
 
       .solid-notifications__button {
+        margin-top: -9px;
         font-size: 24px;
 
         &::before {
-          margin-left: 0;
+          margin-left: -9px;
         }
 
-        &:hover {
+        &:hover, &:focus {
           background: white;
         }
 
@@ -61,7 +62,7 @@ header {
         }
 
         .solid-notifications__counter {
-          left: 21px;
+          left: 12px;
           position: absolute;
           top: 1px;
 
@@ -170,7 +171,7 @@ header {
 
             .solid-notification__avatar {
               align-items: center;
-              background: var(--color-grey);
+              background: #f6f6f6;
               display: flex;
               height: 35px;
               justify-content: center;
@@ -182,7 +183,7 @@ header {
               width: 35px;
 
               img {
-                background-color: var(--color-grey);
+                background-color: #f6f6f6;
                 height: 100%;
                 object-fit: cover;
                 object-position: center center;
@@ -400,4 +401,22 @@ header {
       }
     }
   }
+  .solid-notifications__item:hover * {
+    color: var(--color-secondary)!important;
+  }
+  .solid-notification__content {
+    max-width: calc(100% - 65px);
+  }
+  .solid-notification__summary {
+    text-overflow: ellipsis;
+    display: block;
+    width: 100%;
+  }
+  .solid-notification__title {
+    overflow: hidden;
+    white-space: break-spaces;
+    text-overflow: ellipsis;
+    display: block;
+    width: 100%;
+  }
 }

src/styles/index.scss

@@ -6,68 +6,6 @@ solid-display>div {
   display: contents !important;
 }
 
-/*.segment {
-  &.quarter {
-    width: 25%;
-  }
-
-  &.third {
-    width: 33.333%;
-  }
-
-  &.half {
-    width: 50%;
-  }
-
-  &.two-third {
-    width: 66.666%;
-  }
-
-  &.three-quarter {
-    width: 75%;
-  }
-
-  &.full {
-    width: 100%;
-  }
-
-  &.auto {
-    width: auto;
-  }
-
-
-  &.children {
-
-    &-quarter>div>solid-display {
-      width: 25%;
-    }
-
-    &-third>div>solid-display {
-      width: 33.333%;
-    }
-
-    &-half>div>solid-display {
-      width: 50%;
-    }
-
-    &-two-third>div>solid-display {
-      width: 66.666%;
-    }
-
-    &-three-quarter>div>solid-display {
-      width: 75%;
-    }
-
-    &-full>div>solid-display {
-      width: 100%;
-    }
-
-    &-auto>div>solid-display {
-      width: auto;
-    }
-  }
-}*/
-
 @import 'header/_index';
 @import 'left-nav/_index';
 @import 'content/_index';
@@ -76,3 +14,16 @@ solid-display>div {
 @import 'profile/_index';
 @import 'job-offers/_index';
 @import 'chat/_index';
+
+nav#main__menu {
+  width: 250px;
+}
+main#content {
+  width: calc(100% - 250px);
+}
+
+.text-ellipsis {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}