From: Stricted Date: Fri, 12 Apr 2013 21:38:40 +0000 (+0200) Subject: some changes X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb1a57877f9df55ab16200277611f1432e23269a;p=gitweb.git some changes --- diff --git a/gitweb.css b/gitweb.css index 76948d9..c1add3f 100644 --- a/gitweb.css +++ b/gitweb.css @@ -1,566 +1,602 @@ -/* Reset -------------------------------------------------------------------------- */ +body { + font-family: sans-serif; + font-size: small; + border: solid #d9d8d1; + border-width: 1px; + margin: 10px; + background-color: #ffffff; + color: #000000; +} -/* Based on http://meyerweb.com/eric/tools/css/reset/ */ -/* v1.0 | 20080212 */ +a { + color: #0000cc; +} -html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, -blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, -font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, -u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, -caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - outline: 0; - font-size: 100%; - vertical-align: baseline; - background: transparent; +a:hover, a:visited, a:active { + color: #880000; } -ol, ul { list-style: none; } +span.cntrl { + border: dashed #aaaaaa; + border-width: 1px; + padding: 0px 2px 0px 2px; + margin: 0px 2px 0px 2px; +} -blockquote, q { quotes: none; } +img.logo { + float: right; + border-width: 0px; +} -blockquote:before, blockquote:after, -q:before, q:after { - content: ''; - content: none; +img.avatar { + vertical-align: middle; } -:focus { outline: 0; } +a.list img.avatar { + border-style: none; +} -ins { text-decoration: none; } +div.page_header { + height: 25px; + padding: 8px; + font-size: 150%; + font-weight: bold; + background-color: #d9d8d1; +} -del { text-decoration: line-through; } +div.page_header a:visited, a.header { + color: #0000cc; +} -table { - border-collapse: collapse; - border-spacing: 0; +div.page_header a:hover { + color: #880000; } -a { outline: none; } +div.page_nav { + padding: 8px; +} -/* General ----------------------------------------------------------------------------- */ -@import url(../../../stylesheets/application.css); -@import url(http://fonts.googleapis.com/css?family=Ubuntu+Condensed); +div.page_nav a:visited { + color: #0000cc; +} +div.page_path { + padding: 8px; + font-weight: bold; + border: solid #d9d8d1; + border-width: 0px 0px 1px; +} -body { - background-color:#E7EBF2; font-family:"Lucida Grande", verdana, arial, helvetica, sans-serif; - font-size: 12px; - line-height: 1.5; - margin: 0; - background-color: #fff; - color: #000000; +div.page_footer { + height: 17px; + padding: 4px 8px; + background-color: #d9d8d1; } +div.page_footer_text { + float: left; + color: #555555; + font-style: italic; +} +div#generating_info { + margin: 4px; + font-size: smaller; + text-align: center; + color: #505050; +} +div.page_body { + padding: 8px; + font-family: monospace; +} -a:link, a:visited { - color: #3B5998; - text-decoration: none; +div.title, a.title { + display: block; + padding: 6px 8px; + font-weight: bold; + background-color: #edece6; + text-decoration: none; + color: #000000; } -a:hover { - text-decoration: underline; +div.readme { + padding: 8px; } -body > p, -body > dl { - width: 95%; - margin: 0 auto 15px auto; - border: 1px solid #D8D8D8; - padding: 5px; +a.title:hover { + background-color: #d9d8d1; } -td.list a[href*='a=tree'], td.list a[href*='a=blob'] { - padding-left: 20px; - display: block; - float: left; - height: 16px; - line-height: 16px; +div.title_text { + padding: 6px 0px; + border: solid #d9d8d1; + border-width: 0px 0px 1px; + font-family: monospace; } -td.list a[href*='a=tree'] { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABq0lEQVQ4y8WTu4oUQRSGv+rtGVuxhwVFdFEEE2c3d0HYTEMTn8DEVxADQTDUF9DMwMxQMBMx8AEWzRQ3cBHd9TI91+2urjq/QbczY2IygSep4nD+79yqnCRWsYQVbWVACvDh5ZXdrLe15dwyT1TjT/sxFFeB6i+VA2B6+cb7kAI4Jf0LO087zjlQI8Y5Qvnj0sHug321XoC1bk+K9eHk6+s7wPMUgKAS88eqb4+Jfg2SHs7lZBvX2Nh+2EUCDGSAcMnJsx9f7NxfAGqXyDzRd5EJO/pMPT1gcviGTnYOVIN5pAAE8v7dLrKL8xnglFk4ws9Afko9HpH3b5Gd2mwb/lOBmgrSdYhJugDUCenxM6xv3p4HCsP8F0LxCsUhCkMURihOyM7fg0osASTFEpu9a4LjGIUCqwcoDiEUrX+E4hRUQb20RiokC1j9vckUhygU7X3QZh7NAVKYL7YBeMkRUfjVCotF2XGIwnghtrJpMywB5G0QZj9P1JNujuWJ1AHLQadRrACPkuZ0SSSWpeStWgDK6tHek5vbiOs48n++XQHurcf0rFng//6NvwG+iB9/4duaTgAAAABJRU5ErkJgggo=) center left no-repeat; +div.log_body { + padding: 8px 8px 8px 150px; } -td.list a[href*='a=blob'] { - background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAA6ElEQVQoFQXBMW5TQRgGwNnHnoE0QbiCjoIooUmTU3AuS1BwIoTSUdJBigg3GCWOg9/++zHTop078wIAsPMrE4SL5/1aIyMjIyMjz/m0tbFECFdrPeaQQw75mz/5nZH7fN7aWILmauSYfznmmIfss8vIUx7zZWsTTXM5vpWvTk5Wq9VHQP/gtgOLa0Qpw940vAQdaG6thpOhlOkG0AEuAVGmEkAH+G4YSikxXQM6wDsAMRFAB/ihDNNUmN4DOsAbBAEAdICfpmmaAt4COoj2GgCASbIkZh1NAACznhQt2itnFgAAlF3u/gMDtJXPzQxoswAAAABJRU5ErkJgggo=) center left no-repeat; +span.age { + position: relative; + float: left; + width: 142px; + font-style: italic; } -i { - font-style: normal; +span.signoff { + color: #888888; } -td, th { - padding: 5px; +div.log_link { + padding: 0px 8px; + font-size: 70%; + font-family: sans-serif; + font-style: normal; + position: relative; + float: left; + width: 136px; } -/* Page Header ----------------------------------------------------------------------------- */ +div.list_head { + padding: 6px 8px 4px; + border: solid #d9d8d1; + border-width: 1px 0px 0px; + font-style: italic; +} -.page_header { - height: 50px; - line-height: 50px; - position: relative; - padding: 0 27px; - margin-bottom: 20px; - font-size: 20px; - font-family: Ubuntu Condensed; - color:White; - background: #3B5998; - border-bottom: 1px solid #dfdfdf; +.author_date, .author { + font-style: italic; } -.page_header a:link, .page_header a:visited { - color: White; - text-decoration: none; - padding: 3px; - font-weight: bold; +div.author_date { + padding: 8px; + border: solid #d9d8d1; + border-width: 0px 0px 1px 0px; } -.page_header a:hover { - font-weight: bold; - padding: 3px; - text-decoration: underline; +a.list { + text-decoration: none; + color: #000000; } -.page_header a:first-child { - background: transparent; +a.subject, a.name { + font-weight: bold; } -.page_header img.logo { - width:79px; - height:20px; - padding-bottom:2px; - padding-right:5px; - margin-right:5px; - vertical-align:middle +table.tags a.subject { + font-weight: normal; } -/* Page Footer ----------------------------------------------------------------------------- */ +a.list:hover { + text-decoration: underline; + color: #880000; +} -.page_footer { - height: 80px; - line-height: 80px; - padding: 0 30px; - margin-top: 15px; - background: #f1f1f1; - border-top: 2px solid #ddd; +a.text { + text-decoration: none; + color: #0000cc; } -.page_footer_text { - color: #666; - display: inline; - float: left; +a.text:visited { + text-decoration: none; + color: #880000; } -a.rss_logo { - float: right; - padding: 3px 1px; - width: 35px; - line-height: 10px; - border: 1px solid; - border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e; - border-radius:10px; - color: #ffffff; - background-color: #ff6600; - font-weight: bold; - font-family: sans-serif; - font-size: 80%; - text-align: center; - text-decoration: none; - margin-top: 30px; - margin-left: 5px; +a.text:hover { + text-decoration: underline; + color: #880000; } -a.rss_logo:hover { - background-color: #ee5500; -} - -/* Elements ----------------------------------------------------------------------------- */ - -.project_list, -.shortlog, -.tree, -.commit_search, -.history { - width: 95%; - margin: 0 auto 15px auto; - border: 1px solid #d8d8d8; - -moz-box-shadow: 0 0 3px rgba(0,0,0,0.2); - -webkit-box-shadow: 0 0 3px rgba(0,0,0,0.2); - box-shadow: 0 0 3px rgba(0,0,0,0.2); -} - -.project_list th, -.shortlog th, -.tree th, -.commit_search th { - color: #afafaf; - font-weight: normal; +table { + padding: 8px 4px; + border-spacing: 0; } -.project_list th { -background-color: #F0F0F0; -padding: 10px 5px; -border-bottom: 1px solid #D5D7DB; -color: #333; + +table.shortlog td { + padding: 0px 8px; + vertical-align: middle; + height:20px; } -.project_list th a { color:#333; } - -.project_list tr, -.shortlog tr, -.tree tr, -.commit_search tr { - background: #eaeaea; - height: 2.5em; - text-align: left; - color: #545454; -} - -.project_list tr { - background:White; - border:1px solid #f9f9f; +img.graph { + padding: 0px; + margin: 0px; + display: block; } +table.diff_tree { + font-family: monospace; +} -/*.project_list tr.dark, .project_list tr.light,*/ -.shortlog tr.dark, .shortlog tr.light, -.tree tr.dark, .tree tr.light, -.commit_search tr.dark, .commit_search tr.light, -.history tr.dark, .history tr.light, -.heads tr.dark, .heads tr.light { - background: #F9F9F9; /* old browsers */ - background: White; -/* background: -moz-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); /* firefox */ -/* background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#F9F9F9), color-stop(100%,#EFEFEF)); /* webkit */ -/* filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#F9F9F9', endColorstr='#EFEFEF',GradientType=0 ); /* ie */ -/* background: -o-linear-gradient(top, #F9F9F9 0%, #EFEFEF 100%); */ - height: 2.5em; - border-bottom: 1px solid #e1e1e1; -} - -.project_list tr:hover, -.shortlog tr:hover, -.tree tr:hover, -.commit_search tr:hover { - background:#efefef; -} - -th .header { - background: transparent; - border: 0; - padding: 0; +table.combined.diff_tree th { + text-align: center; } - -.tree { - width: 100%; - margin: 0; -} - -.projsearch { - position: absolute; - right: 4%; - top: 15px; - color:White; - font-family:Arial; - font-size:11px; -} - -.projsearch input[type="text"], -.search input[type="text"] { - border-radius:5px; -border:1px solid #D8D8D8; -padding:3px; -} -.projsearch input[type="text"] { -border: 1px solid White; -} - -.commit_search { - background: #eaeaea; -} - -.page_nav, -.list_head, -.page_path, -.search { - width: 94%; - background: #eaeaea; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; + +table.combined.diff_tree td { + padding-right: 24px; } -.history { - background: #eaeaea; +table.combined.diff_tree th.link, +table.combined.diff_tree td.link { + padding: 0px 2px; } -.title { - width: 95%; - padding: 5px; - margin: 0 auto 15px auto; +table.combined.diff_tree td.nochange a { + color: #6666ff; } -.projects_list, -.tags { - width: 95%; - background: #f0f0f0; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; +table.combined.diff_tree td.nochange a:hover, +table.combined.diff_tree td.nochange a:visited { + color: #d06666; } -.heads { - width: 95%; - color: #545454; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; +table.blame { + border-collapse: collapse; } -.header { - width: 94%; - margin: 0 auto 15px auto; - background: #eaf2f5; - border: 1px solid #bedce7; - padding: 5px; +table.blame td { + padding: 0px 5px; + font-size: 100%; + vertical-align: top; } -.log { - width: 99%; - margin: 0 auto 15px auto; - background: #eaf2f5; - border: 1px solid #bedce7; - padding: 5px; + +th { + padding: 2px 5px; + font-size: 100%; + text-align: left; } -.header .age { - float: left; - color: #000; - font-weight: bold; - width: 10em; +/* do not change row style on hover for 'blame' view */ +tr.light, +table.blame .light:hover { + background-color: #ffffff; } -.title_text { - width: 94%; - background: #eaf2f5; - border: 1px solid #bedce7; - padding: 5px; - margin: 0 auto 0 auto; +tr.dark, +table.blame .dark:hover { + background-color: #f6f6f0; } -.log_body { - width: 94%; - background: #eaf2f5; - border: 1px solid #bedce7; - border-top: 0; - padding: 5px; - margin: 0 auto 15px auto; +tr.header { + background-color: #d9d8d1; } -.page_body { - line-height: 1.4em; - width: 94%; - background: #f8f8f8; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 15px auto 15px auto; +tr.header td { + vertical-align: center; } -.diff_tree { - width: 95%; - background: #f0f0f0; - border: 1px solid #d8d8d8; - padding: 5px; - margin: 0 auto 15px auto; +/* currently both use the same, but it can change */ +tr.light:hover, +tr.dark:hover { + background-color: #edece6; } -.page_body > .list_head { - width: 98.5%; +/* boundary commits in 'blame' view */ +/* and commits without "previous" */ +tr.boundary td.sha1, +tr.no-previous td.linenr { + font-weight: bold; } -.page_body > .diff_tree { - width: 99.5%; +/* for 'blame_incremental', during processing */ +tr.color1 { background-color: #f6fff6; } +tr.color2 { background-color: #f6f6ff; } +tr.color3 { background-color: #fff6f6; } + +td { + padding: 2px 5px; + font-size: 100%; + vertical-align: top; } -.patch > .header { - width: 99.3%; - padding: 5px; - margin: 0px; +td.link, td.selflink { + padding: 2px 5px; + font-family: sans-serif; + font-size: 70%; } -/* Refs ----------------------------------------------------------------------------- */ +td.selflink { + padding-right: 0px; +} -span.refs span { - color: #000; - padding: 0px 4px; - font-size: 10px; - font-weight: normal; - border: 1px solid; - background-color: #ffaaff; - border-color: #ffccff #ff00ee #ff00ee #ffccff; +td.sha1 { + font-family: monospace; } -span.refs span.ref { - background-color: #aaaaff; - border-color: #ccccff #0033cc #0033cc #ccccff; +.error { + color: red; + background-color: yellow; } -span.refs span.tag { - background-color: #ffffaa; - border-color: #ffffcc #dccd00 #dccd00 #ffffcc; +td.current_head { + text-decoration: underline; } -span.refs span.head { - background-color: #aaffaa; - border-color: #ccffcc #00cc33 #00cc33 #ccffcc; +table.diff_tree span.file_status.new { + color: #008000; } -span.refs a { - color: #000; +table.diff_tree span.file_status.deleted { + color: #c00000; } -/* Diffs ----------------------------------------------------------------------------- */ +table.diff_tree span.file_status.moved, +table.diff_tree span.file_status.mode_chnge { + color: #777777; +} -.patchset { - overflow-x: auto; - overflow-y: hidden; +table.diff_tree span.file_status.copied { + color: #70a070; } -.chunk_header { - background: #eaf2f5; - color: #999; +/* noage: "No commits" */ +.noage { + color: #808080; + font-style: italic; } -.rem , -.from_file { - background: #FF5252; +/* age2: 60*60*24*2 <= age */ +.age2 { + font-style: italic; } -.add , -.to_file{ - background: #3FFF3F; + +/* age1: 60*60*2 <= age < 60*60*24*2 */ +.age1 { + color: #009900; + background: transparent; } -div.diff.to_file a.path, -div.diff.to_file { - color: #000000; + +/* age0: age < 60*60*2 */ + +.age0 { + color: #009900; + background: transparent; + font-weight: bold; } -div.diff.from_file a.path, -div.diff.from_file { - color: #000000; +td.pre, div.pre, div.diff { + font-family: monospace; + font-size: 12px; + white-space: pre; +} + +td.mode { + font-family: monospace; +} + +/* progress of blame_interactive */ +div#progress_bar { + height: 2px; + margin-bottom: -2px; + background-color: #d8d9d0; +} +div#progress_info { + float: right; + text-align: right; +} + +/* format of (optional) objects size in 'tree' view */ +td.size { + font-family: monospace; + text-align: right; +} + +/* 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 , +div.diff.extended_header a.hash { + color: #777777; +} + div.diff.extended_header .info { - white-space: normal; color: #b0b0b0; +} + +div.diff.extended_header { background-color: #f6f5ee; + padding: 2px 0px 2px 0px; } -/* Age ----------------------------------------------------------------------------- */ +div.diff a.list, +div.diff a.path, +div.diff a.hash { + text-decoration: none; +} -/* noage: "No commits" */ -.noage { - color: #cdcdcd; +div.diff a.list:hover, +div.diff a.path:hover, +div.diff a.hash:hover { + text-decoration: underline; } -/* age2: 60*60*24*2 <= age */ -.age2 { - color: #545454; +div.diff.to_file a.path, +div.diff.to_file { + color: #000000; } -/* age1: 60*60*2 <= age < 60*60*24*2 */ -.age1 { - color: #009900; +div.diff.from_file a.path, +div.diff.from_file { + color: #000000; +} +.rem , +.from_file { + background: #ffdddd; +} +.add , +.to_file{ + background: #ddffdd; } -/* age0: age < 60*60*2 */ -.age0 { - color: #009900; - font-weight: bold; +div.diff.chunk_header a, +div.diff.chunk_header { + color: #990099; } -/* File status ----------------------------------------------------------------------------- */ +div.diff.chunk_header { + border: dotted #ffe0ff; + border-width: 1px 0px 0px 0px; + margin-top: 2px; +} -.diff_tree span.file_status.new { - color: #008000; +div.diff.chunk_header span.chunk_info { + background-color: #ffeeff; } -table.diff_tree span.file_status.deleted { - color: #c00000; +div.diff.chunk_header span.section { + color: #aa22aa; } -table.diff_tree span.file_status.moved, -table.diff_tree span.file_status.mode_chnge { - color: #545454; +div.diff.incomplete { + color: #cccccc; } -table.diff_tree span.file_status.copied { - color: #70a070; +div.diff.nodifferences { + font-weight: bold; + color: #600000; } -span.cntrl { - border: dashed #aaaaaa; - border-width: 1px; - padding: 0px 2px 0px 2px; - margin: 0px 2px 0px 2px; +div.index_include { + border: solid #d9d8d1; + border-width: 0px 0px 1px; + padding: 12px 8px; } -img.graph { - padding: 0px; - margin: 0px; - display: block; + +div.search { + font-size: 100%; + font-weight: normal; + margin: 4px 8px; + float: right; + top: 56px; + right: 12px } -span.match { - background: #aaffaa; - color: #000; +p.projsearch { + text-align: center; } -td.error { - color: red; - background: yellow; +td.linenr { + text-align: right; } -/* blob view */ +a.linenr { + color: #999999; + text-decoration: none +} -td.pre, div.pre, div.diff { - white-space: pre; +a.rss_logo { + float: right; + padding: 3px 0px; + width: 35px; + line-height: 10px; + border: 1px solid; + border-color: #fcc7a5 #7d3302 #3e1a01 #ff954e; + color: #ffffff; + background-color: #ff6600; + font-weight: bold; + font-family: sans-serif; + font-size: 70%; + text-align: center; + text-decoration: none; +} + +a.rss_logo:hover { + background-color: #ee5500; +} + +a.rss_logo.generic { + background-color: #ff8800; +} + +a.rss_logo.generic:hover { + background-color: #ee7700; +} + +span.refs span { + padding: 0px 4px; + font-size: 70%; + font-weight: normal; + border: 1px solid; + background-color: #ffaaff; + border-color: #ffccff #ff00ee #ff00ee #ffccff; +} + +span.refs span a { + text-decoration: none; + color: inherit; +} + +span.refs span a:hover { + text-decoration: underline; +} + +span.refs span.indirect { + font-style: italic; +} + +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; +} + +span.match { + color: #e00000; +} + +div.binary { + font-style: italic; } /* Style definition generated by highlight 2.4.5, http://www.andre-simon.de/ */ /* Highlighting theme definition: */ -.num { color:#6ecf36; } +.num { color:#2928ff; } .esc { color:#ff00ff; } -.str { color:#ff00d3; background-color: #edc9ec } +.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:#666666; font-weight:bold; } -.kwb { color:#6b3099; } -.kwc { color:#d4663d; } -.kwd { color:#2928ff; } - +.kwa { color:#000000; font-weight:bold; } +.kwb { color:#830000; } +.kwc { color:#000000; font-weight:bold; } +.kwd { color:#010181; } diff --git a/index.cgi b/index.cgi index 505299e..6945fad 100644 --- a/index.cgi +++ b/index.cgi @@ -4714,13 +4714,13 @@ sub git_project_list_body { "\n" . "\n"; } - print "   ".$count." projects found  "; + print "  ".$count." projects found  "; if (defined $extra) { print "\n"; if ($check_forks) { print "\n"; } - print "$extra\n" . + print "$extra\n" . "\n"; } print "\n"; @@ -6414,9 +6414,7 @@ sub git_commitdiff { "\n"; print "
\n"; if (@{$co{'comment'}} > 1) { - print "
\n"; git_print_log($co{'comment'}, -final_empty_line=> 1, -remove_title => 1); - print "
\n"; # class="log" } } elsif ($format eq 'plain') {