Merge branch 'pull'
This commit is contained in:
commit
8e02368341
|
@ -1,4 +1,4 @@
|
||||||
<?php
|
<?php
|
||||||
$a->theme_info = array(
|
$a->theme_info = array(
|
||||||
'extends' => 'loozah',
|
'extends' => 'duepuntozero',
|
||||||
);
|
);
|
||||||
|
|
|
@ -322,6 +322,7 @@ nav {
|
||||||
float: right;
|
float: right;
|
||||||
margin-left: 0px;
|
margin-left: 0px;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
|
margin-top: 20px;
|
||||||
padding: 6px;
|
padding: 6px;
|
||||||
/*border: 2px solid #000000;*/
|
/*border: 2px solid #000000;*/
|
||||||
background: #D5D5D5;
|
background: #D5D5D5;
|
||||||
|
@ -343,6 +344,7 @@ nav {
|
||||||
.nav-ajax-left {
|
.nav-ajax-left {
|
||||||
margin-left: 1px;
|
margin-left: 1px;
|
||||||
margin-right: 2px;
|
margin-right: 2px;
|
||||||
|
margin-top: 15px;
|
||||||
float: left;
|
float: left;
|
||||||
font-size: 0.6em;
|
font-size: 0.6em;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
|
@ -376,6 +378,7 @@ nav {
|
||||||
float: left;
|
float: left;
|
||||||
margin-left: 3px;
|
margin-left: 3px;
|
||||||
margin-right: 0px;
|
margin-right: 0px;
|
||||||
|
margin-top: 20px;
|
||||||
padding: 6px;
|
padding: 6px;
|
||||||
/*border: 2px solid #000000;*/
|
/*border: 2px solid #000000;*/
|
||||||
background: #D5D5D5;
|
background: #D5D5D5;
|
||||||
|
|
Loading…
Reference in a new issue