Merge branch 'accounting' into dev

web/src/main/resources/web/css/bloodshed-color.css

@@ -64,11 +64,13 @@ tr:hover .taglist .tag button {
     color: black;
 }
 
+.account .sums,
 .archive{
   background: red;
   color: black;
 }
 
+.account .sums:hover,
 .archive.hover{
     background: orange;
     color: black;
@@ -304,6 +306,7 @@ tr:hover .taglist .tag button {
 	border-color: orange;
 	color: orange;
 }
+
 .easylist fieldset {
 	border-color: red;
 	color: red;

web/src/main/resources/web/css/bloodshed.css

@@ -262,6 +262,22 @@ textarea{
     margin: 5px 0 5px auto;
 }
 
+.account .taglist .tag.editor,
+.taglist .tag button{
+	display: none;
+}
+
+.account .taglist:hover .editor,
+.taglist:hover .tag button{
+	display: inherit;
+}
+
+.account .sums{
+	position: sticky;
+	bottom: 0;
+	z-index: 100;
+}
+
 .taglist .editor > span{
     display: inline-block;
     min-width: 150px;

web/src/main/resources/web/css/default-color.css

@@ -62,6 +62,7 @@ tr:hover .taglist .tag button {
     background: orange;
     color: black;
 }
+
 .account .sums,
 .archive{
   background: black;

web/src/main/resources/web/css/winter-color.css

@@ -54,14 +54,15 @@ tr:hover .taglist .tag {
 }
 
 tr:hover .taglist .tag button {
-    //background: orange;
     color: black;
 }
 
+.account .sums,
 .archive{
   background: white;
 }
 
+.account .sums:hover,
 .archive.hover{
     background: lightblue;
     color: black;

web/src/main/resources/web/css/winter.css

@@ -71,6 +71,99 @@ nav {
     border-bottom: 1px solid;
 }
 
+nav a::before{
+    font-family: awesome;
+    font-size: 20px;
+    font-weight: normal;
+}
+
+nav a.accounting::before {
+	content: " ";
+}
+
+nav a.user::before {
+    content: " ";
+}
+
+nav a.company::before {
+    content: " ";
+}
+
+nav a.contact::before{
+    content: " ";
+}
+
+nav a.doc::before {
+    content: " "
+}
+
+nav a.file::before{
+    content: " ";
+}
+
+nav a.mark::before {
+    content: " ";
+}
+
+nav a.message::before {
+	content: " ";
+}
+
+nav a.note::before {
+    content: " ";
+}
+
+nav a.poll::before {
+    content: " ";
+}
+
+nav a.project::before {
+    content: " ";
+}
+
+nav a.stock::before{
+    content: " "
+}
+
+nav a.tags::before {
+    content: " "
+}
+
+nav a.task::before {
+    content: " ";
+}
+
+nav a.time::before{
+    content: " ";
+}
+
+nav a.wiki::before{
+    content: " ";
+}
+
+nav a.accounting,
+nav a.company,
+nav a.contact,
+nav a.doc,
+nav a.file,
+nav a.mark,
+nav a.message,
+nav a.note,
+nav a.poll,
+nav a.project,
+nav a.stock,
+nav a.tags,
+nav a.task,
+nav a.time,
+nav a.user,
+nav a.wiki{
+    font-size: 0;
+}
+
+nav a:hover{
+    font-size: inherit;
+}
+
 td, tr{
     vertical-align: baseline;
 }
@@ -262,6 +355,22 @@ textarea{
     margin: 5px 0 5px auto;
 }
 
+.account .taglist .tag.editor,
+.taglist .tag button{
+	display: none;
+}
+
+.account .taglist:hover .editor,
+.taglist:hover .tag button{
+	display: inherit;
+}
+
+.account .sums{
+	position: sticky;
+	bottom: 0;
+	z-index: 100;
+}
+
 .taglist .editor > span{
     display: inline-block;
     min-width: 150px;
@@ -426,6 +535,10 @@ a.wikilink{
     grid-template-columns: [left] 1fr [first] 1fr [second] 1fr [right]
 }
 
+.stock.grid3{
+	grid-template-columns: [left] 1fr [first] 1fr [second] 2fr [right]
+}
+
 .grid3 .locations {
     grid-row-end: span 3;
 }
@@ -502,6 +615,28 @@ a.wikilink{
 	#app nav.expanded .timetracking{
 		display: none;
 	}
+    .grid3 {
+        grid-template-columns: auto auto;
+    }
+
+    .grid3 .properties{
+    	grid-column-end: span 2;
+    	order: 1;
+    }
+    .grid3 .tags{
+		order: 2;
+	}
+    .grid3 .notes{
+    	grid-column-end: span 2;
+    	order: 3;
+    }
+
+	.grid3 .locations{
+		order: 5;
+	}
+	.grid3 .items{
+		order: 6;
+	}
 }
 
 .poll .weight .description{
@@ -514,7 +649,8 @@ a.wikilink{
 }
 
 @media screen and (max-width: 600px) {
-    .grid2{
+    .grid2,
+    .grid3{
         display: grid;
         grid-template-columns: auto;
     }
@@ -545,7 +681,10 @@ a.wikilink{
 	#app nav{
 		grid-template-columns: auto auto;
 	}
-	#app nav form{
+	#app nav form,
+    .grid3 .notes,
+    .grid3 .tags,
+    .grid3 .properties{
 		grid-column-end: span 1;
 	}
     #app nav .logout{