2006-06-18 08:45:03 +02:00
|
|
|
body {
|
2006-06-20 16:58:12 +02:00
|
|
|
font-family: sans-serif;
|
2007-05-16 01:59:55 +02:00
|
|
|
font-size: small;
|
2006-06-21 09:48:02 +02:00
|
|
|
border: solid #d9d8d1;
|
2006-06-20 16:58:12 +02:00
|
|
|
border-width: 1px;
|
|
|
|
|
margin: 10px;
|
|
|
|
|
background-color: #ffffff;
|
|
|
|
|
color: #000000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #0000cc;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a:hover, a:visited, a:active {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #880000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-11-08 11:48:56 +01:00
|
|
|
span.cntrl {
|
|
|
|
|
border: dashed #aaaaaa;
|
|
|
|
|
border-width: 1px;
|
|
|
|
|
padding: 0px 2px 0px 2px;
|
|
|
|
|
margin: 0px 2px 0px 2px;
|
|
|
|
|
}
|
|
|
|
|
|
2006-10-06 12:31:05 +02:00
|
|
|
img.logo {
|
|
|
|
|
float: right;
|
|
|
|
|
border-width: 0px;
|
|
|
|
|
}
|
|
|
|
|
|
2009-06-30 00:00:51 +02:00
|
|
|
img.avatar {
|
|
|
|
|
vertical-align: middle;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-17 15:25:13 +01:00
|
|
|
img.blob {
|
|
|
|
|
max-height: 100%;
|
|
|
|
|
max-width: 100%;
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-16 06:14:59 +02:00
|
|
|
a.list img.avatar {
|
|
|
|
|
border-style: none;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
div.page_header {
|
2006-06-20 16:58:12 +02:00
|
|
|
height: 25px;
|
|
|
|
|
padding: 8px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 150%;
|
2006-06-20 16:58:12 +02:00
|
|
|
font-weight: bold;
|
|
|
|
|
background-color: #d9d8d1;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_header a:visited, a.header {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #0000cc;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_header a:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #880000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_nav {
|
2006-06-21 09:48:02 +02:00
|
|
|
padding: 8px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_nav a:visited {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #0000cc;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_path {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 8px;
|
2006-08-22 12:38:59 +02:00
|
|
|
font-weight: bold;
|
2006-06-20 16:58:12 +02:00
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 0px 0px 1px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_footer {
|
2013-08-20 18:59:03 +02:00
|
|
|
height: 22px;
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 4px 8px;
|
|
|
|
|
background-color: #d9d8d1;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.page_footer_text {
|
2013-08-20 18:59:03 +02:00
|
|
|
line-height: 22px;
|
2006-06-20 16:58:12 +02:00
|
|
|
float: left;
|
|
|
|
|
color: #555555;
|
|
|
|
|
font-style: italic;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2009-09-01 13:39:16 +02:00
|
|
|
div#generating_info {
|
|
|
|
|
margin: 4px;
|
|
|
|
|
font-size: smaller;
|
|
|
|
|
text-align: center;
|
|
|
|
|
color: #505050;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
div.page_body {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 8px;
|
2006-07-13 21:36:22 +02:00
|
|
|
font-family: monospace;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-06-17 11:23:56 +02:00
|
|
|
div.title, a.title {
|
2006-06-20 16:58:12 +02:00
|
|
|
display: block;
|
|
|
|
|
padding: 6px 8px;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
background-color: #edece6;
|
|
|
|
|
text-decoration: none;
|
|
|
|
|
color: #000000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2007-11-19 14:16:12 +01:00
|
|
|
div.readme {
|
|
|
|
|
padding: 8px;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
a.title:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
background-color: #d9d8d1;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.title_text {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 6px 0px;
|
|
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 0px 0px 1px;
|
2006-07-13 21:36:22 +02:00
|
|
|
font-family: monospace;
|
2006-06-17 11:23:56 +02:00
|
|
|
}
|
2006-06-19 20:27:59 +02:00
|
|
|
|
|
|
|
|
div.log_body {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 8px 8px 8px 150px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
span.age {
|
2006-06-20 16:58:12 +02:00
|
|
|
position: relative;
|
|
|
|
|
float: left;
|
|
|
|
|
width: 142px;
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
|
|
|
|
|
2007-03-24 20:59:13 +01:00
|
|
|
span.signoff {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #888888;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-06-17 11:23:56 +02:00
|
|
|
div.log_link {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 0px 8px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 70%;
|
2006-06-20 16:58:12 +02:00
|
|
|
font-family: sans-serif;
|
|
|
|
|
font-style: normal;
|
|
|
|
|
position: relative;
|
|
|
|
|
float: left;
|
|
|
|
|
width: 136px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.list_head {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 6px 8px 4px;
|
|
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 1px 0px 0px;
|
|
|
|
|
font-style: italic;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2009-06-30 00:00:48 +02:00
|
|
|
.author_date, .author {
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-28 14:48:12 +02:00
|
|
|
div.author_date {
|
|
|
|
|
padding: 8px;
|
|
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 0px 0px 1px 0px;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
a.list {
|
2006-06-20 16:58:12 +02:00
|
|
|
text-decoration: none;
|
|
|
|
|
color: #000000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-08-22 12:38:59 +02:00
|
|
|
a.subject, a.name {
|
2006-08-22 12:02:48 +02:00
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.tags a.subject {
|
2006-08-14 02:08:27 +02:00
|
|
|
font-weight: normal;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
a.list:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
text-decoration: underline;
|
|
|
|
|
color: #880000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.text {
|
2006-06-20 16:58:12 +02:00
|
|
|
text-decoration: none;
|
|
|
|
|
color: #0000cc;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.text:visited {
|
2006-06-20 16:58:12 +02:00
|
|
|
text-decoration: none;
|
|
|
|
|
color: #880000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.text:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
text-decoration: underline;
|
|
|
|
|
color: #880000;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 8px 4px;
|
|
|
|
|
border-spacing: 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-13 21:36:22 +02:00
|
|
|
table.diff_tree {
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-08 13:24:56 +02:00
|
|
|
table.combined.diff_tree th {
|
|
|
|
|
text-align: center;
|
|
|
|
|
}
|
|
|
|
|
|
gitweb: Add combined diff support to git_difftree_body
You have to pass all parents as final parameters of git_difftree_body
subroutine; the number of parents of a diff must be equal to the
number derived from parsing git-diff-tree output, raw combined diff
for git_difftree_body to display combined diff correctly (but it is
not checked).
Currently the possibility of displaying diffree of combined diff is
not used in gitweb code; git_difftree_body is always caled for
ordinary diff, and with only one parent.
Description of output for combined diff:
----------------------------------------
The difftree table for combined diff starts with a cell with pathname
of changed blob (changed file), which if possible is hidden link
(class="list") to the 'blob' view of final version (if it exists),
like for difftree for ordinary diff. If file was deleted in the final
commit then filename is not hyperlinked.
There is no cell with single file status (new, deleted, mode change,
rename), as for combined diff as there is no single status: different
parents might have different status.
If git_difftree_body was called from git_commitdiff (for 'commitdiff'
action) there is inner link to anchor to appropriate fragment (patch)
in patchset body; the "patch" link does not replace "diff" link like
for ordinary diff.
Each of "diff" links is in separate cell, contrary to output for
ordinary diff in which all links are (at least for now) in a single
cell.
For each parent, if file was not present we leave cell empty. If file
was deleted in the result, we provide link to 'blob' view. Otherwise
we provide link to 'commitdiff' view, even if patch (diff) consist
only of extended diff header, and contents is not changed (pure
rename, pure mode change). The only difference is that link to
"blobdiff" view with no contents change is with 'nochange' class.
At last, there is provided link to current version of file as "blob"
link, if the file was not deleted in the result, and lik to history of
a file, if there exists one. (The link to file history might be
confused, at least for now, by renames.)
Note that git-diff-tree raw output dor combined diff does not provide
filename before change for renames and copies; we use
git_get_path_by_hash to get "src" filename for renames (this means
additional call to git-ls-tree for a _whole_ tree).
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-07 01:10:04 +02:00
|
|
|
table.combined.diff_tree td {
|
|
|
|
|
padding-right: 24px;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-08 13:24:56 +02:00
|
|
|
table.combined.diff_tree th.link,
|
gitweb: Add combined diff support to git_difftree_body
You have to pass all parents as final parameters of git_difftree_body
subroutine; the number of parents of a diff must be equal to the
number derived from parsing git-diff-tree output, raw combined diff
for git_difftree_body to display combined diff correctly (but it is
not checked).
Currently the possibility of displaying diffree of combined diff is
not used in gitweb code; git_difftree_body is always caled for
ordinary diff, and with only one parent.
Description of output for combined diff:
----------------------------------------
The difftree table for combined diff starts with a cell with pathname
of changed blob (changed file), which if possible is hidden link
(class="list") to the 'blob' view of final version (if it exists),
like for difftree for ordinary diff. If file was deleted in the final
commit then filename is not hyperlinked.
There is no cell with single file status (new, deleted, mode change,
rename), as for combined diff as there is no single status: different
parents might have different status.
If git_difftree_body was called from git_commitdiff (for 'commitdiff'
action) there is inner link to anchor to appropriate fragment (patch)
in patchset body; the "patch" link does not replace "diff" link like
for ordinary diff.
Each of "diff" links is in separate cell, contrary to output for
ordinary diff in which all links are (at least for now) in a single
cell.
For each parent, if file was not present we leave cell empty. If file
was deleted in the result, we provide link to 'blob' view. Otherwise
we provide link to 'commitdiff' view, even if patch (diff) consist
only of extended diff header, and contents is not changed (pure
rename, pure mode change). The only difference is that link to
"blobdiff" view with no contents change is with 'nochange' class.
At last, there is provided link to current version of file as "blob"
link, if the file was not deleted in the result, and lik to history of
a file, if there exists one. (The link to file history might be
confused, at least for now, by renames.)
Note that git-diff-tree raw output dor combined diff does not provide
filename before change for renames and copies; we use
git_get_path_by_hash to get "src" filename for renames (this means
additional call to git-ls-tree for a _whole_ tree).
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-07 01:10:04 +02:00
|
|
|
table.combined.diff_tree td.link {
|
|
|
|
|
padding: 0px 2px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.combined.diff_tree td.nochange a {
|
|
|
|
|
color: #6666ff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.combined.diff_tree td.nochange a:hover,
|
|
|
|
|
table.combined.diff_tree td.nochange a:visited {
|
|
|
|
|
color: #d06666;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
table.blame {
|
|
|
|
|
border-collapse: collapse;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-10-05 22:30:31 +02:00
|
|
|
table.blame td {
|
|
|
|
|
padding: 0px 5px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 100%;
|
2006-10-05 22:30:31 +02:00
|
|
|
vertical-align: top;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
th {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 2px 5px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 100%;
|
2006-06-20 16:58:12 +02:00
|
|
|
text-align: left;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2009-07-25 00:44:06 +02:00
|
|
|
/* do not change row style on hover for 'blame' view */
|
|
|
|
|
tr.light,
|
|
|
|
|
table.blame .light:hover {
|
|
|
|
|
background-color: #ffffff;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2009-07-25 00:44:06 +02:00
|
|
|
tr.dark,
|
|
|
|
|
table.blame .dark:hover {
|
2006-08-05 00:09:59 +02:00
|
|
|
background-color: #f6f6f0;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-25 00:44:06 +02:00
|
|
|
/* currently both use the same, but it can change */
|
|
|
|
|
tr.light:hover,
|
2006-06-19 20:27:59 +02:00
|
|
|
tr.dark:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
background-color: #edece6;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2009-07-25 00:44:06 +02:00
|
|
|
/* boundary commits in 'blame' view */
|
|
|
|
|
/* and commits without "previous" */
|
2009-07-25 00:44:04 +02:00
|
|
|
tr.boundary td.sha1,
|
|
|
|
|
tr.no-previous td.linenr {
|
2009-07-25 00:44:02 +02:00
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
2009-09-01 13:39:18 +02:00
|
|
|
/* for 'blame_incremental', during processing */
|
|
|
|
|
tr.color1 { background-color: #f6fff6; }
|
|
|
|
|
tr.color2 { background-color: #f6f6ff; }
|
|
|
|
|
tr.color3 { background-color: #fff6f6; }
|
|
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
td {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 2px 5px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 100%;
|
2006-06-20 16:58:12 +02:00
|
|
|
vertical-align: top;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-07-31 11:22:13 +02:00
|
|
|
td.link, td.selflink {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 2px 5px;
|
|
|
|
|
font-family: sans-serif;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 70%;
|
2006-06-20 16:58:12 +02:00
|
|
|
}
|
|
|
|
|
|
2006-07-31 11:22:13 +02:00
|
|
|
td.selflink {
|
|
|
|
|
padding-right: 0px;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
td.sha1 {
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-25 00:44:01 +02:00
|
|
|
.error {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: red;
|
|
|
|
|
background-color: yellow;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-31 11:22:13 +02:00
|
|
|
td.current_head {
|
|
|
|
|
text-decoration: underline;
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-29 19:52:01 +02:00
|
|
|
td.category {
|
|
|
|
|
background-color: #d9d8d1;
|
|
|
|
|
border-top: 1px solid #000000;
|
|
|
|
|
border-left: 1px solid #000000;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
table.diff_tree span.file_status.new {
|
|
|
|
|
color: #008000;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.diff_tree span.file_status.deleted {
|
|
|
|
|
color: #c00000;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.diff_tree span.file_status.moved,
|
|
|
|
|
table.diff_tree span.file_status.mode_chnge {
|
|
|
|
|
color: #777777;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-14 02:18:33 +02:00
|
|
|
table.diff_tree span.file_status.copied {
|
|
|
|
|
color: #70a070;
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-29 00:15:22 +02:00
|
|
|
/* noage: "No commits" */
|
|
|
|
|
table.project_list td.noage {
|
|
|
|
|
color: #808080;
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
/* age2: 60*60*24*2 <= age */
|
|
|
|
|
table.project_list td.age2, table.blame td.age2 {
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* age1: 60*60*2 <= age < 60*60*24*2 */
|
|
|
|
|
table.project_list td.age1 {
|
|
|
|
|
color: #009900;
|
|
|
|
|
font-style: italic;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
table.blame td.age1 {
|
|
|
|
|
color: #009900;
|
|
|
|
|
background: transparent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* age0: age < 60*60*2 */
|
|
|
|
|
table.project_list td.age0 {
|
|
|
|
|
color: #009900;
|
|
|
|
|
font-style: italic;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
table.blame td.age0 {
|
|
|
|
|
color: #009900;
|
|
|
|
|
background: transparent;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
td.pre, div.pre, div.diff {
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
font-size: 12px;
|
|
|
|
|
white-space: pre;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
td.mode {
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
}
|
|
|
|
|
|
gitweb: Incremental blame (using JavaScript)
Add 'blame_incremental' view, which uses "git blame --incremental"
and JavaScript (Ajax), where 'blame' use "git blame --porcelain".
* gitweb generates initial info by putting file contents (from
"git cat-file") together with line numbers in blame table
* then gitweb makes web browser JavaScript engine call startBlame()
function from gitweb.js
* startBlame() opens XMLHttpRequest connection to 'blame_data' view,
which in turn calls "git blame --incremental" for a file, and
streams output of git-blame to JavaScript (gitweb.js)
* XMLHttpRequest event handler updates line info in blame view as soon
as it gets data from 'blame_data' (from server), and it also updates
progress info
* when 'blame_data' ends, and gitweb.js finishes updating line info,
it fixes colors to match (as far as possible) ordinary 'blame' view,
and updates information about how long it took to generate page.
Gitweb deals with streamed 'blame_data' server errors by displaying
them in the progress info area (just in case).
The 'blame_incremental' view tries to be equivalent to 'blame' action;
there are however a few differences in output between 'blame' and
'blame_incremental' view:
* 'blame_incremental' always used query form for this part of link(s)
which is generated by JavaScript code. The difference is visible
if we use path_info link (pass some or all arguments in path_info).
Changing this would require implementing something akin to href()
subroutine from gitweb.perl in JavaScript (in gitweb.js).
* 'blame_incremental' always uses "rowspan" attribute, even if
rowspan="1". This simplifies code, and is not visible to user.
* The progress bar and progress info are still there even after
JavaScript part of 'blame_incremental' finishes work.
Note that currently no link generated by gitweb leads to this new view.
This code is based on patch by Petr Baudis <pasky@suse.cz> patch, which
in turn was tweaked up version of Fredrik Kuivinen <frekui@gmail.com>'s
proof of concept patch.
This patch adds GITWEB_JS compile configuration option, and modifies
git-instaweb.sh to take gitweb.js into account. The code for
git-instaweb.sh was taken from Pasky's patch.
Signed-off-by: Fredrik Kuivinen <frekui@gmail.com>
Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-01 13:39:17 +02:00
|
|
|
/* progress of blame_interactive */
|
|
|
|
|
div#progress_bar {
|
|
|
|
|
height: 2px;
|
|
|
|
|
margin-bottom: -2px;
|
|
|
|
|
background-color: #d8d9d0;
|
|
|
|
|
}
|
|
|
|
|
div#progress_info {
|
|
|
|
|
float: right;
|
|
|
|
|
text-align: right;
|
2006-06-20 16:58:12 +02:00
|
|
|
}
|
|
|
|
|
|
2009-09-07 14:40:00 +02:00
|
|
|
/* format of (optional) objects size in 'tree' view */
|
|
|
|
|
td.size {
|
|
|
|
|
font-family: monospace;
|
|
|
|
|
text-align: right;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-08 17:59:41 +01:00
|
|
|
/* styling of diffs (patchsets): commitdiff and blobdiff views */
|
|
|
|
|
div.diff.header,
|
|
|
|
|
div.diff.extended_header {
|
|
|
|
|
white-space: normal;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.header {
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
|
|
|
|
|
background-color: #edece6;
|
|
|
|
|
|
|
|
|
|
margin-top: 4px;
|
|
|
|
|
padding: 4px 0px 2px 0px;
|
|
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 1px 0px 1px 0px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.header a.path {
|
|
|
|
|
text-decoration: underline;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.extended_header,
|
|
|
|
|
div.diff.extended_header a.path,
|
|
|
|
|
div.diff.extended_header a.hash {
|
|
|
|
|
color: #777777;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.extended_header .info {
|
|
|
|
|
color: #b0b0b0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.extended_header {
|
|
|
|
|
background-color: #f6f5ee;
|
|
|
|
|
padding: 2px 0px 2px 0px;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-18 23:35:40 +01:00
|
|
|
div.diff a.list,
|
2006-11-08 17:59:41 +01:00
|
|
|
div.diff a.path,
|
|
|
|
|
div.diff a.hash {
|
2006-08-25 21:05:07 +02:00
|
|
|
text-decoration: none;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-18 23:35:40 +01:00
|
|
|
div.diff a.list:hover,
|
2006-11-08 17:59:41 +01:00
|
|
|
div.diff a.path:hover,
|
|
|
|
|
div.diff a.hash:hover {
|
2006-08-25 21:05:07 +02:00
|
|
|
text-decoration: underline;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-08 17:59:41 +01:00
|
|
|
div.diff.to_file a.path,
|
|
|
|
|
div.diff.to_file {
|
|
|
|
|
color: #007000;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
div.diff.add {
|
|
|
|
|
color: #008800;
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-11 23:18:43 +02:00
|
|
|
div.diff.add span.marked {
|
|
|
|
|
background-color: #aaffaa;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-08 17:59:41 +01:00
|
|
|
div.diff.from_file a.path,
|
|
|
|
|
div.diff.from_file {
|
|
|
|
|
color: #aa0000;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
div.diff.rem {
|
|
|
|
|
color: #cc0000;
|
|
|
|
|
}
|
|
|
|
|
|
2012-04-11 23:18:43 +02:00
|
|
|
div.diff.rem span.marked {
|
|
|
|
|
background-color: #ffaaaa;
|
|
|
|
|
}
|
|
|
|
|
|
2006-11-18 23:35:40 +01:00
|
|
|
div.diff.chunk_header a,
|
2006-06-20 16:58:12 +02:00
|
|
|
div.diff.chunk_header {
|
|
|
|
|
color: #990099;
|
2006-11-18 23:35:40 +01:00
|
|
|
}
|
2006-11-08 17:59:41 +01:00
|
|
|
|
2006-11-18 23:35:40 +01:00
|
|
|
div.diff.chunk_header {
|
2006-11-08 17:59:41 +01:00
|
|
|
border: dotted #ffe0ff;
|
|
|
|
|
border-width: 1px 0px 0px 0px;
|
|
|
|
|
margin-top: 2px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-11-18 23:35:40 +01:00
|
|
|
div.diff.chunk_header span.chunk_info {
|
|
|
|
|
background-color: #ffeeff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.diff.chunk_header span.section {
|
|
|
|
|
color: #aa22aa;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-24 01:58:49 +02:00
|
|
|
div.diff.incomplete {
|
|
|
|
|
color: #cccccc;
|
|
|
|
|
}
|
|
|
|
|
|
2007-04-23 07:49:25 +02:00
|
|
|
div.diff.nodifferences {
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
color: #600000;
|
|
|
|
|
}
|
2006-06-19 20:27:59 +02:00
|
|
|
|
2011-10-31 00:36:22 +01:00
|
|
|
/* side-by-side diff */
|
|
|
|
|
div.chunk_block {
|
|
|
|
|
overflow: hidden;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.chunk_block div.old {
|
|
|
|
|
float: left;
|
|
|
|
|
width: 50%;
|
|
|
|
|
overflow: hidden;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.chunk_block div.new {
|
|
|
|
|
margin-left: 50%;
|
|
|
|
|
width: 50%;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-31 00:36:23 +01:00
|
|
|
div.chunk_block.rem div.old div.diff.rem {
|
|
|
|
|
background-color: #fff5f5;
|
|
|
|
|
}
|
|
|
|
|
div.chunk_block.add div.new div.diff.add {
|
|
|
|
|
background-color: #f8fff8;
|
|
|
|
|
}
|
|
|
|
|
div.chunk_block.chg div div.diff {
|
|
|
|
|
background-color: #fffff0;
|
|
|
|
|
}
|
|
|
|
|
div.chunk_block.ctx div div.diff.ctx {
|
|
|
|
|
color: #404040;
|
|
|
|
|
}
|
|
|
|
|
|
2011-10-31 00:36:22 +01:00
|
|
|
|
2006-06-19 20:27:59 +02:00
|
|
|
div.index_include {
|
2006-06-20 16:58:12 +02:00
|
|
|
border: solid #d9d8d1;
|
|
|
|
|
border-width: 0px 0px 1px;
|
|
|
|
|
padding: 12px 8px;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.search {
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 100%;
|
2006-10-24 05:15:46 +02:00
|
|
|
font-weight: normal;
|
2006-06-20 16:58:12 +02:00
|
|
|
margin: 4px 8px;
|
2007-08-26 21:31:32 +02:00
|
|
|
float: right;
|
2006-06-20 16:58:12 +02:00
|
|
|
top: 56px;
|
|
|
|
|
right: 12px
|
|
|
|
|
}
|
|
|
|
|
|
2012-01-31 01:20:54 +01:00
|
|
|
div.projsearch {
|
2008-10-03 09:29:45 +02:00
|
|
|
text-align: center;
|
2012-01-31 01:20:54 +01:00
|
|
|
margin: 20px 0px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
div.projsearch form {
|
|
|
|
|
margin-bottom: 2px;
|
2008-10-03 09:29:45 +02:00
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
td.linenr {
|
|
|
|
|
text-align: right;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.linenr {
|
2006-06-20 16:58:12 +02:00
|
|
|
color: #999999;
|
|
|
|
|
text-decoration: none
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2006-06-17 11:23:56 +02:00
|
|
|
a.rss_logo {
|
2006-06-20 16:58:12 +02:00
|
|
|
float: right;
|
2013-08-20 18:59:02 +02:00
|
|
|
padding: 3px 5px;
|
2006-06-20 16:58:12 +02:00
|
|
|
line-height: 10px;
|
|
|
|
|
border: 1px solid;
|
|
|
|
|
border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e;
|
|
|
|
|
color: #ffffff;
|
|
|
|
|
background-color: #ff6600;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
font-family: sans-serif;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 70%;
|
2006-06-20 16:58:12 +02:00
|
|
|
text-align: center;
|
|
|
|
|
text-decoration: none;
|
2006-06-19 20:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.rss_logo:hover {
|
2006-06-20 16:58:12 +02:00
|
|
|
background-color: #ee5500;
|
2006-06-17 11:23:56 +02:00
|
|
|
}
|
2006-06-19 20:27:59 +02:00
|
|
|
|
gitweb: Use feed link according to current view
Michael G. Noll said in comments to the "Switching my code repository from
Subversion (SVN) to git" article (http://tinyurl.com/37v67l) in his "My
digital moleskine" blog, that one of the things he is missing in gitweb
from SVN::Web is an RSS feed with news/information of the current view
(including RSS feed for single file or directory).
This is not exactly true, as since refactoring feed generation in af6feeb
(gitweb: Refactor feed generation, make output prettier, add Atom feed,
2006-11-19), gitweb can generate feeds (RSS or Atom) for history of a
given branch, history limited to a given directory, or history of a given
file. Nevertheless this required handcrafting the URL to get wanted RSS
feed.
This commit makes gitweb select feed links in the HTML header and in
page footer depending on current view (action). It is more elaborate,
and I guess more correct, than simple patch adding $hash ('h')
parameter to *all* URLs, including feed links, by Jean-Baptiste Quenot
Subject: [PATCH] gitweb: Add hash parameter in feed URL when a hash
is specified in the current request
Message-ID: <ae63f8b50803211138y6355fd11pa64cda50a1f53011@mail.gmail.com>
If $hash ('h') or $hash_base ('hb') parameter is a branch name
(i.e. it starts with 'refs/heads/'; all generated URLs use this form
to discriminate between tags and heads), it is used in feed URLs; if
$file_name ('f') is defined, it is used in feed URLs. Feed title is
set according to the kind of web feed: it is either 'log' for generic
feed, 'log of <branch>', 'history of <filename>' for generic history
(using implicit or explicit HEAD, i.e. current branch) or 'history of
<filename> on <branch>'.
There are special cases: 'heads' and 'forks' views should use OPML
providing list of available feeds; 'tags' probably also should use
OPML; there is no web feed equivalent to 'search' view. Currently all
those cases fallback to (show) default feed. Such feed link uses
"generic" class, and is shown in slightly lighter color for
distinction.
Currently feed can have but one starting point, and does not support
negative (exclude) commit arguments. Therefore for now for *diff
views it is chosen that feed follow the "to" part: to-name, to-commit
for 'blobdiff', 'treediff' and 'commitdiff' views.
Generating parameters for href() for feed link was separated
(refactored) into get_feed_info() subroutine.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-20 22:09:48 +02:00
|
|
|
a.rss_logo.generic {
|
|
|
|
|
background-color: #ff8800;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
a.rss_logo.generic:hover {
|
|
|
|
|
background-color: #ee7700;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-14 02:14:20 +02:00
|
|
|
span.refs span {
|
2006-06-20 16:58:12 +02:00
|
|
|
padding: 0px 4px;
|
2007-05-09 03:41:50 +02:00
|
|
|
font-size: 70%;
|
2006-06-20 16:58:12 +02:00
|
|
|
font-weight: normal;
|
|
|
|
|
border: 1px solid;
|
2006-08-14 02:14:20 +02:00
|
|
|
background-color: #ffaaff;
|
|
|
|
|
border-color: #ffccff #ff00ee #ff00ee #ffccff;
|
|
|
|
|
}
|
|
|
|
|
|
2008-09-02 21:47:05 +02:00
|
|
|
span.refs span a {
|
|
|
|
|
text-decoration: none;
|
|
|
|
|
color: inherit;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
span.refs span a:hover {
|
|
|
|
|
text-decoration: underline;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
span.refs span.indirect {
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-14 02:14:20 +02:00
|
|
|
span.refs span.ref {
|
|
|
|
|
background-color: #aaaaff;
|
|
|
|
|
border-color: #ccccff #0033cc #0033cc #ccccff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
span.refs span.tag {
|
|
|
|
|
background-color: #ffffaa;
|
2006-06-20 16:58:12 +02:00
|
|
|
border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
|
|
|
|
|
}
|
|
|
|
|
|
2006-08-14 02:14:20 +02:00
|
|
|
span.refs span.head {
|
|
|
|
|
background-color: #aaffaa;
|
|
|
|
|
border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
|
|
|
|
|
}
|
|
|
|
|
|
2006-06-20 16:58:12 +02:00
|
|
|
span.atnight {
|
|
|
|
|
color: #cc0000;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
span.match {
|
|
|
|
|
color: #e00000;
|
2006-06-17 11:23:56 +02:00
|
|
|
}
|
2007-05-17 04:31:12 +02:00
|
|
|
|
|
|
|
|
div.binary {
|
|
|
|
|
font-style: italic;
|
|
|
|
|
}
|
2010-04-27 21:34:44 +02:00
|
|
|
|
2010-11-11 13:26:17 +01:00
|
|
|
div.remote {
|
|
|
|
|
margin: .5em;
|
|
|
|
|
border: 1px solid #d9d8d1;
|
|
|
|
|
display: inline-block;
|
|
|
|
|
}
|
|
|
|
|
|
2011-04-28 21:04:10 +02:00
|
|
|
/* JavaScript-based timezone manipulation */
|
|
|
|
|
|
|
|
|
|
.popup { /* timezone selection UI */
|
|
|
|
|
position: absolute;
|
|
|
|
|
/* "top: 0; right: 0;" would be better, if not for bugs in browsers */
|
|
|
|
|
top: 0; left: 0;
|
|
|
|
|
border: 1px solid;
|
|
|
|
|
padding: 2px;
|
|
|
|
|
background-color: #f0f0f0;
|
|
|
|
|
font-style: normal;
|
|
|
|
|
color: #000000;
|
|
|
|
|
cursor: auto;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.close-button { /* close timezone selection UI without selecting */
|
|
|
|
|
/* float doesn't work within absolutely positioned container,
|
|
|
|
|
* if width of container is not set explicitly */
|
|
|
|
|
/* float: right; */
|
|
|
|
|
position: absolute;
|
|
|
|
|
top: 0px; right: 0px;
|
|
|
|
|
border: 1px solid green;
|
|
|
|
|
margin: 1px 1px 1px 1px;
|
|
|
|
|
padding-bottom: 2px;
|
|
|
|
|
width: 12px;
|
|
|
|
|
height: 10px;
|
|
|
|
|
font-size: 9px;
|
|
|
|
|
font-weight: bold;
|
|
|
|
|
text-align: center;
|
|
|
|
|
background-color: #fff0f0;
|
|
|
|
|
cursor: pointer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-04-27 21:34:44 +02:00
|
|
|
/* Style definition generated by highlight 2.4.5, http://www.andre-simon.de/ */
|
|
|
|
|
|
|
|
|
|
/* Highlighting theme definition: */
|
|
|
|
|
|
|
|
|
|
.num { color:#2928ff; }
|
|
|
|
|
.esc { color:#ff00ff; }
|
|
|
|
|
.str { color:#ff0000; }
|
|
|
|
|
.dstr { color:#818100; }
|
|
|
|
|
.slc { color:#838183; font-style:italic; }
|
|
|
|
|
.com { color:#838183; font-style:italic; }
|
|
|
|
|
.dir { color:#008200; }
|
|
|
|
|
.sym { color:#000000; }
|
|
|
|
|
.line { color:#555555; }
|
|
|
|
|
.kwa { color:#000000; font-weight:bold; }
|
|
|
|
|
.kwb { color:#830000; }
|
|
|
|
|
.kwc { color:#000000; font-weight:bold; }
|
|
|
|
|
.kwd { color:#010181; }
|