Merge branch 'module/timetracking' into dev

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

@@ -160,15 +160,21 @@ tr:hover{
   color: yellow;
 }
 
-.timetracks .year, .month{
-    border-color: 1px solid;
-}
-
 .timetracks .selected td:not(.year):not(.month){
     background-color: darkred;
     color: orange;
 }
 
+.timetracks.sum {
+  background: black;
+}
+
+.timetracks .year, .month{
+    border-color: 1px solid;
+}
+
+
+
 .warn {
     background-color: yellow;
     color: black;

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

@@ -290,11 +290,31 @@ span.timetracking {
   display: inline-block;
 }
 
+.markdown.editing{
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    column-gap: 10px;
+}
+.markdown .buttons,
+.markdown .hint{
+    grid-column-end: span 2;
+}
+
+.editable:hover{
+    border: 1px dotted;
+}
 
 .timetracks .year, .timetracks .month{
     border: 1px solid;
 }
 
+.timetracks.sum {
+  position: sticky;
+  top: 60px;
+  z-index: 20;
+  padding: 5px;
+}
+
 .timetracks.sum span{
     font-weight: bold;
 }
@@ -307,23 +327,6 @@ span.timetracking {
     float: right;
 }
 
-.markdown.editing{
-    position: relative;
-}
-
-.markdown.editing > *{
-    width: 49%;
-}
-
-.markdown.editing > *:nth-child(2){
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.markdown img{
-    max-width: 75%;
-}
 
 table{
     min-width: 30vw;
@@ -370,6 +373,7 @@ a.wikilink{
 .grid2{
     display: grid;
     grid-template-columns: 230px auto;
+    margin: 0 5px;
 }
 
 .grid2 > :nth-child(2n-1){
@@ -399,6 +403,17 @@ a.wikilink{
         text-align: initial;
         padding-top: 8px;
     }
+
+    .markdown.editing{
+        display: block;
+        grid-template-columns: 1fr 1fr;
+        column-gap: 10px;
+    }
+
+    .markdown textarea{
+        width: calc(100% - 10px);
+        min-height: 50px;
+    }
 }
 
 fieldset.vcard{

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

@@ -155,6 +155,11 @@ tr:hover{
     background-color: navy;
 }
 
+.timetracks.sum {
+  background: black;
+}
+
+
 .version a.selected{
      border-color: orange;
 }

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

@@ -308,6 +308,13 @@ span.timetracking {
     border: 1px solid;
 }
 
+.timetracks.sum {
+  position: sticky;
+  top: 60px;
+  z-index: 20;
+  padding: 5px;
+}
+
 .timetracks.sum span{
     font-weight: bold;
 }

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

@@ -144,6 +144,11 @@ tr:hover{
     background-color: aquamarine;
 }
 
+.timetracks.sum {
+  background: white;
+}
+
+
 .version a.selected{
      border-color: orange;
 }

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

@@ -290,11 +290,31 @@ span.timetracking {
   display: inline-block;
 }
 
+.markdown.editing{
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    column-gap: 10px;
+}
+.markdown .buttons,
+.markdown .hint{
+    grid-column-end: span 2;
+}
+
+.editable:hover{
+    border: 1px dotted;
+}
 
 .timetracks .year, .timetracks .month{
     border: 1px solid;
 }
 
+.timetracks.sum {
+  position: sticky;
+  top: 60px;
+  z-index: 20;
+  padding: 5px;
+}
+
 .timetracks.sum span{
     font-weight: bold;
 }
@@ -307,23 +327,6 @@ span.timetracking {
     float: right;
 }
 
-.markdown.editing{
-    position: relative;
-}
-
-.markdown.editing > *{
-    width: 49%;
-}
-
-.markdown.editing > *:nth-child(2){
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.markdown img{
-    max-width: 75%;
-}
 
 table{
     min-width: 30vw;
@@ -370,6 +373,7 @@ a.wikilink{
 .grid2{
     display: grid;
     grid-template-columns: 230px auto;
+    margin: 0 5px;
 }
 
 .grid2 > :nth-child(2n-1){
@@ -399,6 +403,17 @@ a.wikilink{
         text-align: initial;
         padding-top: 8px;
     }
+
+    .markdown.editing{
+        display: block;
+        grid-template-columns: 1fr 1fr;
+        column-gap: 10px;
+    }
+
+    .markdown textarea{
+        width: calc(100% - 10px);
+        min-height: 50px;
+    }
 }
 
 fieldset.vcard{