From f135569b2be3fb1816f802f9a162b3743b735d1c Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sat, 12 Apr 2008 15:53:31 +0200 Subject: [PATCH] Replace sidebar/logo This replaces the sidebar with a more 'common' header layout and also updates the logo. Not quite finished yet, though. Signed-off-by: Lars Hjemli --- cgit.css | 147 +++++++++++++++++++--------------------------------- cgit.png | Bin 5406 -> 1840 bytes ui-shared.c | 125 ++++++++++++++++---------------------------- 3 files changed, 97 insertions(+), 175 deletions(-) diff --git a/cgit.css b/cgit.css index 17c2712..67cf48e 100644 --- a/cgit.css +++ b/cgit.css @@ -11,41 +11,67 @@ body { padding: 4px; } +a { + color: blue; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + table { border-collapse: collapse; } -h2 { - font-size: 120%; - font-weight: bold; - margin-top: 0em; - margin-bottom: 0.25em; +table#header { + width: 100%; + margin-bottom: 1em; } -h3 { - margin-top: 0em; - font-size: 100%; - font-weight: normal; +table#header td.logo { + width: 96px; } -h4 { - margin-top: 1.5em; - margin-bottom: 0.1em; - font-size: 100%; - font-weight: bold; +table#header td.main { + font-size: 200%; } -a { - color: #600; - text-decoration: none; +table#header td.sub { + color: #777; + border-top: solid 1px #ccc; } -a:hover { - background-color: #ddd; - text-decoration: none; +table.tabs { + border-bottom: solid 2px #ccc; + border-collapse: collapse; + margin-top: 2em; + margin-bottom: 1em; + width: 100%; +} + +table.tabs td { + padding: 0px 0.5em; +} + +table.tabs td a { + padding: 2px 1em; + color: #007; +} + +table.tabs td a.active { + color: #000; + background-color: #ccc; } +div.content { + margin: 0px; + padding: 1em; +} + + table.list { + width: 100%; border: none; border-collapse: collapse; } @@ -55,7 +81,7 @@ table.list tr { } table.list tr:hover { - background: #f8f8f8; + background: #eee; } table.list tr.nohover:hover { @@ -63,8 +89,8 @@ table.list tr.nohover:hover { } table.list th { - font-weight: bold; - border-bottom: solid 1px #777; + font-weight: normal; + border-bottom: solid 1px #ccc; padding: 0.1em 0.5em 0.1em 0.5em; vertical-align: baseline; } @@ -74,79 +100,12 @@ table.list td { padding: 0.1em 0.5em 0.1em 0.5em; } -img { - border: none; +table.list td a { + color: black; } -table#layout { - border-collapse: collapse; +img { border: none; - margin: 0px; -} - -td#sidebar { - vertical-align: top; - width: 162px; - padding: 0px 0px 0px 0px; - margin: 0px; -} - -td#sidebar table { - border-collapse: separate; - border-spacing: 0px; - margin: 0px; - padding: 0px; - background-color: #ccc; -} - -td#sidebar table.sidebar td.sidebar { - padding: 4px; - border-top: solid 1px #eee; - border-left: solid 1px #eee; - border-right: solid 1px #aaa; - border-bottom: solid 1px #aaa; -} - -div#logo { - margin: 0px; - padding: 4px 0px 4px 0px; - text-align: center; - background-color: #ccc; - border-top: solid 1px #eee; - border-left: solid 1px #eee; - border-right: solid 1px #aaa; - border-bottom: solid 1px #aaa; -} - -td#sidebar h1 { - font-size: 10pt; - font-weight: bold; - margin: 8px 0px 0px 0px; -} - -td#sidebar h1.first { - margin-top: 0px; -} - -td#sidebar a.menu { - display: block; - background-color: #ccc; - padding: 0.1em 0.5em; - text-decoration: none; -} - -td#sidebar a.menu:hover { - background-color: #bbb; - text-decoration: none; -} - -td#sidebar select { - width: 100%; - margin: 2px 0px 0px 0px; -} - -td#sidebar form { - text-align: right; } input#switch-btn { @@ -357,7 +316,7 @@ table.diff td { table.diff td div.head { font-weight: bold; margin-top: 1em; - background-color: #eee; + color: black; } table.diff td div.hunk { diff --git a/cgit.png b/cgit.png index 22f7e954354eca7d22057aa53fef49cc568932b6..d7f70bc45593279bd88856b0fc318031660019a7 100644 GIT binary patch delta 1814 zcmbQIwSiBsGr-TCmrII^fq{Y7)59f*fq@}`fq}t+gN=cK;i*Xx9|HpeV{wqX6T`Z5 zGA}188r0ul;S?5T)48jn#=yWJS>hT|;+&tGo0?a`;9QiNSdyBeP@Y+mq2TW68xY>e zC(gjY*6r!y7*cWTZFIDcaHPb)TYfKFFHM`abixB&g%u}s7kG0X5nUt@m>eS18<<>k z)#dSIeU)P~ek9Zw+GHd-9dIcTHCv&u=)k*2uegpiNY!)1F|cxrW_f2Wynd5iG$;MY zw3n%^pH*vT>^J^A-}3&<|9`eWylCRvtdR3yvZexyPF8^Z?S}g2A8qJqzm8{WFp<3D${q^TE5mqfNt|>ljg)uTBD_2ffAKU%oQqYO;wOlKuU)I(c1RPVG z@@Zzn_v`BxK0hNlW1jtUlL*%;t7}uHD<@vpb8666JCV8d(fqmAA1ltwotw-(R`oOe;lhitGQgH-C6+iipp*ua&oAmI_HeKc9SaU+n{Tmmg~~ z{#;Zpk+I_`_U~7ps3p4X%Xepu>GkZX{2X7tDjGYs_3<5h@>zpRIx1?zqYH}r)#Mqj zMCqE@R5Wl*J>{HdE@4pgUGFBd#IuDvXDWJYXgimLUE4F&^U>ppC0{gxumAns!jNC{ z>P^ZCli6m4VG{dOxr47?Uf#lxzae+lsWU$3xI{BEd1k(S?C#WHzRcZC!YI>;DZRCx zsgtE<;)!B;32EiL73MN(!mD3Pa=cMuywQK3Vf*2Sm5V%B;y4afIUNYEXl1{b)~w*N zvSX%1!PMrHxz9WB#a5pC0^3dt+l)FF$+tZf5_6fQ1PvCv&Q7k4W(@f4)3Z z>fA}s^NuG{6r&57HcG5px$@@6nwL*Lh#q^Fw?k*z&DK}xu}9K{Rgz}DSh-N~oN$7? zJo}!o-M7=YWf_B39^ZI5>+9=Z`6rnf98*#XI69(sPE!2+<&ETX&VGd~vOe{@`kKJLAzNX$dAhOeO+EL-j^Ut5v zoV{8%b-^kwS$6(Sw=d0*Sg|$AB|TNqX(^NH^z+|XE$0?Qt=;hQtHJkgPWP{|-G1?6 z4)e#Yd;7DaJ1-|4T)V@fP5s-~w;kG=jXIi~At54j#JF|-{*~BU&aWmG9xNc)nJaJi z<4(|Hb4G>>`)aLAw&$_d)~B|0F)&mF#`Vp+yxg+i^5+rGlsVSocS2n9e0d*j&y5ba z`25vmb;0O}6EEd1T3UM8mTLXjsos_Mk{)cY~ix6j+oORp%Telnvdl+ks9CPONtXs&qY@ObW_`Qd=__4QNVcx8+8GmYyOrNIYw2~(#O+`jNt6ErLg2#r-=Q~Ok zD(HM=$UoQ07!znO{Vd0SeSh!Q6H`CbYjWNGTII*7vHddV@|$lIAJ2Lay&<0=UZv@D z(#)ThK58@K_B~m0;nMx{9_*(hKKZpUFg)5}(U$Y#SZ~AgrW;@ZLsnLvo3p#PBA(Bj zwryW^`@PNSlAmrYQgULDz7cg&R!#Vyj?Ncr)3w<-N0`@^9XtBl>`(a9Cpu9~&q|!@ zGiSMZ=jrkI&#N()3d!Eu5wq{lXY-`^+v1s0>sD&s;ANZf``3c}+}6^BhOct3wX`?> zvHrQt)t}+R&)}uknwl1btTj1$R3jrN=1OkAeGhZU>uU=aEL40@8hv(|?}fPi`(9N0 z)p8w4;^yA?^C-8DbpgX3ea+`Tm5PpXrNr-QX^LN_=9hWLHMwa|qPdjer3(!k+xZjU zy*>Km_Vxllp97YbmeETdemo$~<#_U`K(@&QRW&6mYw3-yt^v=VPV~#xV-aXM$Ra4f cB&PF^*;Bl8mhZC~P=&|f>FVdQ&MBb@09H9LGXMYp literal 5406 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 pXT`jB1&%K_SU&AO@+kQ~` diff --git a/ui-shared.c b/ui-shared.c index aa65988..7287956 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -7,6 +7,7 @@ */ #include "cgit.h" +#include "cmd.h" #include "html.h" const char cgit_doctype[] = @@ -465,97 +466,59 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page) } } +char *hc(struct cgit_cmd *cmd, const char *page) +{ + return (strcmp(cmd->name, page) ? NULL : "active"); +} + void cgit_print_pageheader(struct cgit_context *ctx) { - static const char *default_info = "This is cgit, a fast webinterface for git repositories"; - int header = 0; - char *url; + struct cgit_cmd *cmd = cgit_get_cmd(ctx); - html("\n"); - html("\n"); - - html("
\n"); + html("
\n"); + html("
"); } void cgit_print_filemode(unsigned short mode) -- 2.50.1