From 16bb34cd94d61421a48c1e06ab8f8d5f1d202288 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Mon, 8 Aug 2011 23:31:58 +0200 Subject: [PATCH] settings are now AWESOME --- core/css/styles.css | 8 ++- core/img/actions/back.png | Bin 396 -> 0 bytes core/img/actions/back.svg | 121 --------------------------------- core/img/actions/settings.png | Bin 695 -> 883 bytes core/img/actions/settings.svg | 77 +++++++++++++++++---- core/js/js.js | 6 ++ core/templates/layout.user.php | 3 +- 7 files changed, 78 insertions(+), 137 deletions(-) delete mode 100644 core/img/actions/back.png delete mode 100644 core/img/actions/back.svg diff --git a/core/css/styles.css b/core/css/styles.css index b17224b269..7960617d24 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -1,3 +1,7 @@ +/* Copyright (c) 2011, Jan-Christoph Borchardt + This file is licensed under the Affero General Public License version 3 or later. + See the COPYING-README file. */ + * { margin:0; padding:0; border:0; outline:0; cursor:default; } body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; margin-bottom:2em; } @@ -36,7 +40,7 @@ input[type="checkbox"] { width:auto; } #body-login input { font-size:1.5em; } #body-login input[type="submit"] { float:right; margin-right:.8em; } #remember_login { margin:.8em .2em 0 1em; } -form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border- +form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:4em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border- radius:1em; border-radius:1em; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } @@ -90,6 +94,8 @@ legend { padding:.2em; font-size:1.2em; } #navigation .subentry { background-color:#ddd; border-top:1px solid #aaa; color:#555; } #navigation .subentry.active { background-color:#bbb; border-top:1px solid #888; border-bottom:1px solid #bbb; } #navigation .subentry a { padding-left:3.1em; font-size:1em; } +#navigation #settings { position:absolute; bottom:3.5em; width:100%; } +#navigation #expand { margin:0 0 .2em 1.2em; } /* USER SETTINGS ------------------------------------------------------------ */ #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; } diff --git a/core/img/actions/back.png b/core/img/actions/back.png deleted file mode 100644 index 86abbe0cabe37a4b47f32241b5f327bc346f98ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b zK>3v*%%~e5=>ZgEFY)wsWxvfL$i-}JxAVO_0|TR^r;B5V#p$h+H+mg$5NJ!Erpx4> zmCYTvA-aZvyIW*ic-MP{mA-E-b=x&&NXaX#%~iN&wz9=xR*aL-q_gk(eEs;p@RT2~ z{jmA4&j0fV3>bbNktp7`HBz%QvnO+#k+)`kTVlqPpe-ABzW>dxnX123Me}J2gI@Qx z-1Lqg9UbAx^N(Hc`KqsT`jHI7g4es4mtL_|I(OVYiZlJc?*RsePd58gd(OUOS5caA zsl4I+@Ari=^+v}6vU{VlFGU@m5;l`laou8#UmB+;iFF?hTDD4S)$3pWj0_(P7kEy3 za(D-+C(2 n7jwP#*2@_=x9wVLKeIkwb;(MOb^ZomxG{LT`njxgN@xNABn_ag diff --git a/core/img/actions/back.svg b/core/img/actions/back.svg deleted file mode 100644 index 2bdf50c733..0000000000 --- a/core/img/actions/back.svg +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png index ff650ecb0b0eaa766a055ec8d5f31648539177d6..5b1607e59fcdcc465ad42b8cd5ef4b15d66570a6 100644 GIT binary patch delta 786 zcmV+t1MU2`1@i`wZh!DeL_t(IjdfE&NE~Mr{@y?T%#ON_JCoh$7*`PwYAds4J*c1w zZV`p{B0XrEH4zLXQ0%RTZ79-1<2i`rBFV*86g-50kV7ObLQKIH7AuxTx<%WOb;Gg? z(Q$Wn{vN8Lu>Ih{JAB`J@8i7(Ap|M~=X`{SUJ%g>&iTmy@_%p!A|gdmK4Xmi>Nw7y zgM))Zj^kJWplRACMD$Ws)mG2*qQzoyRR|#f{8xa8sHUdotNQx-&ySCfGlfFo=$`Z-AtuYryKx;5bo;gYI=Tt{)Qw;lAFvkVqubqobn)0CZ*ru~_VTNs{6KFf}!m93LP50l;qnJOI}6^77q)0FY^#BSMHT!{KnFuIs^2DD-}Daq$6wpMP-`J@I(_+0oHaO`%Z8rPJws zBAVwzLqk2;Y}Ptw1p+|kkTgmdoe?d{!9 zBoe;^SbyOF-T-(L3WdJqoZsV|%Z-hV-?g{5w=%}w0)XdvJq-;FcT`pN0f1?mKLL1n zv4yU#E=AY%=cZ|XaMn=d^Z9rAe7*oc)YjH&fj}TgL<9htOy-YlHv8%J_I8m2z|71{ zIh9KJlF1}gRW12^K9?~T)O9_0ZlSKO?&S3Jlz%&pBM%P`D-#nF(v>?Xm&>=8mX_{D zB9Xs4J3IfGo143}wY3!nfbQ<@{psoHjh&sHU^1C(9vd55mSy=V0CDk5k|g~YkH<3r zQULyvW%&_f>s;c^hbN-EGS*B%K7J!!k#FYsupbx<0S-t|`RVC8DNOd|18uF0` Q01E&B07*qoM6N<$f*W6jj{pDw delta 596 zcmV-a0;~P=2Db%}ZhtgML_t(Ijg6DfYZE~f$G@|<2?asWL~RV{KcKZ(5Dz&j6vPJn z2YL(SQp}~t;w>Q;Q4&u!g4TuP5NeGb z%ge3;0F1F&u~^)fQbI}zA%v{g>xbEFb}yUF?$zt{Lm`9=@`Xa-QzDTNVGB4tJ$>)G zF1fBt`FwsKz<)Y`I{2&Ug!O>`B5K&{%HxYdwkH>nLZMWNN%5XTe18-7F#A2~)=UrYr9={r92ZMnF z04o4?YPDL!G)?lgxoE*O&CMWRtJN9+b^tuQL_|jbj(^JKvPwh`{C3}2mUR!nXaDeL zQpzpH7yzK#?S3VqmjM3E!EiWSibkV96h*mmkvR}T{NkM7OeT|_0sy&OjyIdlVrZo)1Aj2?7)3k=F zsxQ*%^i8W$sdNyDM4kuTFTV970Ji|JYPI@C*LBi$ohp^eTL28ebpWZLIQ$p>3&z+A ifV98;LPX!r;(h}nLKF{~C}-pV0000 + + gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)" /> + + + + + + + + style="opacity:0.6;fill:#ffffff;fill-opacity:1"> + transform="translate(0,-0.056)" + style="fill-opacity:1;fill:url(#linearGradient3784);opacity:0.7"> diff --git a/core/js/js.js b/core/js/js.js index 9e2ae8d710..6ad999878c 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -264,6 +264,12 @@ $(document).ready(function(){ $('#remember_login+label').fadeIn(); } }); + + if($('body').attr("id")=="body-user") { $('#settings li').hide(); } + $('#expand').click(function() { + $('#settings li').slideToggle(); + }); + }); diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 4cbf6261cb..ae847e9827 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -32,7 +32,7 @@ ownCloud
    -
    • +
@@ -51,6 +51,7 @@