author | Lars Hjemli <hjemli@gmail.com> | 2006-12-20 21:48:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-20 21:48:27 (UTC) |
commit | 36aba00273e7af1b94bf8c5dd5068709d983d01e (patch) (unidiff) | |
tree | d9be4e6f27b115a799af40cad43445f63fbf2238 /cgit.css | |
parent | a53042865a4ac8b1fa1d6b37720787601e181495 (diff) | |
download | cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.zip cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.tar.gz cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.tar.bz2 |
Add basic diff view
Finally, xdiff is used to show per-file diffs via commit view.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 25 |
1 files changed, 25 insertions, 0 deletions
@@ -56,54 +56,60 @@ div#header { | |||
56 | font-weight: bold; | 56 | font-weight: bold; |
57 | border: solid 1px #ccc; | 57 | border: solid 1px #ccc; |
58 | vertical-align: middle; | 58 | vertical-align: middle; |
59 | } | 59 | } |
60 | div#header img#logo { | 60 | div#header img#logo { |
61 | float: right; | 61 | float: right; |
62 | } | 62 | } |
63 | div#header a { | 63 | div#header a { |
64 | color: black; | 64 | color: black; |
65 | } | 65 | } |
66 | 66 | ||
67 | div#content { | 67 | div#content { |
68 | margin: 0.5em 0.5em; | 68 | margin: 0.5em 0.5em; |
69 | } | 69 | } |
70 | 70 | ||
71 | div#blob { | 71 | div#blob { |
72 | border: solid 1px black; | 72 | border: solid 1px black; |
73 | } | 73 | } |
74 | 74 | ||
75 | div.error { | 75 | div.error { |
76 | color: red; | 76 | color: red; |
77 | font-weight: bold; | 77 | font-weight: bold; |
78 | margin: 1em 2em; | 78 | margin: 1em 2em; |
79 | } | 79 | } |
80 | div.ls-blob, div.ls-dir { | ||
81 | font-family: monospace; | ||
82 | } | ||
80 | div.ls-dir a { | 83 | div.ls-dir a { |
81 | font-weight: bold; | 84 | font-weight: bold; |
82 | } | 85 | } |
83 | th.filesize, td.filesize { | 86 | th.filesize, td.filesize { |
84 | text-align: right; | 87 | text-align: right; |
85 | } | 88 | } |
89 | td.filesize { | ||
90 | font-family: monospace; | ||
91 | } | ||
86 | td.filemode { | 92 | td.filemode { |
87 | font-family: monospace; | 93 | font-family: monospace; |
88 | } | 94 | } |
89 | 95 | ||
90 | td.blob { | 96 | td.blob { |
91 | white-space: pre; | 97 | white-space: pre; |
92 | font-family: courier; | 98 | font-family: courier; |
93 | font-size: 100%; | 99 | font-size: 100%; |
94 | background-color: white; | 100 | background-color: white; |
95 | } | 101 | } |
96 | 102 | ||
97 | table.log td { | 103 | table.log td { |
98 | white-space: nowrap; | 104 | white-space: nowrap; |
99 | } | 105 | } |
100 | 106 | ||
101 | table.commit-info { | 107 | table.commit-info { |
102 | border-collapse: collapse; | 108 | border-collapse: collapse; |
103 | margin-top: 1.5em; | 109 | margin-top: 1.5em; |
104 | } | 110 | } |
105 | table.commit-info th { | 111 | table.commit-info th { |
106 | text-align: left; | 112 | text-align: left; |
107 | font-weight: normal; | 113 | font-weight: normal; |
108 | padding: 0.1em 1em 0.1em 0.1em; | 114 | padding: 0.1em 1em 0.1em 0.1em; |
109 | } | 115 | } |
@@ -133,34 +139,53 @@ table.diffstat th { | |||
133 | font-size: 100%; | 139 | font-size: 100%; |
134 | } | 140 | } |
135 | table.diffstat td { | 141 | table.diffstat td { |
136 | padding: 0.1em 1em 0.1em 0.1em; | 142 | padding: 0.1em 1em 0.1em 0.1em; |
137 | font-size: 100%; | 143 | font-size: 100%; |
138 | } | 144 | } |
139 | table.diffstat td span.modechange { | 145 | table.diffstat td span.modechange { |
140 | padding-left: 1em; | 146 | padding-left: 1em; |
141 | color: red; | 147 | color: red; |
142 | } | 148 | } |
143 | table.diffstat td.add a { | 149 | table.diffstat td.add a { |
144 | color: green; | 150 | color: green; |
145 | } | 151 | } |
146 | table.diffstat td.del a { | 152 | table.diffstat td.del a { |
147 | color: red; | 153 | color: red; |
148 | } | 154 | } |
149 | table.diffstat td.upd a { | 155 | table.diffstat td.upd a { |
150 | color: blue; | 156 | color: blue; |
151 | } | 157 | } |
152 | table.diffstat td.summary { | 158 | table.diffstat td.summary { |
153 | /* border-top: solid 1px black; */ | 159 | /* border-top: solid 1px black; */ |
154 | color: #888; | 160 | color: #888; |
155 | padding-top: 0.5em; | 161 | padding-top: 0.5em; |
156 | } | 162 | } |
163 | |||
164 | table.diff td { | ||
165 | border: solid 1px black; | ||
166 | font-family: monospace; | ||
167 | white-space: pre; | ||
168 | } | ||
169 | |||
170 | table.diff td div.hunk { | ||
171 | background: #ccc; | ||
172 | } | ||
173 | |||
174 | table.diff td div.add { | ||
175 | color: green; | ||
176 | } | ||
177 | |||
178 | table.diff td div.del { | ||
179 | color: red; | ||
180 | } | ||
181 | |||
157 | .sha1 { | 182 | .sha1 { |
158 | font-family: courier; | 183 | font-family: courier; |
159 | font-size: 90%; | 184 | font-size: 90%; |
160 | } | 185 | } |
161 | .left { | 186 | .left { |
162 | text-align: left; | 187 | text-align: left; |
163 | } | 188 | } |
164 | .right { | 189 | .right { |
165 | text-align: right; | 190 | text-align: right; |
166 | } | 191 | } |