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 86abbe0cab..0000000000
Binary files a/core/img/actions/back.png and /dev/null differ
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 @@
-
-
-
-
diff --git a/core/img/actions/settings.png b/core/img/actions/settings.png
index ff650ecb0b..5b1607e59f 100644
Binary files a/core/img/actions/settings.png and b/core/img/actions/settings.png differ
diff --git a/core/img/actions/settings.svg b/core/img/actions/settings.svg
index 67473520af..da685e8be0 100644
--- a/core/img/actions/settings.svg
+++ b/core/img/actions/settings.svg
@@ -15,8 +15,8 @@
height="16"
id="svg2457"
inkscape:version="0.48.1 r9760"
- sodipodi:docname="bonobo-component-browser.svg"
- inkscape:export-filename="/home/jancborchardt/SparkleShare/playground/ownCloud/elementaryicons/elementary-icon-theme/elementary/actions/16/bonobo-component-browser.png"
+ sodipodi:docname="settings.svg"
+ inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
+
+ 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 @@
; ?>)
@@ -51,6 +51,7 @@
; ?>)
+