aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-09-27 05:04:23 -0700
committerFriendika <info@friendika.com>2011-09-27 05:04:23 -0700
commit8e02368341fd455e63da2be528fc7d70ee3c83af (patch)
treee2e6175d4bc9b480d7cc682e3c74c46f59daa711
parent7e2284043f7367f531e14ce3c26c8c3c71ca2e4b (diff)
parent0691662f5ace98f7e9584834cd3898ed48ba3570 (diff)
downloadvolse-hubzilla-8e02368341fd455e63da2be528fc7d70ee3c83af.tar.gz
volse-hubzilla-8e02368341fd455e63da2be528fc7d70ee3c83af.tar.bz2
volse-hubzilla-8e02368341fd455e63da2be528fc7d70ee3c83af.zip
Merge branch 'pull'
-rw-r--r--view/theme/easterbunny/theme.php2
-rw-r--r--view/theme/loozah/style.css3
2 files changed, 4 insertions, 1 deletions
diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
index 47b43cf13..338f40cbf 100644
--- a/view/theme/easterbunny/theme.php
+++ b/view/theme/easterbunny/theme.php
@@ -1,4 +1,4 @@
<?php
$a->theme_info = array(
- 'extends' => 'loozah',
+ 'extends' => 'duepuntozero',
);
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index e2ce0cc06..9289c9354 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -322,6 +322,7 @@ nav {
float: right;
margin-left: 0px;
margin-right: 3px;
+ margin-top: 20px;
padding: 6px;
/*border: 2px solid #000000;*/
background: #D5D5D5;
@@ -343,6 +344,7 @@ nav {
.nav-ajax-left {
margin-left: 1px;
margin-right: 2px;
+ margin-top: 15px;
float: left;
font-size: 0.6em;
font-weight: bold;
@@ -376,6 +378,7 @@ nav {
float: left;
margin-left: 3px;
margin-right: 0px;
+ margin-top: 20px;
padding: 6px;
/*border: 2px solid #000000;*/
background: #D5D5D5;