Skip to content

Commit

Permalink
Merge branch 'lugmap.it' of github.com:Gelma/LugMap into lugmap.it
Browse files Browse the repository at this point in the history
  • Loading branch information
madbob committed Oct 28, 2014
2 parents 822868d + 901de2c commit 16f83cf
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 24 deletions.
31 changes: 18 additions & 13 deletions assets/css/main.css
@@ -1,3 +1,5 @@
/*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}

html {
height: 100%;
}
Expand Down Expand Up @@ -40,15 +42,15 @@ img {
display: block;
}

.intro {
font-size: 10px;
color: #000000;
margin: 10px;
vertical-align: bottom;
position: fixed;
bottom: 0px;
width: 20%;
text-align: center;
.divLogo{
position: absolute;
bottom: 10px;
width:100%;
}
.introLogo{
text-align:center;
max-width:100%;

}

.center_frame {
Expand Down Expand Up @@ -130,10 +132,15 @@ img {
margin: 0 auto;
}

.verticalslider_tabs {
float: left;
.divMenu{
width: 20%;
position: fixed;
height: 100%;
}

.verticalslider_tabs {
float: left;
width:100%;
}

.verticalslider_tabs, .verticalslider_tabs li {
Expand All @@ -143,7 +150,6 @@ img {

.verticalslider_tabs li {
list-style-type: none;
width: 95%;
}

.verticalslider_tabs a:link, .verticalslider_tabs a:visited {
Expand Down Expand Up @@ -185,7 +191,6 @@ img {
margin: 0px;
padding: 0px;
height: 100%;
margin-bottom: 30px;
}

label {
Expand Down
1 change: 0 additions & 1 deletion index.php
@@ -1,5 +1,4 @@
<?php

if ($_SERVER ['HTTP_HOST'] != 'lugmap.it' && $_SERVER ['HTTP_HOST'] != 'www.lugmap.it') {
$domain = explode ('.', $_SERVER ['HTTP_HOST']);
$host = $domain [0];
Expand Down
16 changes: 6 additions & 10 deletions varie.php
Expand Up @@ -100,7 +100,7 @@ function do_head ($title = null, $javascript = array (), $stylesheet = array ())
}

?>

<div class="divMenu">
<ul class="verticalslider_tabs">
<li><a<?php if ($select == 0) echo ' class="select"' ?> href="<?php echo $main_url ?>/index.php">Mappa</a></li>

Expand All @@ -114,16 +114,12 @@ function do_head ($title = null, $javascript = array (), $stylesheet = array ())

<li><a<?php if ($select == 4) echo ' class="select"' ?> href="<?php echo $main_url ?>/forge.php">Progetti Collaterali</a></li>
<li class="verticalslider_subtabs"><a<?php if ($select == 5) echo ' class="select"' ?> href="<?php echo $main_url ?>/widget.php">Widget Web</a>

<li>
<p class="intro">
<img src="images/logo.png" alt="lugmap.it" />
</p>
</li>
</ul>

<div class="verticalslider_contents">

<div class="divLogo">
<img src="images/logo.png" alt="lugmap.it" class="introLogo"/>
</div>
</div>
<div class="verticalslider_contents">
<?php
}

Expand Down

0 comments on commit 16f83cf

Please sign in to comment.