]> gitweb.ps.run Git - ps-cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
committerLars Hjemli <hjemli@gmail.com>
Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
1  2 
Makefile
cgit.css

diff --combined Makefile
index 30f75757ed35e39fe5d843e8ea358b1acfb06ea7,7836963e18e3ac43b99037c257cc72c756d3efae..bfe18c5f53dc4b85e5567e3076dbd4889fcd7140
+++ b/Makefile
@@@ -13,7 -13,7 +13,7 @@@ pdfdir = $(docdir
  mandir = $(prefix)/share/man
  SHA1_HEADER = <openssl/sha.h>
  GIT_VER = 1.7.4
- GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+ GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
  INSTALL = install
  MAN5_TXT = $(wildcard *.5.txt)
  MAN_TXT  = $(MAN5_TXT)
@@@ -198,9 -198,9 +198,9 @@@ install-pdf: doc-pd
        $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
  
  uninstall:
 -      rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 -      rm -f $(CGIT_DATA_PATH)/cgit.css
 -      rm -f $(CGIT_DATA_PATH)/cgit.png
 +      rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 +      rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
 +      rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
  
  uninstall-doc: uninstall-man uninstall-html uninstall-pdf
  
diff --combined cgit.css
index 55afa94690c3df2983beced1d4fb19138ccd085b,8f409c39b1ed58d521b8f171bbc593c81e5f8c3c..3734ca7a123951e723286e2d9b71b2b9d74b7c47
+++ b/cgit.css
@@@ -331,33 -331,6 +331,33 @@@ table.commit-info 
        margin-top: 1.5em;
  }
  
 +div.cgit-panel {
 +      float: right;
 +      margin-top: 1.5em;
 +}
 +
 +div.cgit-panel table {
 +      border-collapse: collapse;
 +      border: solid 1px #aaa;
 +      background-color: #eee;
 +}
 +
 +div.cgit-panel th {
 +      text-align: center;
 +}
 +
 +div.cgit-panel td {
 +      padding: 0.25em 0.5em;
 +}
 +
 +div.cgit-panel td.label {
 +      padding-right: 0.5em;
 +}
 +
 +div.cgit-panel td.ctrl {
 +      padding-left: 0.5em;
 +}
 +
  table.commit-info th {
        text-align: left;
        font-weight: normal;
@@@ -681,7 -654,7 +681,7 @@@ table.hgraph th 
  }
  
  table.hgraph td {
-       vertical-align: center;
+       vertical-align: middle;
        padding: 2px 2px;
  }
  
@@@ -758,7 -731,7 +758,7 @@@ table.ssdiff td.lineno 
  }
  
  table.ssdiff td.hunk {
-       color: #black;
+       color: black;
        background: #ccf;
        border-top: solid 1px #aaa;
        border-bottom: solid 1px #aaa;