Merge branch 'improvements' of onunez/soma-frontend into development

src/app/components/shared/sidebar/sidebar.component.html

@@ -1,10 +1,10 @@
 <div class="logo">
-  <a class="simple-text logo-mini">
+  <a class="simple-text logo-mini" href="/">
     <div class="logo-img">
-      <img src="./assets/img/logo-inverlec2.png">
+      &nbsp;
+      <!-- <img src="./assets/img/denmark-logo.png" /> -->
     </div>
   </a>
-  <a class="simple-text logo-normal" href="/">&nbsp;</a>
 </div>
 
 <div class="sidebar-wrapper">
@@ -22,34 +22,51 @@
       </span>
     </form> -->
   </div>
-    <ul class="nav">
-      <li routerLinkActive="active" *ngFor="let menuItem of menuItems" class="{{menuItem.class}} nav-item">
-        <a class="nav-link" [routerLink]="[menuItem.path]">
-          <i class="material-icons">{{menuItem.icon}}</i>
-          <p>{{menuItem.title}}</p>
-        </a>
-      </li>
-      
-      <hr>
-    </ul>
-    <ul *ngIf="adminMenu" class="nav">
-      <li routerLinkActive="active" *ngFor="let menuItem of adminMenuItems" class="{{menuItem.class}} nav-item">
-        <a class="nav-link" [routerLink]="[menuItem.path]" *ngIf="menuItem.allowed_roles.indexOf(+role_number)>-1"> 
-          <i class="material-icons">{{menuItem.icon}}</i>
-          <p>{{menuItem.title}}</p>
-        </a>
-      </li>
-    </ul>
+  <ul class="nav">
+    <li
+      routerLinkActive="active"
+      *ngFor="let menuItem of menuItems"
+      class="{{ menuItem.class }} nav-item"
+    >
+      <a class="nav-link" [routerLink]="[menuItem.path]">
+        <i class="material-icons">{{ menuItem.icon }}</i>
+        <p>{{ menuItem.title }}</p>
+      </a>
+    </li>
+
+    <hr />
+  </ul>
+  <ul *ngIf="adminMenu" class="nav">
+    <li
+      routerLinkActive="active"
+      *ngFor="let menuItem of adminMenuItems"
+      class="{{ menuItem.class }} nav-item"
+    >
+      <a
+        class="nav-link"
+        [routerLink]="[menuItem.path]"
+        *ngIf="menuItem.allowed_roles.indexOf(+role_number) > -1"
+      >
+        <i class="material-icons">{{ menuItem.icon }}</i>
+        <p>{{ menuItem.title }}</p>
+      </a>
+    </li>
+  </ul>
   <div *ngIf="isMobileMenu()">
     <ul class="nav navbar-nav nav-mobile-menu-bottom">
       <li class="nav-item">
-          <a class="nav-link" title="Logout" (click)="logout()" href="javascript:void(0)">
-              <i class="material-icons">exit_to_app</i>
-              <p>
-                  <span class="d-lg-none d-md-block">Logout</span>
-              </p>
-          </a>
+        <a
+          class="nav-link"
+          title="Logout"
+          (click)="logout()"
+          href="javascript:void(0)"
+        >
+          <i class="material-icons">exit_to_app</i>
+          <p>
+            <span class="d-lg-none d-md-block">Logout</span>
+          </p>
+        </a>
       </li>
     </ul>
   </div>
-</div>
+</div>

src/assets/scss/core/_sidebar-and-main-panel.scss

@@ -30,18 +30,22 @@
     background-color: #191919;
   }
   .logo-img {
-    width: 35px;
+    width: 215px;
     display: block;
-    max-height: 30px;
+    height: 50px;
     margin-left: 13px;
     margin-right: 15px;
-
+    background: url(/assets/img/denmark-logo.png) no-repeat;
+    background-size: 215px;
+    /*
     img {
-      width: 35px;
-      top: 33px;
+      width: 215px;
+      top: 10px;
       position: absolute;
-    }
+      left: 15px;
+    }*/
   }
+
   .sidebar-wrapper {
     position: relative;
     height: calc(100vh - 75px);
@@ -471,6 +475,15 @@
       font-weight: 200;
       z-index: 9999;
 
+      .logo-img {
+        width: 80px;
+        display: block;
+        overflow: hidden;
+        background: url(/assets/img/denmark-small-logo.png) no-repeat;
+        background-size: 65px;
+        background-position-y: 8px;
+      }
+
       .logo {
         a.logo-normal {
           opacity: 0;