summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-04-13 17:26:58 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-04-13 17:26:58 +0000
commit526cdd8a8195e52bf41346abc4f9255427729023 (patch)
tree37b07076573671441411fdc2184fa3aa96c9149a
parente34011f1bd862bc0e68ce7dc49aea39dcd164a4e (diff)
parentd4f9f2c69bb9cba7aa2ff67a2b75d106f1bd1607 (diff)
Merge branch '0.7.x' into 0.8.x
-rw-r--r--theme/default/base/css/display.css4
-rw-r--r--theme/default/skin/default/css/display.css4
-rw-r--r--theme/default/skin/identica/css/display.css4
3 files changed, 4 insertions, 8 deletions
diff --git a/theme/default/base/css/display.css b/theme/default/base/css/display.css
index 6c7ae20ea..a6fe8eb75 100644
--- a/theme/default/base/css/display.css
+++ b/theme/default/base/css/display.css
@@ -921,6 +921,10 @@ padding:0;
}
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
#new_group, #group_search {
margin-bottom:18px;
}
diff --git a/theme/default/skin/default/css/display.css b/theme/default/skin/default/css/display.css
index 71b962e96..e290c208b 100644
--- a/theme/default/skin/default/css/display.css
+++ b/theme/default/skin/default/css/display.css
@@ -232,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/default/skin/identica/css/display.css b/theme/default/skin/identica/css/display.css
index d72368934..a44b8cdd7 100644
--- a/theme/default/skin/identica/css/display.css
+++ b/theme/default/skin/identica/css/display.css
@@ -232,10 +232,6 @@ background-color:#fcfcfc;
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {