Merge branch 'pull'

diff --git a/view/theme/easterbunny/theme.php b/view/theme/easterbunny/theme.php
index 47b43cf1311b3943f346ca69b8bb497261024490..338f40cbfbc65ddc755b978eebea1b2776267ba7 100644 (file)
--- 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 e2ce0cc066734f2b493191a06b028849b2a5d223..9289c9354b2ba168c051eaa5b43e5356cfa29cab 100644 (file)
--- 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;