aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-04-17 16:24:59 +0200
committerJan-Christoph Borchardt <JanCBorchardt@fsfe.org>2011-04-17 16:24:59 +0200
commitc192af186d0d193bb5d66efd8f6b64ab3bb51f3e (patch)
treed479ce2ffaf2e801b5d2899e088522ce2cc49b4a
parent270e1101f4e6dabb8ea578282bedd5476ca2e9f0 (diff)
downloadnextcloud-server-c192af186d0d193bb5d66efd8f6b64ab3bb51f3e.tar.gz
nextcloud-server-c192af186d0d193bb5d66efd8f6b64ab3bb51f3e.zip
removed HTML from CSS I put there last time. Also fixed header and navigation
-rw-r--r--css/styles.css57
-rw-r--r--img/header-a.pngbin0 -> 2951 bytes
-rw-r--r--img/header-settings-a.pngbin0 -> 2885 bytes
3 files changed, 7 insertions, 50 deletions
diff --git a/css/styles.css b/css/styles.css
index 0ee0e14bfb5..8f8fa693f10 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -1,7 +1,9 @@
* { margin:0; padding:0; border:0; }
body { background-color:#fefefe; background-image:url('../img/body_background.jpg'); background-repeat:repeat-y; background-position:left top; line-height:1.6em; font:normal 80% "Lucida Grande", Arial, Verdana, sans-serif; color:#000; }
-#header { height:70px; padding:0.5em 1.5em; background-image:url('../img/header.png'); background-repeat:repeat-x; background-position:left top; }
-#body-settings #header { background-image:url('../img/header-settings.png'); }
+#header { position:fixed; width:100%; height:5.5em; padding:0.5em 1.5em; background-image:url('../img/header-a.png'); background-repeat:repeat-x; background-position:left top; }
+#plugins { position:fixed; }
+#main { margin-top:7em; }
+#body-settings #header { background-image:url('../img/header-settings-a.png'); }
#owncloud { float:left; margin:0 0 0 2em; }
h1 { margin:1em 3em 1em 0; border-bottom:1px solid #666; text-transform:uppercase; font-weight:normal; font-style:italic; color:#666; }
p.center { text-align:center; }
@@ -46,58 +48,13 @@ form a { color:#000; text-decoration:none; }
#login input { width:8em; margin:0.1em; padding:0.2em 0.5em; border:1px solid #ddd; -moz-border-radius:15px; -webkit-border-radius:15px; border-radius:15px; font-size:2em; color:#666; }
#login input:hover, #login input:focus { outline:0; }
#login input[type='submit'] { width:5em; border:1px solid #ddd; background-color:#fff; font-size:2em; }
-#login input[type=
-<!DOCTYPE html>
-<html>
- <head>
- <title>ownCloud</title>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="/ocjcb//img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="/ocjcb//img/favicon-touch.png" />
- <link rel="stylesheet" href="/ocjcb//css/jquery-ui-1.8.10.custom.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="/ocjcb//css/styles.css" type="text/css" media="screen" />
- <script type="text/javascript" src="/ocjcb//js/jquery-1.5.min.js"></script>
- <script type="text/javascript" src="/ocjcb//js/jquery-ui-1.8.10.custom.min.js"></script>
- <script type="text/javascript" src="/ocjcb//js/js.js"></script>
- </head>
-
- <body class="login">
- <div id="login">
- <img src="/ocjcb//img/owncloud-logo-medium-white.png" alt="ownCloud" />
- <form action="#" method="post">
- <input type='hidden' name='install' value='true'/>
- <fieldset>
- <input type="text" name="login" value="username" />
- <input type="password" name="pass" value="password" />
- </fieldset>
- <fieldset>
- <legend><abbr title="to use SQLite instead, install it on your server">MySQL</abbr> Database</legend>
- <input type="text" name="dbuser" value="admin / username" />
- <input type="password" name="dbpass" value="password" />
- <input type="text" name="dbname" value="database name" />
- </fieldset>
- <fieldset id="advanced">
- <legend><a id="advanced_options_link" href="">Advanced ▾</a></legend>
- <div id="advanced_options">
- <label class="left">Data directory</label></p><input type="text" name="directory" value="/var/www/ocjcb/data" />
- <input type='hidden' name='dbtype' value='mysql'/>
- <label class="left">Host</label></p><input type="text" name="dbhost" value="localhost" />
- <label class="left">Table prefix</label></p><input type="text" name="dbtableprefix" value="oc_" />
- </div>
- </fieldset>
- <fieldset>
- <p class="submit"><input type="submit" value="Create" /></p>
- </fieldset>
- </form>
-</div>
- <p class="info"><a href="http://owncloud.org/">ownCloud</a> is a personal cloud which runs on your own server.</p>
- </body>
-</html> 'submit']:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; }
+#login input[type='submit']:hover, #login input[type=submit]:focus { background-color:#ccc; outline:0; }
/* META NAVIGATION (Settings, Log out) ---------------------------------------------------------------- */
-#metanav { float:right; position:relative; top:1.5em; list-style:none; margin:0; padding:0; }
+#metanav { float:right; position:relative; top:1.5em; right:2.5em; list-style:none; margin:0; padding:0; }
#metanav li { display:inline; }
#metanav li a { margin:.1em; padding:1em; }
-#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#444 0 1px 0; -moz-box-shadow:#444 0 1px 0; -webkit-box-shadow:#444 0 1px 0; }
+#metanav li a:hover, #metanav li a:focus { background:rgba(0,0,0,.5); -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; outline:0; box-shadow:#555 0 1px 0; -moz-box-shadow:#555 0 1px 0; -webkit-box-shadow:#555 0 1px 0; }
#metanav li a img { vertical-align:middle; }
/* PLUGINS MENU ------------------------------------------------------------- */
diff --git a/img/header-a.png b/img/header-a.png
new file mode 100644
index 00000000000..46fb0977ee2
--- /dev/null
+++ b/img/header-a.png
Binary files differ
diff --git a/img/header-settings-a.png b/img/header-settings-a.png
new file mode 100644
index 00000000000..a72271be6a4
--- /dev/null
+++ b/img/header-settings-a.png
Binary files differ