Merge branch 'master' of https://gogs.inhome.blapointe.com/local/firestormy

public/css/water.css

@@ -17,9 +17,12 @@ tbody tr:nth-child(2n+1) {
 #upsert > textarea {
    width: 100%;
    resize: vertical;
+<<<<<<< HEAD
    font-family: monospace;
    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
    white-space: pre-wrap;
+=======
+>>>>>>> f7a346a380076b3ea76ec6f99f09b3c26b72f002
 }
 
 #jobs > tbody > tr > td {
@@ -46,6 +49,7 @@ tbody tr:nth-child(2n+1) {
    background: inherit;
    min-width: 40%;
    display: inline-block;
+<<<<<<< HEAD
    white-space: pre-wrap;
 }
 
@@ -53,3 +57,8 @@ tbody tr:nth-child(2n+1) {
 ::-moz-selection {
    background-color: #565f67;
 }
+=======
+   white-space: pre;
+}
+
+>>>>>>> f7a346a380076b3ea76ec6f99f09b3c26b72f002