From 0cf876d138f0cff78b520a3601cf24ad2717e93b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 08 Jun 2012 08:50:24 -0400
Subject: [PATCH] Updated Git logos
---
NOTICE | 8 ++++++++
src/com/gitblit/client/RepositoriesPanel.java | 2 +-
resources/git-orange-16x16.png | 0
src/com/gitblit/wicket/panels/RepositoriesPanel.html | 4 ++--
build.xml | 1 +
docs/04_design.mkd | 1 +
resources/git-black-16x16.png | 0
7 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/NOTICE b/NOTICE
index 022ddd7..e254c84 100644
--- a/NOTICE
+++ b/NOTICE
@@ -198,6 +198,14 @@
Creative Commons CC-BY License.
http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon
+
+---------------------------------------------------------------------------
+Git logo
+---------------------------------------------------------------------------
+ Git logo, released under the
+ Creative Commons Attribution 3.0 Unported License.
+
+ http://git-scm.com/downloads/logos
---------------------------------------------------------------------------
magnifying glass search icon
diff --git a/build.xml b/build.xml
index aa73e1e..41fb0db 100644
--- a/build.xml
+++ b/build.xml
@@ -583,6 +583,7 @@
<resource file="${basedir}/src/com/gitblit/client/splash.png" />
<resource file="${basedir}/resources/gitblt-favicon.png" />
<resource file="${basedir}/resources/gitweb-favicon.png" />
+ <resource file="${basedir}/resources/git-orange-16x16.png" />
<resource file="${basedir}/resources/user_16x16.png" />
<resource file="${basedir}/resources/users_16x16.png" />
<resource file="${basedir}/resources/settings_16x16.png" />
diff --git a/docs/04_design.mkd b/docs/04_design.mkd
index 64dce43..d1583cd 100644
--- a/docs/04_design.mkd
+++ b/docs/04_design.mkd
@@ -16,6 +16,7 @@
- [google-code-prettify](http://code.google.com/p/google-code-prettify) (Apache 2.0)
- [Commons Daemon](http://commons.apache.org/daemon) (Apache 2.0)
- magnifying glass search icon courtesy of [Gnome](http://gnome.org) (Creative Commons CC-BY)
+- Git logo originally designed by [Jason Long](http://git-scm.com/downloads/logos)
- modified Git logo originally designed by [Henrik Nyh](http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon)
- other icons courtesy of [FatCow Hosting](http://www.fatcow.com/free-icons) (Creative Commons CC-BY)
diff --git a/resources/git-black-16x16.png b/resources/git-black-16x16.png
new file mode 100644
index 0000000..559c45a
--- /dev/null
+++ b/resources/git-black-16x16.png
Binary files differ
diff --git a/resources/git-orange-16x16.png b/resources/git-orange-16x16.png
new file mode 100644
index 0000000..2fefab4
--- /dev/null
+++ b/resources/git-orange-16x16.png
Binary files differ
diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java
index c5d0d35..70b87c6 100644
--- a/src/com/gitblit/client/RepositoriesPanel.java
+++ b/src/com/gitblit/client/RepositoriesPanel.java
@@ -252,7 +252,7 @@
repositoryControls.add(searchRepository);
setLayout(new BorderLayout(Utils.MARGIN, Utils.MARGIN));
- header = new HeaderPanel(Translation.get("gb.repositories"), "gitweb-favicon.png");
+ header = new HeaderPanel(Translation.get("gb.repositories"), "git-orange-16x16.png");
add(header, BorderLayout.NORTH);
add(repositoryTablePanel, BorderLayout.CENTER);
add(repositoryControls, BorderLayout.SOUTH);
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
index 08b529c..e361a39 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html
@@ -39,7 +39,7 @@
<wicket:fragment wicket:id="flatRepositoryHeader">
<tr>
<th class="left" wicket:id="orderByRepository">
- <img style="vertical-align: middle; border: 1px solid #888;" src="gitweb-favicon.png"/>
+ <img style="vertical-align: middle;" src="git-black-16x16.png"/>
<wicket:message key="gb.repository">Repository</wicket:message>
</th>
<th wicket:id="orderByDescription"><wicket:message key="gb.description">Description</wicket:message></th>
@@ -54,7 +54,7 @@
<wicket:fragment wicket:id="groupRepositoryHeader">
<tr>
<th class="left">
- <img style="vertical-align: middle; border: 1px solid #888;" src="gitweb-favicon.png"/>
+ <img style="vertical-align: middle;" src="git-black-16x16.png"/>
<wicket:message key="gb.repository">Repository</wicket:message>
</th>
<th><wicket:message key="gb.description">Description</wicket:message></th>
--
Gitblit v1.9.1