From c9d9d2221505c97189fc70bb1b0402436e534c7f Mon Sep 17 00:00:00 2001 From: takezoe Date: Tue, 6 Aug 2013 08:07:51 +0900 Subject: [PATCH] (refs #49)Add favicon and header logo. Thanks to @hansgru! --- src/main/twirl/main.scala.html | 11 +++++++---- src/main/webapp/assets/common/css/gitbucket.css | 14 ++++++++++---- src/main/webapp/assets/common/images/favicon.png | Bin 0 -> 484 bytes .../webapp/assets/common/images/gitbucket.png | Bin 0 -> 675 bytes 4 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/main/webapp/assets/common/images/favicon.png create mode 100644 src/main/webapp/assets/common/images/gitbucket.png diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index 21917c52b..48e20f2f3 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -6,6 +6,7 @@ @title + @@ -38,7 +39,12 @@ - GitBucket + + GitBucket + @defining(servlet.AutoUpdate.getCurrentVersion){ version => + @version.majorVersion.@version.minorVersion + } +
@repository.map { repository => @@ -60,9 +66,6 @@
- @defining(servlet.AutoUpdate.getCurrentVersion){ version => -
version @version.majorVersion.@version.minorVersion
- }
@body diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index d8d78b2ec..d78ec7b4c 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -38,11 +38,17 @@ div.nav-collapse a.menu-last { margin-right: 30px; } -div.gitbucket-version { +.navbar .brand { + padding-top: 6px; + padding-bottom: 6px; +} + +.navbar .brand img { + vertical-align: bottom; +} + +span.header-version { font-size: small; - color: silver; - float: right; - margin-right: 10px; } /* ======================================================================== */ diff --git a/src/main/webapp/assets/common/images/favicon.png b/src/main/webapp/assets/common/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ca98d43148c9a79167af91201802dcf628455d GIT binary patch literal 484 zcmV)|VwG*Y387yX;&-5Plu^$nKQ-oB|!y1N&f5b4cy@;4J=woyOauXx;BVuCVJMN;3 zrIh|V3wzkbQF0~?4)7G8@iAq-#+R)3GA`o|F5qT8g9RM7WPZhU+{i|C?HCIYp_5Gx zFsNqx5)W|=A8-|KtNI{0V+E;VJ-e@?o4E&gff<~^lLpi9>OFXc-H5nf<(}uTHt;wi z`lXZ|Y&U>TtHHTaN-=#t;Sql3yPH^T3mtsJGt6i19#-={ht0%vCcNg7psn;cz%tHa z9vAUGYg;v^w$RvsOU8R}8@KQVS6Y~93#nihD|lzTOrwlp=2kFUbIRX-=Tge){K$_# aVSWKTztFiLN2*Q$0000W~yZ`_I8FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10w765K~zYIwbo6DjbRiA@ZY16g&{>g1`D$@iX;mbM6t7y&0u38 zStwgO3$nIjWy3}+Cac*9C1fKdA5)W$F-FwLM+nE_o;%)oz4s!`snb)>`Jey)x#ygF zdP_u@Nt-pJ?C9wfD5dmZ8J4H7$P>o!BF{05N5r>AqKJ@X>cK8t#7lff{H1@-oQuiP zGsRmGIQtKTfAX_!-f9mXW$=G3l1sZRZF_)z?8RoSdiP-wN*A&>TICtTO`ON-HlVb} zw3Koh+i(fPc#erAS(ajbnfEe%JjIt_C3a#ru13U>y1-zn*X=D{RUDR9d|^Y*-iWx+ z`i;Mu+^>7%?qe<1BD(+`0?z;ZLF-^ufu5OZto`0 zi^o_{C(rmHoWhozsLPm}v4t2xZ#8GyHjRi6c&hd1>Sz&hJ^NL~^9E^x95%IBLD1J)Y