summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-03-04 13:29:41 -0500
committerEvan Prodromou <evan@status.net>2010-03-04 13:29:41 -0500
commitffbf8218097fd93397cce7a3317b86d43bb62500 (patch)
treebe928274f2aa47838917a345387b010dc4948ddf
parent5bd89d92b1a62b7fab80332acd2ca8ae0f14ee4b (diff)
parent9cedb154b487435c54ee7c3386d30a0f8fdea5f6 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
-rw-r--r--theme/base/css/display.css14
-rw-r--r--theme/base/css/ie.css4
2 files changed, 10 insertions, 8 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 964755832..bbbe4910c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -364,15 +364,11 @@ width:100%;
}
body[id$=adminpanel] #site_nav_local_views {
-float:right;
-margin-right:18.9%;
-
-margin-right:189px;
position:relative;
-width:14.01%;
-
-width:141px;
z-index:9;
+float:right;
+margin-right:18.65%;
+width:14.25%;
}
body[id$=adminpanel] #site_nav_local_views li {
width:100%;
@@ -381,7 +377,9 @@ margin-bottom:7px;
}
body[id$=adminpanel] #site_nav_local_views a {
display:block;
-width:100%;
+width:80%;
+padding-right:10%;
+padding-left:10%;
border-radius-toprleft:0;
-moz-border-radius-topleft:0;
-webkit-border-top-left-radius:0;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index 70a6fd11a..41d053ac4 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -47,3 +47,7 @@ z-index:9999;
.notice .thumbnail img {
z-index:9999;
}
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}