summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorDawid Opis <ncore@ncore.com.pl>2011-08-11 22:29:48 +0200
committerDawid Opis <ncore@ncore.com.pl>2011-08-11 22:29:48 +0200
commit11b3c10cc61b42174c3f3bc46276c59135dff856 (patch)
tree40912e1a8326b9f13eb132ba0fa6ba3b093279dd /core/css
parent9683d44633cd24696573a0c3ca193a3b5d06f1b7 (diff)
parentce9b36fd3ed2f229886abe32b84698733321d399 (diff)
downloadnextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.tar.gz
nextcloud-server-11b3c10cc61b42174c3f3bc46276c59135dff856.zip
resolved merge conflicts
Diffstat (limited to 'core/css')
-rw-r--r--core/css/styles.css4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css
index 0b9517cab38..3f035027fbf 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -9,7 +9,7 @@ table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
caption, th, td { text-align:left; font-weight:normal; }
table, td, th { vertical-align:middle; }
a { border:0; color:#000; text-decoration:none;}
-a, a img, a strong, a span, input, select, li { cursor:pointer; }
+a, a *, input, input *, select, .button span, li { cursor:pointer; }
ul { list-style:none; }
body { background:#fefefe; font:normal 80%/1.6em "Lucida Grande", Arial, Verdana, sans-serif; color:#000; margin-bottom:2em; }
@@ -99,6 +99,6 @@ legend { padding:.2em; font-size:1.2em; }
li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .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:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:block; position:fixed; left:50%; top:0;
+#notification{ z-index:101; cursor:pointer; 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; }