summaryrefslogtreecommitdiffstats
path: root/core/css/styles.css
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-03-31 13:12:04 +0200
commit2be2a5d2c5d8cbc671c4f301eb337fee20023538 (patch)
tree4b6870b52f5606883d239485f6e971b77bdbb956 /core/css/styles.css
parent6ac85480f7bffeb65fcbc5820ea7bd4ecd8f21ad (diff)
parent65e3f634000a2142f412b85d0443f241bb64a9ab (diff)
downloadnextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.tar.gz
nextcloud-server-2be2a5d2c5d8cbc671c4f301eb337fee20023538.zip
external storage: fix merge conflict, indentation
Diffstat (limited to 'core/css/styles.css')
-rw-r--r--core/css/styles.css3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 4420633e34e..50e0314475f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -77,6 +77,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#header .logo {
background-image: url(../img/logo.svg);
+ background-repeat: no-repeat;
width: 250px;
height: 118px;
margin: 0 auto;
@@ -84,6 +85,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
#header .logo-wide {
background-image: url(../img/logo-wide.svg);
+ background-repeat: no-repeat;
width: 147px;
height: 32px;
}
@@ -246,6 +248,7 @@ input[type="submit"].enabled {
-webkit-box-sizing: border-box;
box-sizing: border-box;
position: fixed;
+ top:45px;
right: 0;
left: 0;
height: 44px;