summaryrefslogtreecommitdiff
path: root/static/css
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-11-02 19:55:35 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-11-02 19:55:35 -0400
commite2e82dc608862c0c72e0d45599f2768665edf7dd (patch)
treebaad5d86f85c230afd6c61c40e6d3d7e4cd3f1c9 /static/css
parent73443969b5e98713e1bd36b0b524f60b77a0ad53 (diff)
parent1f1378031e0f643011e22942ed6005d4000d015d (diff)
Merge src/site.clj conflict
Diffstat (limited to 'static/css')
-rwxr-xr-xstatic/css/dump.css2
-rw-r--r--static/css/mgmt.css4
2 files changed, 3 insertions, 3 deletions
diff --git a/static/css/dump.css b/static/css/dump.css
index c787dae..df3e55e 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -1260,7 +1260,7 @@ bottom:65px;
width: 99.6%;
background-color:#fff;
left:0.2%;
- z-index:5;
+ z-index:;
}
#edit-toggle{
position:absolute;
diff --git a/static/css/mgmt.css b/static/css/mgmt.css
index e63a078..1a9edc3 100644
--- a/static/css/mgmt.css
+++ b/static/css/mgmt.css
@@ -3,7 +3,7 @@
v1.0 | 20080212 */
-.fulltxt{position:fixed;bottom:0;right:5;}
+.fulltxt{position:fixed;bottom:0;right:20;}
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@@ -242,7 +242,7 @@ color:#000;font-family:verdana;background-color:#ffffff; font-family: Monaco, "C
margin-left: 10px;
z-index:1050; text-decoration: none;
float:left;
- margin-top:-1px;
+ margin-top:-1px;position:fixed;background-image:url(/static/img/bg.dither.gif);
}
#logo7 a{font-size:22px;
font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif;