Merge branch 'jc/daemon'

diff --git a/gitweb/gitweb.css b/gitweb/gitweb.css
index ac6a3c774d6c905a78c6da7132e4aab31d7d6923..eb9fc3804b1445207a9afff688d9c8ba954255df 100644 (file)
--- a/gitweb/gitweb.css
+++ b/gitweb/gitweb.css
@@ -1,7 +1,7 @@
 body {
        font-family: sans-serif;
        font-size: 12px;
-       border:solid #d9d8d1;
+       border: solid #d9d8d1;
        border-width: 1px;
        margin: 10px;
        background-color: #ffffff;
@@ -33,7 +33,7 @@ div.page_header a:hover {
 }
 
 div.page_nav {
-       padding:8px;
+       padding: 8px;
 }
 
 div.page_nav a:visited {
@@ -42,6 +42,7 @@ div.page_nav a:visited {
 
 div.page_path {
        padding: 8px;
+       font-weight: bold;
        border: solid #d9d8d1;
        border-width: 0px 0px 1px;
 }
@@ -60,6 +61,7 @@ div.page_footer_text {
 
 div.page_body {
        padding: 8px;
+       font-family: monospace;
 }
 
 div.title, a.title {
@@ -79,6 +81,7 @@ div.title_text {
        padding: 6px 0px;
        border: solid #d9d8d1;
        border-width: 0px 0px 1px;
+       font-family: monospace;
 }
 
 div.log_body {
@@ -113,11 +116,26 @@ div.list_head {
        font-style: italic;
 }
 
+div.author_date {
+       padding: 8px;
+       border: solid #d9d8d1;
+       border-width: 0px 0px 1px 0px;
+       font-style: italic;
+}
+
 a.list {
        text-decoration: none;
        color: #000000;
 }
 
+a.subject, a.name {
+       font-weight: bold;
+}
+
+table.tags a.subject {
+       font-weight: normal;
+}
+
 a.list:hover {
        text-decoration: underline;
        color: #880000;
@@ -142,10 +160,15 @@ table {
        padding: 8px 4px;
 }
 
-table.project_list, table.diff_tree {
+table.project_list {
        border-spacing: 0;
 }
 
+table.diff_tree {
+       border-spacing: 0;
+       font-family: monospace;
+}
+
 table.blame {
        border-collapse: collapse;
 }
@@ -164,6 +187,10 @@ tr.dark {
        background-color: #f6f6f0;
 }
 
+tr.dark2 {
+       background-color: #f6f6f0;
+}
+
 tr.dark:hover {
        background-color: #edece6;
 }
@@ -174,12 +201,16 @@ td {
        vertical-align: top;
 }
 
-td.link {
+td.link, td.selflink {
        padding: 2px 5px;
        font-family: sans-serif;
        font-size: 10px;
 }
 
+td.selflink {
+       padding-right: 0px;
+}
+
 td.sha1 {
        font-family: monospace;
 }
@@ -189,6 +220,10 @@ td.error {
        background-color: yellow;
 }
 
+td.current_head {
+       text-decoration: underline;
+}
+
 table.diff_tree span.file_status.new {
        color: #008000;
 }
@@ -202,6 +237,10 @@ table.diff_tree span.file_status.mode_chnge {
        color: #777777;
 }
 
+table.diff_tree span.file_status.copied {
+  color: #70a070;
+}
+
 /* age2: 60*60*24*2 <= age */
 table.project_list td.age2, table.blame td.age2 {
        font-style: italic;
@@ -241,10 +280,22 @@ td.mode {
        font-family: monospace;
 }
 
+div.diff a.list {
+       text-decoration: none;
+}
+
+div.diff a.list:hover {
+       text-decoration: underline;
+}
+
+div.diff.to_file a.list,
+div.diff.to_file,
 div.diff.add {
        color: #008800;
 }
 
+div.diff.from_file a.list,
+div.diff.from_file,
 div.diff.rem {
        color: #cc0000;
 }
@@ -253,6 +304,10 @@ div.diff.chunk_header {
        color: #990099;
 }
 
+div.diff.incomplete {
+       color: #cccccc;
+}
+
 div.diff_info {
        font-family: monospace;
        color: #000099;
@@ -302,15 +357,30 @@ a.rss_logo:hover {
        background-color: #ee5500;
 }
 
-span.tag {
+span.refs span {
        padding: 0px 4px;
        font-size: 10px;
        font-weight: normal;
-       background-color: #ffffaa;
        border: 1px solid;
+       background-color: #ffaaff;
+       border-color: #ffccff #ff00ee #ff00ee #ffccff;
+}
+
+span.refs span.ref {
+       background-color: #aaaaff;
+       border-color: #ccccff #0033cc #0033cc #ccccff;
+}
+
+span.refs span.tag {
+       background-color: #ffffaa;
        border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
 }
 
+span.refs span.head {
+       background-color: #aaffaa;
+       border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
+}
+
 span.atnight {
        color: #cc0000;
 }