aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Sack <kde@jakobsack.de>2011-08-10 22:28:18 +0200
committerJakob Sack <kde@jakobsack.de>2011-08-10 22:28:18 +0200
commitb54d790a873290e71654e94ac5072e87e6ba5427 (patch)
tree45f84405c147eb16334a53fbecd788df46a4dc1b
parent5324d6f7df91d4284b822debe49ef09bdc140d1a (diff)
parent1dac5bb390852bf679ea02cfb28dc5c7292c537f (diff)
downloadnextcloud-server-b54d790a873290e71654e94ac5072e87e6ba5427.tar.gz
nextcloud-server-b54d790a873290e71654e94ac5072e87e6ba5427.zip
Merge branch 'master' of git://anongit.kde.org/owncloud
-rw-r--r--core/css/styles.css3
-rw-r--r--files/css/files.css7
2 files changed, 7 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 9da216a80d2..273d7443a8b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -105,3 +105,6 @@ legend { padding:.2em; font-size:1.2em; }
li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#fee url('../img/task-attention.png') .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
.hidden{ display:none; }
+#notification{ z-index:400; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0;
+-moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em;
+-moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
diff --git a/files/css/files.css b/files/css/files.css
index 004721cff9a..23fdf2ee50e 100644
--- a/files/css/files.css
+++ b/files/css/files.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. */
+
/* FILE MENU */
.actions { padding:.6em; float:right; margin-right:13em; }
.actions input { margin:0; padding:.3em; }
@@ -54,6 +58,3 @@ table thead.fixed {height:2em}
/* add breadcrumb divider to the File item in navigation panel */
#navigation>ul>li:first-child { background:url('../../core/img/breadcrumb-divider-start.png') no-repeat 12.5em 0px; width:12.5em; padding-right:1em; }
-#notification{ z-index:150; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0;
--moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em;
--moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }