Merge branch 'DEVELOP_FE' of ssh://git.eclipse.org:29418/elogbook/portalFE into DEVELOP_FE
diff --git a/src/app/pages/login/login.component.css b/src/app/pages/login/login.component.css
index 2b03cc9..f37135a 100644
--- a/src/app/pages/login/login.component.css
+++ b/src/app/pages/login/login.component.css
@@ -1,6 +1,6 @@
 /**
 ******************************************************************************
-* Copyright © 2017-2018 PTA GmbH.
+* Copyright © 2017-2018 PTA GmbH.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
@@ -8,4 +8,4 @@
 *     http://www.eclipse.org/legal/epl-v10.html
 * 
 ******************************************************************************
-*/
+*/
\ No newline at end of file
diff --git a/src/app/pages/module-grid/module-grid.component.css b/src/app/pages/module-grid/module-grid.component.css
index c973810..36e883c 100644
--- a/src/app/pages/module-grid/module-grid.component.css
+++ b/src/app/pages/module-grid/module-grid.component.css
@@ -9,47 +9,56 @@
 * 
 ******************************************************************************
 */
+
 .row {
     display: flex;
     flex-wrap: wrap;
+    margin-top: auto;
+    margin-bottom: auto;
+}
 
-    margin-top:auto;
-    margin-bottom:auto;
-  }
-  .title-footer {
-    display:block;
+.title-footer {
+    display: block;
     -webkit-box-align: center;
     -ms-flex-align: center;
     align-items: center;
     height: 48px;
     color: #fff;
-    background: rgba(0,0,0,.38);
+    background: rgba(0, 0, 0, .38);
     overflow: hidden;
     left: 0px;
-    right:0px;
+    right: 0px;
     position: absolute;
     bottom: 0px;
-    text-align: center; 
+    text-align: center;
     border-bottom-left-radius: 10px;
-    border-bottom-right-radius: 10px; 
-    margin-left:15px;
+    border-bottom-right-radius: 10px;
+    margin-left: 15px;
     margin-right: 15px;
 }
 
-#topcontainer {
-
-    margin-top:auto;
-    margin-bottom:auto;
-    text-align:center;
-}
-
 #centercontainer {
-    width: 60%;
+    width: 100%;
     margin: 0 auto;
 }
 
