From 8d74ec4dde8b7afca11f3e8fad3d775849f5b06a Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 8 Jul 2011 16:01:07 +0200
Subject: [PATCH] Fix logo styling, positioning

---
 mediagoblin/static/css/base.css             |  18 +++---------------
 mediagoblin/static/images/icon.png          | Bin 1670 -> 0 bytes
 mediagoblin/static/images/logo.png          | Bin 0 -> 839 bytes
 mediagoblin/templates/mediagoblin/base.html |   2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 mediagoblin/static/images/icon.png
 create mode 100644 mediagoblin/static/images/logo.png

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 1cc26cad..10f9e223 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -57,6 +57,7 @@ label {
 }
 
 .header_submit{
+  color:#272727;
   background-color:#aaa;
   background-image: -webkit-gradient(linear, left top, left bottom, from(##D2D2D2), to(#aaa)); 
   background-image: -webkit-linear-gradient(top, #D2D2D2, #aaa); 
@@ -65,9 +66,9 @@ label {
   background-image:      -o-linear-gradient(top, #D2D2D2, #aaa); 
   background-image:         linear-gradient(top, #D2D2D2, #aaa);
   box-shadow:0px 0px 4px #000;
-  color:#272727;
   border-radius:5px 5px 5px 5px;
-  padding:5px 8px;
+  margin:8px;
+  padding:3px 8px;
   text-decoration:none;
   border:medium none;
   font-family:'Carter One',arial,serif;
@@ -89,19 +90,6 @@ label {
   padding-bottom:74px;
 }
 
-a.mediagoblin_logo {
-  width:34px;
-  height:25px;
-  margin-right:10px;
-  background-image:url('../images/icon.png');
-  background-position:0px 0px;
-  display:inline-block;
-}
-
-a.mediagoblin_logo:hover {
-  background-position:0px -28px;
-}
-
 .mediagoblin_header_right {
   float:right;
 }
diff --git a/mediagoblin/static/images/icon.png b/mediagoblin/static/images/icon.png
deleted file mode 100644
index 4f4f3e9c3c1b43c0f4149e031b69e34b2e9ce95b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1670
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
Q$p8QV07*qoM6N<$f&>RAdH?_b

diff --git a/mediagoblin/static/images/logo.png b/mediagoblin/static/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf28a6d4118a823c937235335ac6e03cee5f1df3
GIT binary patch
literal 839
zcmV-N1GxN&P)<h;3K|Lk000e1NJLTq001HY000^Y1^@s6(r%6d00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01egv01egwkZ*aM00007bV*G`2ipe-
z4L30gxPk5f00PHJL_t(Y$HiB{Zqq;zeKWReJ5ETOmKIcT=Ti`0z?mb0FG1>sKj=^N
zAGmVkhCnDuNkd5-+i`Xu2ka<Kvu+9%8ENJ5th4hx^JX#@k^m59S@upuVgNpXKty~1
zfwk5bk)XB%Sl+Mg?E#2LM%6h{wQAjmTP8vhMNzyUd4b)@OaXx86YN$7HISoSq98f(
z0YFucDz4l|41j9@DS%W&Qj#}xlBuc|04xAQ@-={4FD)Wtze05A@+KnhNq!QMk+pWD
zs-ry5N8N7sCxCmQ&-471!^hCC6lX*hi^W-zB>h!e7>0kFg@a8-YwevJF-ejPABYM*
zfQ};~eXVp?Y6ew)|5>Kf=|RJGziu+Fh<v-_{3uP+{U8YT7mGzpRa+v`GRCx2wFSVB
zqUam|f*|O*(k~(dAAkVpIUe}B$zBx28<J-LLeKMHt%a)ArMT3qh@MwG=!wYY{2MdS
z$z;+4;5kV2-BI_a0JdT5xK>ovS(&Oj)G!Q>8%nqD*m|}lHO4FYsWZP(G*oNtNmJ{6
zC?F(VesTbrlI%4^#8tW{TLKxa0CD-b0ss{eXIWWmFC754`jcFJ5fM3T1VZwlfkc~t
z>^1#njnqF@ZjYLP_^NvBs_!riZvn}&?ATR?m6QNx045|q-__nl<PVSr5)}Y`tsCPw
zzAlR5CCSWMoBF;#HO5Tm^ZB&f?WO?cj`JQnqIOmHe^>cly2iRN3@<hS^Z+EY+3e8s
zytXmsk>`0Q)zJ0SRlduJ0O&d#wz4eyP|c(PfS6<=B5eQ(fOfTNJ*s%M?5^9)I3&k4
zkVlSZdLr_64gG^pXLUrhAtL`pthGxZ`#T<-ztpL@@3=LuR<YrFLl==L$pXNfWTvV)
z$s9mIvJjC`9LFC~eJni}k#<>@8U%p>P?9W3me$&ZF=pQBbZRH%edp9|<u?GvS%@(M
RVE6z4002ovPDHLkV1kVuZ@vHk

literal 0
HcmV?d00001

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index d6890ac0..40bb085e 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -38,7 +38,7 @@
           <div class="container_16">
             <div class="grid_16">
               {% block mediagoblin_logo %}
-                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
+                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/logo.png') }}" alt="Mediagoblin logo" /></a>
               {% endblock %}
               {% if request.user %}
               <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a>
-- 
2.25.1