From 0cf876d138f0cff78b520a3601cf24ad2717e93b Mon Sep 17 00:00:00 2001 From: James Moger Date: Fri, 8 Jun 2012 08:50:24 -0400 Subject: [PATCH] Updated Git logos --- NOTICE | 8 ++++++++ build.xml | 1 + docs/04_design.mkd | 1 + resources/git-black-16x16.png | Bin 0 -> 371 bytes resources/git-orange-16x16.png | Bin 0 -> 654 bytes src/com/gitblit/client/RepositoriesPanel.java | 2 +- .../gitblit/wicket/panels/RepositoriesPanel.html | 4 ++-- 7 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 resources/git-black-16x16.png create mode 100644 resources/git-orange-16x16.png diff --git a/NOTICE b/NOTICE index 022ddd78..e254c84a 100644 --- a/NOTICE +++ b/NOTICE @@ -198,6 +198,14 @@ Git logo 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 aa73e1e4..41fb0db6 100644 --- a/build.xml +++ b/build.xml @@ -583,6 +583,7 @@ + diff --git a/docs/04_design.mkd b/docs/04_design.mkd index 64dce43c..d1583cdf 100644 --- a/docs/04_design.mkd +++ b/docs/04_design.mkd @@ -16,6 +16,7 @@ The following dependencies are bundled with Gitblit. - [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 0000000000000000000000000000000000000000..559c45a4e104cfdf7a1a2e9b2c02bb505286fbca GIT binary patch literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85s1GL71^(seKtxkiEpy*OmPa8wZbyX5<`gQJ~OgPZ!4!i_>#2 z8G5lA3LN`5zvG5Y?i*1SZbxoz+lJnE*)GxN7d+pvX~UO;!h2fQE^Y0Y%JE2Xi$LI= zttSsjlpTI_V1mKS_x8q~8n;DwkNryw_qPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L04^f{04^f|c%?sf00007bV*G`2iyh- z3?w(BlNNRW00It4L_t(I%WacAYZOr!g`YDCL=j~M!O}tqX>2mLNn>T>uHf7%orPdZ z@dx-1EG-R05Nnw&+)b$nip5MDkgYUrn2U-Q`8XCcn=InXz)W$^d7pa@1OH5l;rzR+ z!d{A{Qw(E(RF!m9Ns1-^oo-2-VtCb6rMnp1Ri#r5qln*A1x(Ylxe`ZS1!o zjFE)#xTxD%iebg}sRY@wc(B~H`D$~BbQiHNWE+I0T@0hVZcd9y3l`b3IK{AQ`ym*K zPlk_q-HZ^=CBPVa+Qo9T;Ln!CuYt#s&V;bNDi{M8-T+ug5};{{-J|cXZ1N|sSi#Rtp-(4oZD{$9oinK@!>QRB>bjOZT?fYy^@(*6LR^||?^znSO2 zW?nZ(*^ntk-OfPczH0YT;Pqka`e3;#G#A>+C(W-E14^-^Cub$E+tU=o$o6zV`D6Gd z*yv3)H{L4h_9#_B`J{1{*Db}Q1#}9K*Ue1QSP0Bz!3O7IHjBDF>Z(#h;mbeMf<)wX oLl?t6@N77AV7N1ghlTz81w#lOj9()&1ONa407*qoM6N<$f>CfL0{{R3 literal 0 HcmV?d00001 diff --git a/src/com/gitblit/client/RepositoriesPanel.java b/src/com/gitblit/client/RepositoriesPanel.java index c5d0d35b..70b87c6c 100644 --- a/src/com/gitblit/client/RepositoriesPanel.java +++ b/src/com/gitblit/client/RepositoriesPanel.java @@ -252,7 +252,7 @@ public abstract class RepositoriesPanel extends JPanel { 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 08b529c7..e361a39d 100644 --- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html +++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html @@ -39,7 +39,7 @@ - + Repository Description @@ -54,7 +54,7 @@ - + Repository Description -- 2.39.5