From 7579c0ec507c5758a5e78822c965bece840c8288 Mon Sep 17 00:00:00 2001 From: Daniel Vincent Grippi <Dan@SPEEDRACER.local> Date: Mon, 13 Sep 2010 11:05:10 -0700 Subject: [PATCH] more cleanup --- app/views/layouts/application.html.haml | 2 +- public/images/diaspora.png | Bin 1207 -> 0 bytes public/images/loader.gif | Bin 1623 -> 0 bytes public/stylesheets/application.css | 7 +++++-- public/stylesheets/sass/application.sass | 6 +++++- 5 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 public/images/diaspora.png delete mode 100644 public/images/loader.gif diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 6f9fdbce38..3e3a37ecd1 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -7,7 +7,7 @@ %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ = stylesheet_link_tag "blueprint/screen", :media => 'screen' - = stylesheet_link_tag "application", "ui", 'bubble' + = stylesheet_link_tag "application", "ui" = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1" = stylesheet_link_tag "fileuploader" diff --git a/public/images/diaspora.png b/public/images/diaspora.png deleted file mode 100644 index 7241f0db33127e8eb8f0dea9801e58dcaa1a3ca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1207 zcmV;o1W5adP)<h;3K|Lk000e1NJLTq004gg001Qj1^@s6Yp6DY0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$SxH1eRCwC#T#a#?Fcg-38GsF<PEayI z)CuYhN;YsNAeq3;1oj3_Ca^OB-T*d$4XDX|YF?-$^aD<6>$_9Wu|d*%-_!epD{I@9 zd4OX?e0`*<FW-3gB!7ny@%7OWEL7yrM_wp7jshczdjFF6%gfm0bGVr_hJ{Z<eH?4e z;mh$mfA{_4y8Q)4#OKBM9Y|in?dR~urQ{~Y{PRWz189i>BvZ!xi2o`Tj3@t6+<qC| z{`sRLcuQP7E%kEzoksF6v(8Uq%)eYT^23$kqAoVvviJ7j{y1Ka<1jF}Ec2cXO@_`A zzxOP%oA>EBs(}VYhJ7Uv<P~e_?pu=IyY+q&nJUQi?ARn(U>@mOUk3I-byGoBPUeyF zzbf{^iN0v7wp(*U$<*LR%bCLM3&f2UNyCmL5G_8J2Dd-d1E>{q@5pzlA(5eb*r9f% zrHsz)<>cCu+%M%U4D0IlU-b6gjg>{X%wfQ7PnH(VnSN8IRqVSUd+_R{s$%|vETn4G z2(nQh@&y!>8ptgSiA=%%?HndVp*r%VqJ)9adcXiAVOzr<R0Q^QQ>yB2eC7(TwPfmU zX=Z6~R^)S{{2^;9Jjoxz3IeGNqh)@bLrK_>D>oUQuppKak{fi>8VuDHg|Dvr<gc+Y z9+>TikT00}DU=8#KX+I=Gn`l(tYJvW396)Ab6Bj%pZA2{SR^fDK_-5}!r=DU*UB<B z`#`R7t4X*XE$4Y8N#U5_L|@}PF~!N}j_xSr<Yy%A(NU8`Mhql;Yt1zwCtrr0Qsc_G zgIY^Xh;TjmGMA_o`YMSYgHAptrO%YuK`9%QATx|_$8k5X{sGr*aH^y$&e?eH4m1jq zuRU~AvG7OQ3FPY%zI(_n^>qUe(}XN=b;9OCj?=2DJ1dN4z+E;ll6zeD>o^{upgYHU z{bbD)Pi!&Ajbg3?#&t*-oRfIR6!C6MWH_~lkrdm_^#h}VvP9s#g6KlxmHg&1Pl%i} z&uFG1WZtu;DPO|i6NQyM44{E02vzt&F~7^)8R@`<>}B#WOv!(O3mGzi#511R#K9!M z6C48L?2722kKZ6Qwb*|Sg9$nLRnG{<*4Kw@pC)9r!NqZsk-KL5vX77&TxD&@_A`U9 zvO$$=vi-uK$b{@|X}G3f<}RSkH7?n{%;t46FG=Pf+~lDG$Z~1{A{ICqvK-rbkT1Jv zHA(&iNR?}@G~~;BW%iqr?`7$z>rB$}h{`0``%4ZsZBm_X1kue<i`a#HK}xzzvFDl? z?I`4%YD-#HEt$S$x;6a9*~bSVEfInfvQondtrhpL3@1bqn``<Du8E>*p1ussLpM4D zC=EPFZ|Oz;?Cqb~Om|I+MXHgLkA!`ERP2)waT4o?nmiArL&ph8`v4hIVsLvlEnMUc zI{D`Ymk!^>Ail|S;fUl%@*^Vo5t00eNPa{lKO&MJah}EgnWJl`#{Vxs!TTQp1^^1Y V2tWt;&J+Lu002ovPDHLkV1kggOOF5m diff --git a/public/images/loader.gif b/public/images/loader.gif deleted file mode 100644 index 570a3cb9e6f6f6df33ab90a0763ea63747a4dabf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1623 zcmdVY`A?Gv7zgn8ecQg2OG=?oTd;lU!Aq&NCr6>>?LjX<%7AdlM$6G~ly>E41py1S z1q-xgL<DszI@B?ZsF}KCixZWYh%=MTUv`lliJOVjWGpdDwqf=w{sDV_f0EDl`96B1 zE-&9o0!YB00FaT9!Dh30JRYCVmq;WzIXMLd1xlq7!?2Q)lG4&rv)No#RaH|{)7aS9 z*4AdX+k1L?+-`S&fB*3C@W{x>)YMcs9G;(_&&<q3QB)`t%H?vcR%<XA%FD|uDk`e0 ztLy6O8X6ib7K_bh>+9?DdcA=_AQ%ja#p2xD-2D7}lgZTC+1b_A<#M?~q0sd7G?&Yj zN~J25N~hD+*Vp&<_D)PpL?RImhhsDv9S(;;AgHXY+_PtoMx!Y!E32)o9UmVD{%?c) z6T7##s#2pe7mEc#9Ju92{@z_?ZE0mT^)pMltv&5s?cG-9-qw!hwpO>5iF!O9f!%3s zX?NJ10!M3a7J$6MgE3o+{MX@M_X-ePOlD{-IlY+&-^Q#|*@dQ;g%1e(2&4-M6UE{Y zBObov+`QS4;ny{j^3Y1yfL~}@+%cIwwaGH@NMJl>_+#zqV#h|x$bn~Gc{M4FKfuD* z!&y*lOt(FOq<|GrOmxs5*^$ukPNy3^ev*f5qkxAn@4FXX4T|ryh$UBRwez=u{I&gs zzVUUbX#q1n`V|i?m^rcV3@z^7d2>KhbM3p8CSt<<$O*F=mqs%U5eQW~Gq{Yv5RFJ5 znhb?$@C@Mdhj*Sb(%vtrszx&W!F1x{5EJp!XLb^afzvdkd+1Ui4gM^=qE>Au8rTvM z%^yN{e}2K7P6NP}$3#mNFK+hPm5il^%U}PtDgU%7<!G`na0P%=K)}tZaUx`J2E`9} zP4*;laygORZ;YpgguvmqO>rSA**t3EkptywmkETjkAb`6I?Yl1rSmZrx{8ZSW&;?r z`^Lwf8Q(3_n>lk2#|=MjxYyZZIxjLRX(L}}B_}^#Q=WD%zQ_DR{qPJ)DoB#;<q)O& zizb-g-ft&<c@joN`HZ)Qy{KH|m$(cPn4Q<IuF$fBta^1$T?Z_pQuF&XGMOHSlP*xv z#UuKNjE4A_9toXZymZ`C{zi_0PXi0^O=E@6=V)V^Yv0)C?xdG5fXgvn_2nDL^W=%= z5dy2(Pm{geH%O12^evx8=`sa{YatX47kfu71>NKPew!O0cJXcesOtE5f>0z99OdJ< zRB96URDzz6dM-6aAh76g$>%6Iy*7#~94OwFb8xGy*BsENqUOQJXt2gNNXE(b&FFC2 zgAc8rpW}2m;y#+Ik6XT{Us&Bpa&&C|^r*Mf@zli_EORtiZC*oeikv;BEGlx+v#3<L z2?mQYxw|yVBh(ZQiWV_4(NmftG>gSeNl8>Pb~)8bI>^decG(z=Pqu%c{{KvVzj_0W z<KqgyU$1LPpXE`ovk@}x$uH(>W;5tp!Aies3q%FiK9IrE2SnQsc~=cYU|>*B@B%Jz z5<%~2YTzak?UqRmC=iJfJx+e2ViuS?rifAqj0#1cAwj^8rBH_IrpCG4sM2D>CGB<> ziaP8CMtz6;hcG$_(CGmmQ>#TFnJfqfeVCR?P0fZd094KT=qFBQ`yiES{wyn1&R#w{ zHwv-HoV4o~gKBLmnik4NU|{9$YJiTcVj42@)+h)qV`}8gAqetEQz*<04RSr2Oi@GX e-y!75@{4FFEs?x>GX$&$2LH;v-?)GQ1^)thPqD-R diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a458f26d4f..a390514d06 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -83,7 +83,6 @@ header { padding-top: 5px; border-bottom: 1px solid #cccccc; } header #diaspora_text { - z-index: 6; display: inline; font-family: "BrandonGrotesqueLightRegular"; font-size: 16px; @@ -101,6 +100,8 @@ header { position: absolute; display: inline; right: 0; } + header #session_action a { + color: #999999; } header #session_action ul { list-style: none; padding: 0; @@ -356,7 +357,8 @@ label { margin-right: 15px; } #publisher p { position: absolute; - left: 0; } + left: 0; + top: 0; } #publisher form { display: inline; } #publisher form input[type='submit'] { @@ -465,6 +467,7 @@ h1.big_text { display: none; } #group_nav { + z-index: 4; position: relative; color: black; margin-top: 8px; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index b0598db156..662e7f2d37 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -91,7 +91,6 @@ header :bottom 1px solid #ccc #diaspora_text - :z-index 6 :display inline :font :family 'BrandonGrotesqueLightRegular' @@ -116,6 +115,9 @@ header :display inline :right 0 + a + :color #999 + ul :list :style none @@ -452,6 +454,7 @@ label p :position absolute :left 0 + :top 0 form :display inline @@ -597,6 +600,7 @@ h1.big_text :display none #group_nav + :z-index 4 :position relative :color #000 :margin -- GitLab