From 1128b15833c463b1734790c44af42e22a5b5d353 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> Date: Wed, 10 Aug 2011 23:44:18 +0200 Subject: [PATCH] fixed navigation and breadcrumb graphics --- core/css/styles.css | 8 +-- core/img/breadcrumb-divider-start.png | Bin 495 -> 0 bytes core/img/breadcrumb-divider.png | Bin 1012 -> 0 bytes core/img/breadcrumb-start.png | Bin 0 -> 452 bytes core/img/breadcrumb-start.svg | 71 ++++++++++++++++++++++++ core/img/breadcrumb.png | Bin 0 -> 452 bytes core/img/breadcrumb.svg | 77 ++++++++++++++++++++++++++ files/css/files.css | 2 +- files/templates/part.breadcrumb.php | 4 +- 9 files changed, 155 insertions(+), 7 deletions(-) delete mode 100644 core/img/breadcrumb-divider-start.png delete mode 100644 core/img/breadcrumb-divider.png create mode 100644 core/img/breadcrumb-start.png create mode 100644 core/img/breadcrumb-start.svg create mode 100644 core/img/breadcrumb.png create mode 100644 core/img/breadcrumb.svg diff --git a/core/css/styles.css b/core/css/styles.css index bafce16cc8..36fca06b9d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -91,10 +91,10 @@ legend { padding:.2em; font-size:1.2em; } #metanav li a img { vertical-align:middle; } /* NAVIGATION ------------------------------------------------------------- */ -#navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } } -#navigation ul { border-top:1px solid #ccc; } -#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } -#navigation a.active, #navigation a:hover, #navigation a:focus, #navigation a.selected { background-color:#ccc; border-top:1px solid #c8c8c8; border-bottom:1px solid #ccc; color:#000; } +#navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; } +#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } +#navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; } +#navigation a.active { background-color:#ddd; } #navigation #settings { position:absolute; bottom:3.5em; width:100%; } #expand { margin:0 0 .2em 1.2em; cursor:pointer; } #expand+span { position:relative; bottom:.4em; left:.2em; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; } diff --git a/core/img/breadcrumb-divider-start.png b/core/img/breadcrumb-divider-start.png deleted file mode 100644 index 24d1eb40857a576564a5145f5272290b7fd3eb73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmeAS@N?(olHy`uVBq!ia0y~yVBlt8U{K*;V_;y24?A#_fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0582s8c<&cDOJz#v)T8c`CQpH@<ySd_|8US6)3nU`IhoLG>mmtT}V z`<;yx0|R4@r;B5VMQ`ub^I5@;BF8_zf4|NAE=Q}=L2-dyAJ~ipm6qlm>FsukUpU)o z_e!UuPUd+miV8Pewe`NTavfC{@KpRhp;fiyahyho0MCsCKXXA7!;_K{GwkOZ7pEB- z&$!86t{!AuULP^-sWOu)bDd|EVb1v@4ByYbsT4WSID2hawq_IKyAZ9Zhc%Afm7jex zio-jq===1Bv`2{tvLdJXJ4wu#z9luSTaagi(#ukj$M0Ux^?M%2!F>ANKdr99@9b&Y zgbz6!y}Nz)-FIs_+%DaXTYsJBVd8<dnWBn3ci3hH`dIKjkp7_4<^SsIujw3i=Reoz zPda8=5VAI`p6QJL<Vki*r}X{*qP|Y&rO=P(LjK;5O_rtz)?9r5eSRNbUt;-x-aWY{ zQuc1okMYe&z4?5~rP=>;&3Ap8y5ukC%3fPm`RuJx+D-ePRqnIq{MXAq>7J<T$6B>% zCDVek{F)hNE@?fOP{8m*$7lE5I{Ck9c?<^{mi&rXdfbA6fq}u()z4*}Q$iB}VC2px diff --git a/core/img/breadcrumb-divider.png b/core/img/breadcrumb-divider.png deleted file mode 100644 index 52742e37238296beea96a2f932c5870924a3b3bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1012 zcmeAS@N?(olHy`uVBq!ia0vp@3=9k^9Bd2>3_%_nniv=u7>k44ofy`glX=O&z`&N| z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ETJF3KxuWg>TvgMop$ z#M8ww#NzbSkl6fNX%e<(4;*+88vQ&_BPpihaM#0Wva8p&e+|A-)}`SycbR3?J8b>^ z)jVW()Yf|`yCX$)yTr`aiYM>&+?)|*oT+7SXp#hb$I595Hci2eH;<+iXfC{2{B>Vl zZOOdidEad%(j@Ntue`#(GbYb3P=uXf%IQ=dtxZ?6La$%DHt+N%88r^2o??;6@F~B{ z`Q^p97u^tXy%@jxs+&dMVFfoKhu=F@LhI`OSi}n)<zAciS@%!B)Xzu%{(isw^2_n7 zSy$KAzd7zEb!}^}y8pLr+qe6NhR)TWep-#;LUb+XljoH`m>C%=K7ReQ>BH^I%b$8J zHR5WRo;s7IA!y|nt>D=TU-tgenXC8b$BRJ01F623+s>^%`|aV@?BLn6XK!b9^w8)^ zdVBTS#V5blyD|inmzN)Xf9?8r6W{LaS;yw|pH4AyPuf_ZH8twg^Uu>mLuJi2N#1?E zX={|P=cFZHQ;hUa7kLCuc@XKx#PG)^|4!Al$tREInEj618(03)Z_@hAFBz$+s?j=A zZ@4Ws<YbWRf4)`W>*}Yeh4uCEdSczm?(Xi5;U<g?8XUhie6@;;js0sp`Q#SPrWtR! znHV+(805{quReL|opXItZr|MKIjQ8L$qIA(^NZC^GZg$ff09$9>yc3Bk=@LuolOh$ zZ|~2`HRa>yk7l^T?AR9VbT=YOs<t|>k7<J=->;twR-c_YV;-N*ne)*c57>+CFC0AW zcEf&mwYf~U+uU;xAKFeo9jbc1kbkC&(!t|NhF7z;=6&6|C*AGL^Y8CszZA?#+kX51 zqRd~c3^UHpnrJUz(7*HUoiA6WOn<y%&*hhAzMbWHoVt~Vx3})+gM(Ln)IJ9;zW70! zF-_TFKDRvA%|#PC^2^eW`Ck6Q<{GH_`0|U4tnIgdU6SEqJ1!<Jt}fB0xml+=!DwdG zu>!;26>=Hdt<5H@O}_g2Ytefhot|i&Y5AG6?5@psVRvD0Fz;Pso_CKYc5jht%I2Fz z&LX8gCFge?RN``S?>_##*iA|B{*@;xzLTEluQ^?M>%8IOr{a0{cYQtf<_yp40*iSY zbymMPzuR28MES%^@9D>qFRn1RF)Z{FIP(4%|KD4eXUfcv*>87{y;<e-rpWfg7cbm? zHTx;U3G>GvKc1|(BmCs&{<men<$pbloaoADeCEdT@^?ofrr9pcj8foObXWSv-mm)d Ys!1&$+#2&47#J8lUHx3vIVCg!0N4)P6#xJL diff --git a/core/img/breadcrumb-start.png b/core/img/breadcrumb-start.png new file mode 100644 index 0000000000000000000000000000000000000000..a79d675454e19925309f65c583f13fe78ea54c57 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0y~yVBlt8U{K*;V_;y24?A#_fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq~J{)5S5wqPO?l!oEWe0&EZJ)!H?<L>#B)8q8^Bf57>Uvx0%Ik<r~xP)35~ zIP(Vu8-@&?yFso6p&=9A%+cg@=bGzjHhb>hwD0X(zj?bXh}2O!{rP81+aigE`O9AR zi!mS2=zBa(Z2FvHZQZtxlEoUYRu-5U*w6J76=e%3K6iGD1jDauxBA448}9GfZNtML zo1Giq&6ptO8tB`ttz>jPiQ$E8|M7KV%^hLC|L$9IbZypFD<%f6!vS4v3^AQAHh*}! z=G3{JOU0N2QuZBBc(zc?zt`}i`$VCM&XZKQLwN)xx7>a^n=OCV*=OJCD%ypWr0mV^ zJ?u1mw&>t)1&(Xy&)U3Us7bF@jAM7)aQgQ<$@m$SpOkLZ`?x%ITRc%DN$HkUvf26v z%KHpIKaj0C!hQcczm!b%JagS9h664pYp%Zz=l#e0_fpH$<UZ343=9kmp00i_>zopr E05+7cM*si- literal 0 HcmV?d00001 diff --git a/core/img/breadcrumb-start.svg b/core/img/breadcrumb-start.svg new file mode 100644 index 0000000000..4197763dc6 --- /dev/null +++ b/core/img/breadcrumb-start.svg @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="11" + height="36" + id="svg2" + version="1.1" + inkscape:version="0.48.1 r9760" + sodipodi:docname="New document 1"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="18.657977" + inkscape:cx="2.6788772" + inkscape:cy="16.807262" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1280" + inkscape:window-height="776" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid3760" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1016.3622)"> + <path + transform="translate(0,1016.3622)" + style="fill:#dddddd;fill-opacity:1;stroke:none" + d="M 0,0 11,18 0,36 z" + id="rect3757" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccc" /> + </g> +</svg> diff --git a/core/img/breadcrumb.png b/core/img/breadcrumb.png new file mode 100644 index 0000000000000000000000000000000000000000..b124f349f56e7da0e9975c0e888cf8e39295783f GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0y~yVBlt8U{K*;V_;y24?A#_fq{Xg*vT`5gM)*kh9jke zfq{Xuz$3Dlfr0lr2s1iq%&uTyV2~_vjVKAuPb(=;EJ|f4FE7{2%*!rLPAo{(%P&fw z{mw>;fq~J{)5S5wqIc?KTff5&0&eq_ugf$h{W96ns@-DOz~Y-RQKLheYsmzcChiN9 z<<>cLXRfeibzk5XHOsJQ+TTLElasdo`cw8~`NG`W)3@cSpR+7F&#{9!Y*o~xlO8To z3mDUO7CoHf9QwV{JV8h4exOl9M-8L&0>8eC)$vThyH#Viy}o`Ri9_-M=ZcW6r>40+ zVV}Xw?|h=;gm%D+S1QrlVuS@mb!M;Nw+U=5*6ZNw?CKR15!H>JcED3zEApGGYx=vh zaZK|MWNyommthXyIdl7_%M#8frXSedVRCYB@KxIfY!)ql>en@<3%g9oQCfCjhqd>_ z_l>3Xjm;^yr!YU*Q!l4%&s2PSPQ^{LBR7xbEdA1@x`FAO)AgTEBrn`p_UE+xPW1;G zAzx0KZg|P!a#E2|^AnT5!-O0rtp`e>Z%%AyVQKlqy)$L@KFJ!6n+yyL44$rjF6*2U FngF^!w0Zyl literal 0 HcmV?d00001 diff --git a/core/img/breadcrumb.svg b/core/img/breadcrumb.svg new file mode 100644 index 0000000000..9d522b42b7 --- /dev/null +++ b/core/img/breadcrumb.svg @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="11" + height="36" + id="svg2" + version="1.1" + inkscape:version="0.48.1 r9760" + sodipodi:docname="breadcrumb.svg" + inkscape:export-filename="/home/jancborchardt/breadcrumb.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="26.386364" + inkscape:cx="1.7139473" + inkscape:cy="25.655289" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1280" + inkscape:window-height="776" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid3760" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1016.3622)"> + <path + transform="translate(0,1016.3622)" + style="fill:#dddddd;fill-opacity:1;stroke:#dddddd;stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:31.20000076000000178;stroke-opacity:1;stroke-dasharray:none;marker-start:none" + d="m 0.5,0 10,18 -10,18 10,-18 z" + id="rect3757" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccc" + inkscape:export-filename="/home/jancborchardt/breadcrumb-start.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> +</svg> diff --git a/files/css/files.css b/files/css/files.css index cbc6795864..0d7374696c 100644 --- a/files/css/files.css +++ b/files/css/files.css @@ -55,4 +55,4 @@ table thead.fixed {height:2em} .selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; } /* add breadcrumb divider to the File item in navigation panel */ -#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-divider-start.png') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; } +#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-start.png') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; } diff --git a/files/templates/part.breadcrumb.php b/files/templates/part.breadcrumb.php index 20c436926c..96342919df 100644 --- a/files/templates/part.breadcrumb.php +++ b/files/templates/part.breadcrumb.php @@ -1,5 +1,5 @@ <?php foreach($_["breadcrumb"] as $crumb): ?> - <div class='crumb' data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb-divider.png');?>")'> + <div class="crumb svg" data-dir='<?php echo $crumb["dir"];?>' style='background-image:url("<?php echo image_path('core','breadcrumb.png');?>")'> <a href="<?php echo link_to("files", "index.php?dir=".$crumb["dir"]); ?>"><?php echo htmlspecialchars($crumb["name"]); ?></a> </div> - <?php endforeach; ?> \ No newline at end of file + <?php endforeach; ?> -- GitLab