-#bottomcontainer {
-    height: 30px;
+#moduleRightsCondition {
+    justify-content: center;
+    overflow: hidden !important;
+}
+
+#forLoopDiv {
+    padding-top: 25px;
+    cursor: pointer;
+    width: 330px;
+    height: 330px;
+}
+
+#picDiv {
+    text-align: center;
+    border-radius: 10px;
+    width: 100%;
+    height: 100%;
 }
 
 a:link {
@@ -133,14 +142,12 @@
 /* Base */
 
 .element {
-    display:table;
-    margin:14px auto;
+    display: table;
+    margin: 14px auto;
     font-size: 16px;
     display: table;
     position: relative;
     z-index: 2;
-    
-    
 }
 
 .element:hover,
diff --git a/src/app/pages/module-grid/module-grid.component.html b/src/app/pages/module-grid/module-grid.component.html
index e78f9ff..bc7f261 100644
--- a/src/app/pages/module-grid/module-grid.component.html
+++ b/src/app/pages/module-grid/module-grid.component.html
@@ -11,24 +11,19 @@
 -->
 
 
-<div>
-  <div id="topcontainer"></div>
-  <div id="centercontainer">
-    <div *ngIf="moduleRights" class="row">
-      <div (click)="goToElogbookIfValid(userModule)" [style.color]="userModule.color" [style.background]="000000" style="padding-top:25px; cursor: pointer;width:300px; height:300px"
-        *ngFor="let userModule of userModules" class="col-md-4 md-whiteframe-4dp hvr-grow">
-        <div [style.background-image]="'url(' + userModule.pictureLink + ')'" style=" text-align: center; border-radius: 10px; width:100%; height:100%;">
-          <div class="title-footer">
-            <span class="element underline-opening">{{userModule.name}}</span>
-          </div>
+<div id="centercontainer">
+  <div id="moduleRightsCondition" *ngIf="moduleRights" class="row">
+    <div id="forLoopDiv" (click)="goToElogbookIfValid(userModule)" [style.color]="userModule.color" [style.background]="000000"
+      *ngFor="let userModule of userModules" class="col-md-4 md-whiteframe-4dp hvr-grow">
+      <div id="picDiv" [style.background-image]="'url(' + userModule.pictureLink + ')'">
+        <div class="title-footer">
+          <span class="element underline-opening">{{userModule.name}}</span>
         </div>
       </div>
     </div>
   </div>
-  <div *ngIf="!moduleRights" style="text-align: center;">
-    <h2>Der Benutzer hat keine Rechte</h2>
-    <h4>Bitte kontaktieren Sie Ihren Administrator</h4>
-  </div>
 </div>
-<div id="bottomcontainer">
+<div *ngIf="!moduleRights" style="text-align: center;">
+  <h2>Der Benutzer hat keine Rechte</h2>
+  <h4>Bitte kontaktieren Sie Ihren Administrator</h4>
 </div>
\ No newline at end of file
diff --git a/src/assets/css/additional.css b/src/assets/css/additional.css
deleted file mode 100644
index 5e1228e..0000000
--- a/src/assets/css/additional.css
+++ /dev/null
@@ -1,419 +0,0 @@
-<!--
-/*******************************************************************************
-* Copyright (c) 2015 BTC AG.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*     Stefan Brockmann - initial API and implementation
-*     Jan Krueger - Login Portlet
-*******************************************************************************/
--->
-
-/* Liferay Login */
-label[for="_58_login"] {
-    padding-right: 7px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_password"] {
-    padding-right: 36px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_firstName"] {
-    padding-right: 60px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_middleName"] {
-    padding-right: 115px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_lastName"] {
-    padding-right: 130px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_screenName"] {
-    padding-right: 45px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_emailAddress"] {
-    padding-right: 40px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_birthday"] {
-    margin-bottom: 10px;
-}
-
-#_58_birthday {
-    margin-bottom: 10px;
-}
-
-label[for="_58_male"] {
-    padding-right: 6px;
-    margin-bottom: 20px;
-}
-
-label[for="_58_captchaText"] {
-    padding-right: 6px;
-    margin-bottom: 20px;
-}
-
-/*#_58_rjus_column1_2 {*/
-/*visibility: hidden;*/
-/*}*/
-
-.loading-display {
-    width: 100%;
-    height: 100%;
-    z-index: 10;
-    top: 0;
-    left: 0;
-    position: fixed;
-}
-
-.loading-display .filter {
-    opacity: 0.25;
-    background: #000;
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    position: fixed;
-}
-
-.loading-display .center {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    background-image: url("../img/spinner.gif");
-    background-repeat: no-repeat;
-    width: 50px;
-    height: 50px;
-}
-
-.mac-popover {
-    background: transparent !important;
-    border: none !important;
-    box-shadow: none !important;
-    padding-top: 20px;
-}
-
-.mac-popover .tip {
-    display: none;
-}
-
-#grid-overview {
-    height: 750px;
-}
-
-.ui-grid-header-cell {
-    min-height: 60px !important;
-}
-
-.ui-grid-header-canvas {
-    background: white !important;
-}
-
-.ui-grid-cell-align-right {
-    text-align: right;
-}
-
-.portlet-topper {
-    a: white;
-}
-
-.btn-default {
-    background-image: none !important;
-    background-color: white !important;
-}
-
-.selection .multiSelect > button {
-    background-image: none;
-    background-color: white;
-    border: 1px solid #b7cbda;
-    border-radius: 8px;
-    min-height: 34px !important;
-}
-
-.tree-grid table, .tree-grid td {
-    border: 1px solid #ccdbe6;
-}
-
-.tree-grid .level-1 {
-    background: none repeat scroll 0 0 #f5f8fc;
-    padding-left: 5px;
-}
-
-.tree-grid .level-2 {
-    background: none repeat scroll 0 0 #ffffff;
-    padding-left: 15px;
-}
-
-.tree-grid tr td:first-child {
-    width: 65px;
-}
-
-.tree-grid .level-3 .indented {
-    left: 0px;
-}
-
-.tree-grid .level-2 .indented {
-    left: 10px;
-}
-
-/*
-#proposalTree, #proposalStats {
-    height: 440px;
-}
-*/
-
-.label-required {
-    color: #a94442;
-}
-
-input[type="checkbox"] {
-    top: -1px;
-}
-
-.confirmContentBox {
-    padding: 0;
-    margin-left: 10px;
-}
-
-.hideRowSelectedSubStation {
-    opacity: 0.30;
-}
-
-.ui-grid-footer-cell{
-    padding: 0px 0px 0px 5px;
-    text-align:right;
-}
-
-a {
-   outline: 0 ! important;
-}
-
-.infobar .panel.panel-default:first-child{
-    margin-left:0px;
-}
-table.settings td.tlabel{
-    display: table-cell ! important;
-    font-weight:bold;
-    padding-right: 10px ! important;
-}
-table.settings td{
-    padding-right: 20px;
-}
-
-.modal-90p{
-    
-    width:90% ! important;
-}
-
-ul.regionlist{
-    margin:0px;
-    padding:0px;
-    list-style: none;
-}
-
-select.ampmselect{
-    display:none;
-}
-
-div.loader{
-    
-    position: fixed;
-    left:0px;
-    top:0px;
-    width:100%;
-    height:100%;
-    background: rgba(0, 0, 0, 0.2);
-    z-index:1000;
-
-}
-
-
-#floatingCirclesG{
-	position:relative;
-	width:125px;
-	height:125px;
-	margin: 100px auto;
-	transform:scale(0.6);
-		-o-transform:scale(0.6);
-		-ms-transform:scale(0.6);
-		-webkit-transform:scale(0.6);
-		-moz-transform:scale(0.6);
-}
-
-.f_circleG{
-	position:absolute;
-	background-color:rgb(255,255,255);
-	height:22px;
-	width:22px;
-	border-radius:12px;
-		-o-border-radius:12px;
-		-ms-border-radius:12px;
-		-webkit-border-radius:12px;
-		-moz-border-radius:12px;
-	animation-name:f_fadeG;
-		-o-animation-name:f_fadeG;
-		-ms-animation-name:f_fadeG;
-		-webkit-animation-name:f_fadeG;
-		-moz-animation-name:f_fadeG;
-	animation-duration:1.2s;
-		-o-animation-duration:1.2s;
-		-ms-animation-duration:1.2s;
-		-webkit-animation-duration:1.2s;
-		-moz-animation-duration:1.2s;
-	animation-iteration-count:infinite;
-		-o-animation-iteration-count:infinite;
-		-ms-animation-iteration-count:infinite;
-		-webkit-animation-iteration-count:infinite;
-		-moz-animation-iteration-count:infinite;
-	animation-direction:normal;
-		-o-animation-direction:normal;
-		-ms-animation-direction:normal;
-		-webkit-animation-direction:normal;
-		-moz-animation-direction:normal;
-}
-
-#frotateG_01{
-	left:0;
-	top:51px;
-	animation-delay:0.45s;
-		-o-animation-delay:0.45s;
-		-ms-animation-delay:0.45s;
-		-webkit-animation-delay:0.45s;
-		-moz-animation-delay:0.45s;
-}
-
-#frotateG_02{
-	left:15px;
-	top:15px;
-	animation-delay:0.6s;
-		-o-animation-delay:0.6s;
-		-ms-animation-delay:0.6s;
-		-webkit-animation-delay:0.6s;
-		-moz-animation-delay:0.6s;
-}
-
-#frotateG_03{
-	left:51px;
-	top:0;
-	animation-delay:0.75s;
-		-o-animation-delay:0.75s;
-		-ms-animation-delay:0.75s;
-		-webkit-animation-delay:0.75s;
-		-moz-animation-delay:0.75s;
-}
-
-#frotateG_04{
-	right:15px;
-	top:15px;
-	animation-delay:0.9s;
-		-o-animation-delay:0.9s;
-		-ms-animation-delay:0.9s;
-		-webkit-animation-delay:0.9s;
-		-moz-animation-delay:0.9s;
-}
-
-#frotateG_05{
-	right:0;
-	top:51px;
-	animation-delay:1.05s;
-		-o-animation-delay:1.05s;
-		-ms-animation-delay:1.05s;
-		-webkit-animation-delay:1.05s;
-		-moz-animation-delay:1.05s;
-}
-
-#frotateG_06{
-	right:15px;
-	bottom:15px;
-	animation-delay:1.2s;
-		-o-animation-delay:1.2s;
-		-ms-animation-delay:1.2s;
-		-webkit-animation-delay:1.2s;
-		-moz-animation-delay:1.2s;
-}
-
-#frotateG_07{
-	left:51px;
-	bottom:0;
-	animation-delay:1.35s;
-		-o-animation-delay:1.35s;
-		-ms-animation-delay:1.35s;
-		-webkit-animation-delay:1.35s;
-		-moz-animation-delay:1.35s;
-}
-
-#frotateG_08{
-	left:15px;
-	bottom:15px;
-	animation-delay:1.5s;
-		-o-animation-delay:1.5s;
-		-ms-animation-delay:1.5s;
-		-webkit-animation-delay:1.5s;
-		-moz-animation-delay:1.5s;
-}
-
-
-
-@keyframes f_fadeG{
-	0%{
-		background-color:rgb(0,0,0);
-	}
-
-	100%{
-		background-color:rgb(255,255,255);
-	}
-}
-
-@-o-keyframes f_fadeG{
-	0%{
-		background-color:rgb(0,0,0);
-	}
-
-	100%{
-		background-color:rgb(255,255,255);
-	}
-}
-
-@-ms-keyframes f_fadeG{
-	0%{
-		background-color:rgb(0,0,0);
-	}
-
-	100%{
-		background-color:rgb(255,255,255);
-	}
-}
-
-@-webkit-keyframes f_fadeG{
-	0%{
-		background-color:rgb(0,0,0);
-	}
-
-	100%{
-		background-color:rgb(255,255,255);
-	}
-}
-
-@-moz-keyframes f_fadeG{
-	0%{
-		background-color:rgb(0,0,0);
-	}
-
-	100%{
-		background-color:rgb(255,255,255);
-	}
-}
-
diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index 9b5a2c8..664a653 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -1,4 +1,3 @@
-<!--
 /*******************************************************************************
 * Copyright (c) 2015 BTC AG.
 * All rights reserved. This program and the accompanying materials
@@ -9,10 +8,11 @@
 * Contributors:
 *     Martin Boehm, http://www.minnemedia.de - initial API and implementation
 *******************************************************************************/
