From: Stefan Imhoff Date: Wed, 5 Sep 2012 16:37:28 +0000 (+0200) Subject: Made it compatible to Gitweb 1.7.12 X-Git-Tag: gitweb-1.7.12~1 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=aadd51d179d56841e3624315035f521aba6c4177;p=m6w6%2Fgitweb-theme Made it compatible to Gitweb 1.7.12 * Supports now side-by-side view * I added a new favicon and logo as Git has a new logo quite a while now and it was not updated in Gitweb. --- diff --git a/README.rst b/README.rst index 50415b6..5da5548 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ Theme for gitweb ================ -This is an alternative theme for `gitweb`_ (tested with git web interface version 1.7.4.2). It is *strongly* inspired by GitHub. +This is an alternative theme for `gitweb`_ (tested with git web interface version 1.7.12). It is *strongly* inspired by GitHub. Fullsize screenshots available on `kogakure.github.com/gitweb-theme`_. @@ -13,14 +13,18 @@ The installation of this stylesheet is very easy: Just clone the repository to a location of your choice, probably into the same directory where the base gitweb stylesheet is located (in Ubuntu, this is e.g. /usr/share/gitweb/). It's recommended to move away the existing files and then create symlinks to the new files. You can do this with the following few commands:: - cd - mv gitweb.css gitweb_original.css - mv gitweb.js gitweb_original.js - git clone git://github.com/kogakure/gitweb-theme.git - ln -s gitweb-theme/gitweb.css gitweb.css - ln -s gitweb-theme/gitweb.js gitweb.js + cd + mv gitweb.css gitweb_original.css + mv gitweb.js gitweb_original.js + mv git-logo.png git-logo_original.png + mv git-favicon.png git-favicon_original.png + git clone git://github.com/kogakure/gitweb-theme.git + ln -s gitweb-theme/gitweb.css gitweb.css + ln -s gitweb-theme/gitweb.js gitweb.js + ln -s gitweb-theme/git-logo.png git-logo.png + ln -s gitweb-theme/git-favicon.png git-favicon.png -If you see some missing things or errors, please post a comment. +Of course you can just copy them to the new location. If you see some missing things or errors, please create a ticket or fix it and send a pull request. .. _gitweb: http://git.or.cz/gitwiki/Gitweb .. _kogakure.github.com/gitweb-theme: http://kogakure.github.com/gitweb-theme @@ -36,4 +40,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/git-favicon.png b/git-favicon.png new file mode 100644 index 0000000..4fa44bb Binary files /dev/null and b/git-favicon.png differ diff --git a/git-logo.png b/git-logo.png new file mode 100644 index 0000000..fdaf7b7 Binary files /dev/null and b/git-logo.png differ diff --git a/gitweb.css b/gitweb.css index 0fcf432..c595073 100755 --- a/gitweb.css +++ b/gitweb.css @@ -131,7 +131,9 @@ td, th { } .page_header img.logo { - display: none; + position: relative; + top: 7px; + margin-right: 5px; } /* Page Footer @@ -247,6 +249,10 @@ th .header { top: 15px; } +.projsearch a { + display: none; +} + .commit_search { background: #eaeaea; } @@ -349,7 +355,7 @@ th .header { } .patch > .header { - width: 98.5%; + width: 99%; } /* Refs @@ -387,6 +393,20 @@ span.refs a { /* Diffs ---------------------------------------------------------------------------- */ +div.diff.to_file a.path, +div.diff.to_file { + color: #007000; +} + +div.diff.from_file a.path, +div.diff.from_file { + color: #aa0000; +} + +.patch .header { + margin: 0; +} + .patchset { overflow-x: auto; overflow-y: hidden; @@ -404,6 +424,42 @@ span.refs a { background: #ddffdd; } +.extended_header { + width: 99.5%; +} + +div.chunk_block { + overflow: hidden; +} + +div.chunk_block div.old { + float: left; + width: 50%; + overflow: hidden; + border-right: 5px solid #EAF2F5; +} + +div.chunk_block.rem, +div.chunk_block.add { + background: transparent; +} + +div.chunk_block div.old .add, +div.chunk_block div.old .rem { + padding-right: 3px; +} + +div.chunk_block div.new .add, +div.chunk_block div.new .rem { + padding-left: 3px; +} + +div.chunk_block div.new { + margin-left: 50%; + width: 50%; + border-left: 5px solid #EAF2F5; +} + /* Age ---------------------------------------------------------------------------- */ @@ -488,4 +544,3 @@ td.pre, div.pre, div.diff { .kwb { color:#6b3099; } .kwc { color:#d4663d; } .kwd { color:#2928ff; } -