author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:13:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:27:53 (UTC) |
commit | 6a8749d3bd1570faa3dc07e80efc8fcef5953aa0 (patch) (unidiff) | |
tree | 1c76a6b2434cea448bc8d73f452904d8024a8ccb /cgit.css | |
parent | 8a3685bcf2612206fc24a2421acb53dd83aeab85 (diff) | |
download | cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.zip cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.gz cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.bz2 |
Add commitdiff between commit and each of it's parent
A link is added next to each parent of a commit, leading to the new
diff-functionality in ui-diff.c.
Also added support for a path-parameter to filelevel diffs accessed via the
diffstat.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.css | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -1,322 +1,327 @@ | |||
1 | body { | 1 | body { |
2 | font-family: arial; | 2 | font-family: arial; |
3 | font-size: 11pt; | 3 | font-size: 11pt; |
4 | background: white; | 4 | background: white; |
5 | } | 5 | } |
6 | 6 | ||
7 | body, table { | 7 | body, table { |
8 | padding: 0em; | 8 | padding: 0em; |
9 | margin: 0em; | 9 | margin: 0em; |
10 | } | 10 | } |
11 | 11 | ||
12 | table { | 12 | table { |
13 | border-collapse: collapse; | 13 | border-collapse: collapse; |
14 | } | 14 | } |
15 | 15 | ||
16 | h2 { | 16 | h2 { |
17 | font-size: 120%; | 17 | font-size: 120%; |
18 | font-weight: bold; | 18 | font-weight: bold; |
19 | margin-top: 0em; | 19 | margin-top: 0em; |
20 | margin-bottom: 0.25em; | 20 | margin-bottom: 0.25em; |
21 | } | 21 | } |
22 | 22 | ||
23 | h3 { | 23 | h3 { |
24 | margin-top: 0em; | 24 | margin-top: 0em; |
25 | font-size: 100%; | 25 | font-size: 100%; |
26 | font-weight: normal; | 26 | font-weight: normal; |
27 | } | 27 | } |
28 | 28 | ||
29 | h4 { | 29 | h4 { |
30 | margin-top: 1.5em; | 30 | margin-top: 1.5em; |
31 | margin-bottom: 0.1em; | 31 | margin-bottom: 0.1em; |
32 | font-size: 100%; | 32 | font-size: 100%; |
33 | font-weight: bold; | 33 | font-weight: bold; |
34 | } | 34 | } |
35 | 35 | ||
36 | a { | 36 | a { |
37 | color: blue; | 37 | color: blue; |
38 | text-decoration: none; | 38 | text-decoration: none; |
39 | } | 39 | } |
40 | 40 | ||
41 | a:hover { | 41 | a:hover { |
42 | text-decoration: underline; | 42 | text-decoration: underline; |
43 | } | 43 | } |
44 | 44 | ||
45 | table.list { | 45 | table.list { |
46 | border: none; | 46 | border: none; |
47 | border-collapse: collapse; | 47 | border-collapse: collapse; |
48 | } | 48 | } |
49 | 49 | ||
50 | table.list tr { | 50 | table.list tr { |
51 | background: white; | 51 | background: white; |
52 | } | 52 | } |
53 | 53 | ||
54 | table.list tr:hover { | 54 | table.list tr:hover { |
55 | background: #eee; | 55 | background: #eee; |
56 | } | 56 | } |
57 | 57 | ||
58 | table.list tr.nohover:hover { | 58 | table.list tr.nohover:hover { |
59 | background: white; | 59 | background: white; |
60 | } | 60 | } |
61 | 61 | ||
62 | table.list th { | 62 | table.list th { |
63 | font-weight: normal; | 63 | font-weight: normal; |
64 | border-bottom: solid 1px #777; | 64 | border-bottom: solid 1px #777; |
65 | padding: 0.1em 0.5em 0.1em 0.5em; | 65 | padding: 0.1em 0.5em 0.1em 0.5em; |
66 | vertical-align: baseline; | 66 | vertical-align: baseline; |
67 | } | 67 | } |
68 | 68 | ||
69 | table.list td { | 69 | table.list td { |
70 | border: none; | 70 | border: none; |
71 | padding: 0.1em 0.5em 0.1em 0.5em; | 71 | padding: 0.1em 0.5em 0.1em 0.5em; |
72 | } | 72 | } |
73 | 73 | ||
74 | img { | 74 | img { |
75 | border: none; | 75 | border: none; |
76 | } | 76 | } |
77 | 77 | ||
78 | table#layout { | 78 | table#layout { |
79 | width: 100%; | 79 | width: 100%; |
80 | border-collapse: collapse; | 80 | border-collapse: collapse; |
81 | margin: 0px; | 81 | margin: 0px; |
82 | } | 82 | } |
83 | 83 | ||
84 | td#header, td#logo { | 84 | td#header, td#logo { |
85 | color: #666; | 85 | color: #666; |
86 | background-color: #ddd; | 86 | background-color: #ddd; |
87 | border-bottom: solid 1px #000; | 87 | border-bottom: solid 1px #000; |
88 | } | 88 | } |
89 | 89 | ||
90 | td#header { | 90 | td#header { |
91 | font-size: 150%; | 91 | font-size: 150%; |
92 | font-weight: bold; | 92 | font-weight: bold; |
93 | padding: 0.2em 0.5em; | 93 | padding: 0.2em 0.5em; |
94 | vertical-align: text-bottom; | 94 | vertical-align: text-bottom; |
95 | } | 95 | } |
96 | 96 | ||
97 | td#logo { | 97 | td#logo { |
98 | text-align: right; | 98 | text-align: right; |
99 | vertical-align: middle; | 99 | vertical-align: middle; |
100 | padding-right: 0.5em; | 100 | padding-right: 0.5em; |
101 | } | 101 | } |
102 | 102 | ||
103 | td#crumb, td#search { | 103 | td#crumb, td#search { |
104 | color: #ccc; | 104 | color: #ccc; |
105 | border-top: solid 3px #555; | 105 | border-top: solid 3px #555; |
106 | background-color: #666; | 106 | background-color: #666; |
107 | border-bottom: solid 1px #333; | 107 | border-bottom: solid 1px #333; |
108 | padding: 2px 1em; | 108 | padding: 2px 1em; |
109 | } | 109 | } |
110 | 110 | ||
111 | td#crumb { | 111 | td#crumb { |
112 | font-weight: bold; | 112 | font-weight: bold; |
113 | } | 113 | } |
114 | 114 | ||
115 | td#crumb a { | 115 | td#crumb a { |
116 | color: #ccc; | 116 | color: #ccc; |
117 | } | 117 | } |
118 | 118 | ||
119 | td#crumb a:hover { | 119 | td#crumb a:hover { |
120 | color: #eee; | 120 | color: #eee; |
121 | } | 121 | } |
122 | 122 | ||
123 | td#search { | 123 | td#search { |
124 | text-align: right; | 124 | text-align: right; |
125 | vertical-align: center; | 125 | vertical-align: center; |
126 | padding-right: 0.5em; | 126 | padding-right: 0.5em; |
127 | } | 127 | } |
128 | 128 | ||
129 | td#search form { | 129 | td#search form { |
130 | margin: 0px; | 130 | margin: 0px; |
131 | padding: 0px; | 131 | padding: 0px; |
132 | } | 132 | } |
133 | 133 | ||
134 | td#search input { | 134 | td#search input { |
135 | font-size: 9pt; | 135 | font-size: 9pt; |
136 | padding: 0px; | 136 | padding: 0px; |
137 | width: 10em; | 137 | width: 10em; |
138 | border: solid 1px #333; | 138 | border: solid 1px #333; |
139 | color: #333; | 139 | color: #333; |
140 | background-color: #fff; | 140 | background-color: #fff; |
141 | } | 141 | } |
142 | 142 | ||
143 | td#summary { | 143 | td#summary { |
144 | vertical-align: top; | 144 | vertical-align: top; |
145 | padding-bottom: 1em; | 145 | padding-bottom: 1em; |
146 | } | 146 | } |
147 | 147 | ||
148 | td#archivelist { | 148 | td#archivelist { |
149 | padding-bottom: 1em; | 149 | padding-bottom: 1em; |
150 | } | 150 | } |
151 | 151 | ||
152 | td#archivelist table { | 152 | td#archivelist table { |
153 | float: right; | 153 | float: right; |
154 | border-collapse: collapse; | 154 | border-collapse: collapse; |
155 | border: solid 1px #777; | 155 | border: solid 1px #777; |
156 | } | 156 | } |
157 | 157 | ||
158 | td#archivelist table th { | 158 | td#archivelist table th { |
159 | background-color: #ccc; | 159 | background-color: #ccc; |
160 | } | 160 | } |
161 | 161 | ||
162 | td#content { | 162 | td#content { |
163 | padding: 1em 0.5em; | 163 | padding: 1em 0.5em; |
164 | } | 164 | } |
165 | 165 | ||
166 | div#blob { | 166 | div#blob { |
167 | border: solid 1px black; | 167 | border: solid 1px black; |
168 | } | 168 | } |
169 | 169 | ||
170 | div.error { | 170 | div.error { |
171 | color: red; | 171 | color: red; |
172 | font-weight: bold; | 172 | font-weight: bold; |
173 | margin: 1em 2em; | 173 | margin: 1em 2em; |
174 | } | 174 | } |
175 | 175 | ||
176 | td.ls-blob, td.ls-dir, td.ls-mod { | 176 | td.ls-blob, td.ls-dir, td.ls-mod { |
177 | font-family: monospace; | 177 | font-family: monospace; |
178 | } | 178 | } |
179 | 179 | ||
180 | div.ls-dir a { | 180 | div.ls-dir a { |
181 | font-weight: bold; | 181 | font-weight: bold; |
182 | } | 182 | } |
183 | 183 | ||
184 | th.filesize, td.filesize { | 184 | th.filesize, td.filesize { |
185 | text-align: right; | 185 | text-align: right; |
186 | } | 186 | } |
187 | 187 | ||
188 | td.filesize { | 188 | td.filesize { |
189 | font-family: monospace; | 189 | font-family: monospace; |
190 | } | 190 | } |
191 | 191 | ||
192 | td.filemode { | 192 | td.filemode { |
193 | font-family: monospace; | 193 | font-family: monospace; |
194 | } | 194 | } |
195 | 195 | ||
196 | td.blob { | 196 | td.blob { |
197 | white-space: pre; | 197 | white-space: pre; |
198 | font-family: monospace; | 198 | font-family: monospace; |
199 | background-color: white; | 199 | background-color: white; |
200 | } | 200 | } |
201 | 201 | ||
202 | table.nowrap td { | 202 | table.nowrap td { |
203 | white-space: nowrap; | 203 | white-space: nowrap; |
204 | } | 204 | } |
205 | 205 | ||
206 | table.commit-info { | 206 | table.commit-info { |
207 | border-collapse: collapse; | 207 | border-collapse: collapse; |
208 | margin-top: 1.5em; | 208 | margin-top: 1.5em; |
209 | } | 209 | } |
210 | 210 | ||
211 | table.commit-info th { | 211 | table.commit-info th { |
212 | text-align: left; | 212 | text-align: left; |
213 | font-weight: normal; | 213 | font-weight: normal; |
214 | padding: 0.1em 1em 0.1em 0.1em; | 214 | padding: 0.1em 1em 0.1em 0.1em; |
215 | } | 215 | } |
216 | 216 | ||
217 | table.commit-info td { | 217 | table.commit-info td { |
218 | font-weight: normal; | 218 | font-weight: normal; |
219 | padding: 0.1em 1em 0.1em 0.1em; | 219 | padding: 0.1em 1em 0.1em 0.1em; |
220 | } | 220 | } |
221 | 221 | ||
222 | div.commit-subject { | 222 | div.commit-subject { |
223 | font-weight: bold; | 223 | font-weight: bold; |
224 | font-size: 125%; | 224 | font-size: 125%; |
225 | margin: 1.5em 0em 0.5em 0em; | 225 | margin: 1.5em 0em 0.5em 0em; |
226 | padding: 0em; | 226 | padding: 0em; |
227 | } | 227 | } |
228 | 228 | ||
229 | div.commit-msg { | 229 | div.commit-msg { |
230 | white-space: pre; | 230 | white-space: pre; |
231 | font-family: monospace; | 231 | font-family: monospace; |
232 | } | 232 | } |
233 | 233 | ||
234 | table.diffstat { | 234 | table.diffstat { |
235 | border-collapse: collapse; | 235 | border-collapse: collapse; |
236 | margin-top: 1.5em; | 236 | margin-top: 1.5em; |
237 | width: 100%; | 237 | width: 100%; |
238 | border: solid 1px #aaa; | 238 | border: solid 1px #aaa; |
239 | } | 239 | } |
240 | 240 | ||
241 | table.diffstat tr:hover { | 241 | table.diffstat tr:hover { |
242 | background-color: #eee; | 242 | background-color: #eee; |
243 | } | 243 | } |
244 | 244 | ||
245 | table.diffstat th { | 245 | table.diffstat th { |
246 | font-weight: normal; | 246 | font-weight: normal; |
247 | text-align: left; | 247 | text-align: left; |
248 | text-decoration: underline; | 248 | text-decoration: underline; |
249 | padding: 0.1em 1em 0.1em 0.1em; | 249 | padding: 0.1em 1em 0.1em 0.1em; |
250 | font-size: 100%; | 250 | font-size: 100%; |
251 | } | 251 | } |
252 | 252 | ||
253 | table.diffstat td { | 253 | table.diffstat td { |
254 | padding: 0.2em 0.2em 0.1em 0.1em; | 254 | padding: 0.2em 0.2em 0.1em 0.1em; |
255 | font-size: 100%; | 255 | font-size: 100%; |
256 | border: none; | 256 | border: none; |
257 | border-top: solid 1px #aaa; | 257 | border-top: solid 1px #aaa; |
258 | border-bottom: solid 1px #aaa; | 258 | border-bottom: solid 1px #aaa; |
259 | } | 259 | } |
260 | 260 | ||
261 | table.diffstat td span.modechange { | 261 | table.diffstat td span.modechange { |
262 | padding-left: 1em; | 262 | padding-left: 1em; |
263 | color: red; | 263 | color: red; |
264 | } | 264 | } |
265 | 265 | ||
266 | table.diffstat td.add a { | 266 | table.diffstat td.add a { |
267 | color: green; | 267 | color: green; |
268 | } | 268 | } |
269 | 269 | ||
270 | table.diffstat td.del a { | 270 | table.diffstat td.del a { |
271 | color: red; | 271 | color: red; |
272 | } | 272 | } |
273 | 273 | ||
274 | table.diffstat td.upd a { | 274 | table.diffstat td.upd a { |
275 | color: blue; | 275 | color: blue; |
276 | } | 276 | } |
277 | 277 | ||
278 | table.diffstat td.graph { | 278 | table.diffstat td.graph { |
279 | width: 75%; | 279 | width: 75%; |
280 | vertical-align: center; | 280 | vertical-align: center; |
281 | } | 281 | } |
282 | 282 | ||
283 | table.diffstat td.graph img { | 283 | table.diffstat td.graph img { |
284 | border: none; | 284 | border: none; |
285 | height: 11pt; | 285 | height: 11pt; |
286 | } | 286 | } |
287 | 287 | ||
288 | div.diffstat-summary { | 288 | div.diffstat-summary { |
289 | color: #888; | 289 | color: #888; |
290 | padding-top: 0.5em; | 290 | padding-top: 0.5em; |
291 | } | 291 | } |
292 | 292 | ||
293 | table.diff th { | ||
294 | padding: 1em 0em 0.1em 0.1em; | ||
295 | text-align: left; | ||
296 | } | ||
297 | |||
293 | table.diff td { | 298 | table.diff td { |
294 | border: solid 1px black; | 299 | border: solid 1px black; |
295 | font-family: monospace; | 300 | font-family: monospace; |
296 | white-space: pre; | 301 | white-space: pre; |
297 | } | 302 | } |
298 | 303 | ||
299 | table.diff td div.hunk { | 304 | table.diff td div.hunk { |
300 | background: #ccc; | 305 | background: #ccc; |
301 | } | 306 | } |
302 | 307 | ||
303 | table.diff td div.add { | 308 | table.diff td div.add { |
304 | color: green; | 309 | color: green; |
305 | } | 310 | } |
306 | 311 | ||
307 | table.diff td div.del { | 312 | table.diff td div.del { |
308 | color: red; | 313 | color: red; |
309 | } | 314 | } |
310 | 315 | ||
311 | .sha1 { | 316 | .sha1 { |
312 | font-family: courier; | 317 | font-family: courier; |
313 | font-size: 90%; | 318 | font-size: 90%; |
314 | } | 319 | } |
315 | 320 | ||
316 | .left { | 321 | .left { |
317 | text-align: left; | 322 | text-align: left; |
318 | } | 323 | } |
319 | 324 | ||
320 | .right { | 325 | .right { |
321 | text-align: right; | 326 | text-align: right; |
322 | } | 327 | } |