summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2014-02-20 14:29:23 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2014-02-20 14:29:23 +0100
commit3f6d14be859e7c9f80b81a38f99b8b192e92f935 (patch)
treea439609f26a4a9a977e037e1b3565e42be4a2dbb /core/css
parent742f54b6d556797bbef2847e546861de0008a28a (diff)
parent5144def99bf084f1e415a8734909363725d2925d (diff)
downloadnextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.tar.gz
nextcloud-server-3f6d14be859e7c9f80b81a38f99b8b192e92f935.zip
Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core
Conflicts: core/css/styles.css
Diffstat (limited to 'core/css')
-rw-r--r--core/css/styles.css13
1 files changed, 13 insertions, 0 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index bee44785f12..01c2f89b9ce 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -74,6 +74,19 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
color: #aaa;
}
+#header .logo {
+ background-image: url(../img/logo.svg);
+ width: 250px;
+ height: 118px;
+ margin: 0 auto;
+}
+
+#header .logo-wide {
+ background-image: url(../img/logo-wide.svg);
+ width: 147px;
+ height: 32px;
+}
+
/* INPUTS */
input[type="text"],
input[type="password"],