--->
+
 html,
 body {
-    overflow-x: hidden; /* Prevent scroll on narrow devices */
+    overflow-x: hidden;
+    /* Prevent scroll on narrow devices */
 }
 
 html {
@@ -34,11 +34,12 @@
     display: none;
 }
 
-.breadcrumb > li + li:before {
+.breadcrumb>li+li:before {
     content: "\00276D";
 }
 
 /* Beginn Kopfleiste */
+
 .masthead {
     border: 0;
     background: rgb(232, 238, 231);
@@ -98,6 +99,7 @@
 /* Ende Kopfleiste */
 
 /* Beginn Sidebar */
+
 #sidebar .list-group-item:first-child {
     border-top-right-radius: 0px !important;
     border-top-left-radius: 0px !important;
@@ -190,18 +192,20 @@
     margin-bottom: 4px;
 }
 
+.table>tbody>tr>td,
+.table>tbody>tr>th,
+.table>tfoot>tr>td,
+.table>tfoot>tr>th,
+.table>thead>tr>td,
+.table>thead>tr>th {
+    border-top: 1px solid #ddd;
+    padding: 4px;
+    vertical-align: top;
+}
 
-    .table > tbody > tr > td, .table > tbody > tr > th, .table > tfoot > tr > td, .table > tfoot > tr > th, .table > thead > tr > td, .table > thead > tr > th {
-        border-top: 1px solid #ddd;
-        padding: 4px;
-        vertical-align: top;
-      
-    }
-    
-    .table > thead > tr > th {
-        padding: 6px 0px 35px 6px;
-    }
-    
+.table>thead>tr>th {
+    padding: 6px 0px 35px 6px;
+}
 
 @media screen and (max-width: 767px) {
     .row-offcanvas {
@@ -210,229 +214,191 @@
         -o-transition: all .25s ease-out;
         transition: all .25s ease-out;
     }
-
     .row-offcanvas-right {
         right: 0;
     }
-
     .row-offcanvas-left {
         left: 0;
     }
-
-    .row-offcanvas-right
-    .sidebar-offcanvas {
-        right: -50%; /* 6 columns */
+    .row-offcanvas-right .sidebar-offcanvas {
+        right: -50%;
+        /* 6 columns */
     }
-
-    .row-offcanvas-left
-    .sidebar-offcanvas {
-        left: -50%; /* 6 columns */
+    .row-offcanvas-left .sidebar-offcanvas {
+        left: -50%;
+        /* 6 columns */
     }
-
     .row-offcanvas-right.active {
-        right: 50%; /* 6 columns */
+        right: 50%;
+        /* 6 columns */
     }
-
     .row-offcanvas-left.active {
-        left: 50%; /* 6 columns */
+        left: 50%;
+        /* 6 columns */
     }
-
     .sidebar-offcanvas {
         position: absolute;
         top: 0;
-        width: 50%; /* 6 columns */
+        width: 50%;
+        /* 6 columns */
     }
-
-
-
-
 }
 
-
-
-
-
-.ui-grid-cell button.btn-sm.btn-default{
-    
-    margin:2px;
+.ui-grid-cell button.btn-sm.btn-default {
+    margin: 2px;
     height: 26px;
     width: 26px;
-    padding:0px;
+    padding: 0px;
 }
 
-.ui-grid-pager-panel{
-    
+.ui-grid-pager-panel {
     border-top: solid 1px #d4d4d4;
     background-color: #efefef;
 }
 
-.mtdefault{
-    
+.mtdefault {
     margin-top: 10px;
 }
 
-button.btn-sm.btn-default.active{
-    
-    background-color:green ! important;
-} 
-
-.ui-grid-row.active div{
-    
-     background-color:#b4f371 ! important;
-     background-image: none ! important;
+button.btn-sm.btn-default.active {
+    background-color: green ! important;
 }
 
+.ui-grid-row.active div {
+    background-color: #b4f371 ! important;
+    background-image: none ! important;
+}
 
-div.panel-default{
-    
+div.panel-default {
     min-height: 120px;
 }
 
-
-
-
-.toolbar{
-    
-    position:absolute;
+.toolbar {
+    position: absolute;
     right: 10px;
     top: 20px;
 }
 
-div.panel.panel-default.panel-details, div.panel.panel-default.panel-activities{
-    
-    min-height:436px;
+div.panel.panel-default.panel-details,
+div.panel.panel-default.panel-activities {
+    min-height: 436px;
 }
 
-.panel-details table tr td{
-    padding:4px 20px 4px 4px;
-}
-.panel-details table tr td:first-child{
-    
-    font-weight:bold;
-}
-.feature-heading{
-    display:none;
+.panel-details table tr td {
+    padding: 4px 20px 4px 4px;
 }
 
-.breadcrumb{
-    margin-bottom:10px;
+.panel-details table tr td:first-child {
+    font-weight: bold;
 }
 
-input.goto{
+.feature-heading {
+    display: none;
+}
+
+.breadcrumb {
+    margin-bottom: 10px;
+}
+
+input.goto {
     width: 40px;
     height: 28px;
     text-align: center;
 }
 
-span.paging{
-    display:inline-block;
+span.paging {
+    display: inline-block;
     margin: 0px 10px 0px 10px;
 }
 
-.cursor{
-    cursor:pointer;
-    
+.cursor {
+    cursor: pointer;
 }
 
-.align-right{
+.align-right {
     text-align: right;
 }
 
-table.table.tree-grid th{
-    
+table.table.tree-grid th {
     border: solid 1px #ddd;
 }
 
-table.table.tree-grid{
-    
+table.table.tree-grid {
     border-top: solid 1px #ddd;
 }
 
-.ui-grid-cell.ng-scope.ui-grid-disable-selection{
-    
+.ui-grid-cell.ng-scope.ui-grid-disable-selection {
     border-bottom: solid 1px #ddd;
-    
 }
 
-a i.indented.tree-icon.glyphicon.glyphicon-arrow-right{
-    
+a i.indented.tree-icon.glyphicon.glyphicon-arrow-right {
     margin-left: 30px;
 }
 
-table.tree-grid tr.tree-grid-row.ng-scope.level-3.active td{
-    
+table.tree-grid tr.tree-grid-row.ng-scope.level-3.active td {
     background-color: #ffffff ! important;
-    
 }
 
-table.tree-grid tr.tree-grid-row.ng-scope.level-3:hover{
-    
-    background-color: #eeeeee! important;
+table.tree-grid tr.tree-grid-row.ng-scope.level-3:hover {
+    background-color: #eeeeee ! important;
 }
-#proposalTree{
-    
+
+#proposalTree {
     height: 402px;
 }
 
-#timermessage{
-    
+#timermessage {
     position: fixed;
-    left:0px;
-    top:0px;
+    left: 0px;
+    top: 0px;
     width: 100%;
-    height:100%;
+    height: 100%;
     z-index: 20000;
-    display:none;
+    display: none;
 }
 
-#timermessage .messagebox{
-    
+#timermessage .messagebox {
     width: 420px;
     height: 300px;
     padding: 10px;
     background-color: white;
     margin: 100px auto;
-    
-}
-.error{
-    color:red ! important;
 }
 
-form .row.navheader{
-    
-    margin:20px 0px 40px 0px ! important;
-
+.error {
+    color: red ! important;
 }
 
-.row.navheader{
-    
-    margin:0px 0px 0px 0px;
-    border-top:solid 1px #cccccc;
-    border-bottom:solid 1px #cccccc;
+form .row.navheader {
+    margin: 20px 0px 40px 0px ! important;
+}
+
+.row.navheader {
+    margin: 0px 0px 0px 0px;
+    border-top: solid 1px #cccccc;
+    border-bottom: solid 1px #cccccc;
     padding: 5px 0px 5px 0px;
-    background-color:#f5f5f5;
-    
+    background-color: #f5f5f5;
 }
 
-.row.navfooter{
-    
-    margin:10px 0px 0px 0px;
-    border-top:solid 1px #cccccc;
-    border-bottom:solid 1px #cccccc;
+.row.navfooter {
+    margin: 10px 0px 0px 0px;
+    border-top: solid 1px #cccccc;
+    border-bottom: solid 1px #cccccc;
     padding: 5px 0px 5px 0px;
-    background-color:#f5f5f5;
-    
+    background-color: #f5f5f5;
 }
 
-.panel td{
-    vertical-align:top;
+.panel td {
+    vertical-align: top;
 }
 
-.ui-grid-a11y-ariascreenreader-speakable{
-    display:none ! important;
+.ui-grid-a11y-ariascreenreader-speakable {
+    display: none ! important;
 }
-.ranges{
-    width:100% ! important;
+
+.ranges {
+    width: 100% ! important;
 }
 
 login {
diff --git a/src/assets/img/info.png b/src/assets/img/info.png
deleted file mode 100644
index c21b70f..0000000
--- a/src/assets/img/info.png
+++ /dev/null
Binary files differ
diff --git a/src/assets/img/spinner.gif b/src/assets/img/spinner.gif
deleted file mode 100644
index 57f5624..0000000
--- a/src/assets/img/spinner.gif
+++ /dev/null
Binary files differ
diff --git a/src/styles.css b/src/styles.css
index db30697..95df0d9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -9,13 +9,14 @@
 * 
 ******************************************************************************
 */
+
 /* You can add global styles to this file, and also import other style files */
+
 @import url("assets/source-sans-pro/source-sans-pro.css");
 @import url("assets/css/main.css");
-@import url("assets/css/additional.css");
 @import url("assets/css/custom.css");
-
 /* General styling */
+
 body {
     background: #f8fafd;
 }
@@ -33,6 +34,7 @@
 }
 
 /* General panel styling */
+
 div.panel-group {
     margin: 15px;
 }
@@ -42,40 +44,40 @@
     margin: 15px 0px;
 }
 
-div.panel-default > .panel-heading {
+div.panel-default>.panel-heading {
     background-color: #f5f8fc;
 }
 
-
 /* General button styling */
+
 .btn {
     border-radius: 6px;
 }
 
-
 /* General table styling */
+
 .table-striped {
     margin: 0;
     padding: 5px;
     vertical-align: middle;
 }
 
-.table-striped > tbody > tr:nth-of-type(odd) {
+.table-striped>tbody>tr:nth-of-type(odd) {
     background: #e9f0f9;
 }
 
-.table > thead > tr > th {
+.table>thead>tr>th {
     padding: 5px;
     vertical-align: bottom;
 }
 
-.table > tbody > tr > td {
+.table>tbody>tr>td {
     padding: 5px;
     vertical-align: middle;
 }
 
-
 /* General dialog styling */
+
 .mat-dialog-container {
     background: #f8fafd;
 }
@@ -87,8 +89,8 @@
     margin: 0px 0px 15px 0px;
 }
 
-
 /* Login styling */
+
 .login-outer {
     width: 100%;
     height: 90%;
@@ -123,14 +125,14 @@
     color: #333333;
 }
 
-.maincontent > .row {
+.maincontent>.row {
     background: #f8fafd;
     margin: 0;
     padding: 0;
 }
 
-
 /* Responsibility dialog styling */
+
 .responsibility-dialog {
     overflow: auto;
     width: 40vw;
@@ -138,24 +140,24 @@
     margin: 0px 0px 15px 0px;
 }
 
-.responsibility-column-striped > thead th {
+.responsibility-column-striped>thead th {
     text-align: center;
 }
 
-.responsibility-column-striped > tbody td:nth-of-type(even) {
-    background:#f5f8fc;
+.responsibility-column-striped>tbody td:nth-of-type(even) {
+    background: #f5f8fc;
 }
 
-.responsibility-column-striped > tbody td {
+.responsibility-column-striped>tbody td {
     text-align: center;
 }
 
-.responsibility-column-striped > tbody td:first-child {
+.responsibility-column-striped>tbody td:first-child {
     text-align: left;
 }
 
-
 /* Alert dialog styling */
+
 .alert-dialog {
     overflow: auto;
     width: auto;
@@ -164,8 +166,8 @@
     margin: 0px 0px 15px 0px;
 }
 
-
 /* Entry dialog styling */
+
 .entry-dialog {
     overflow: auto;
     width: 75vw;
@@ -187,12 +189,12 @@
     width: 100%;
 }
 
-
 /* Shift change protocol styling */
+
 .shift-change-protocol-panel-body {
     padding: 0px 15px;
     overflow: scroll;
-    display: table; 
+    display: table;
 }
 
 .dropdown {
@@ -200,6 +202,7 @@
 }
 
 /* Dropdown logout menu styling */
+
 .dropdown-open {
     color: #537798;
 }
@@ -208,25 +211,25 @@
     color: #b7cbda;
 }
 
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:focus {
+.navbar-default .navbar-nav>.open>a,
+.navbar-default .navbar-nav>.open>a:focus {
     color: #0080c0;
-    background: #b7cbda;    
-}
-
-.dropdown-menu{   
-    top:43px;
-    min-width: 160px;
-    background: #e9f0f9;    
-}
-
-.dropdown-menu > .dropdown > a:hover {
     background: #b7cbda;
-    color: #0080c0;    
 }
 
+.dropdown-menu {
+    top: 43px;
+    min-width: 160px;
+    background: #e9f0f9;
+}
+
+.dropdown-menu>.dropdown>a:hover {
+    background: #b7cbda;
+    color: #0080c0;
+}
 
 /* Logout dialog styling */
+
 .logout-dialog {
     width: 320px;
     height: 240px;
@@ -241,8 +244,8 @@
     margin: 15px;
 }
 
-
 /* Search styling */
+
 .search-input {
     width: 30%;
 }
@@ -250,35 +253,43 @@
 span.glyphicon-search {
     color: #b6cbdb;
 }
-.custom-drop-down .c-token span{
+
+.custom-drop-down .c-token span {
     pointer-events: auto;
-position: relative;
+    position: relative;
 }
-.custom-drop-down .c-token{
+
+.custom-drop-down .c-token {
     background: #337ab7 !important;
 }
 
-.custom-drop-down .pure-checkbox input[type="checkbox"]:hover + label:before{
+.custom-drop-down .pure-checkbox input[type="checkbox"]:hover+label:before {
     border-color: #337ab7 !important;
 }
 
-.custom-drop-down .pure-checkbox input[type="checkbox"] + label:before{  
+.custom-drop-down .pure-checkbox input[type="checkbox"]+label:before {
     color: #337ab7 !important;
 }
 
-.custom-drop-down .pure-checkbox input[type="checkbox"] + label:before{
+.custom-drop-down .pure-checkbox input[type="checkbox"]+label:before {
     border: 2px solid #337ab7 !important;
 }
 
-.custom-drop-down .pure-checkbox input[type="checkbox"] + label:after{
-  background-color: #337ab7 !important;
+.custom-drop-down .pure-checkbox input[type="checkbox"]+label:after {
+    background-color: #337ab7 !important;
 }
 
-.custom-drop-down .pure-checkbox input[type="checkbox"]:checked + label:before{  
-  background:  #337ab7 !important;
+.custom-drop-down .pure-checkbox input[type="checkbox"]:checked+label:before {
+    background: #337ab7 !important;
 }
 
- .custom-drop-down .selected-list button{        
-        box-shadow: none !important;        
+.custom-drop-down .selected-list button {
+    box-shadow: none !important;
 }
-.tooltip > .tooltip-inner {background-color: #f5f8fc;color: black; word-break: break-all; border: 1px solid grey;}
+
+.tooltip>.tooltip-inner {
+    background-color: #f5f8fc;
+    color: black;
+    word-break: break-all;
+    border: 1px solid grey;
+}
\ No newline at end of file