Commit 655c067c authored by Talita Halboth's avatar Talita Halboth
Browse files

corrigindo o merge - parte 2

parent 038700c4
*{
box-sizing: border-box;
box-sizing: border-box;
}
td{
}
body{
font-family: 'Neuton', serif;
font-family: 'Neuton', serif;
background: url("shattered_island_renvoye.gif");
background: url("shattered_island_renvoye.gif");
overflow-x: auto;
overflow-x: auto;
}
a{
color: #a40000;
color: #a40000;
}
......@@ -24,26 +24,27 @@ a{
/* Menu lateral */
#navbar{
position: fixed;
left: 0;
top: 0;
padding: 0 inherit;
position: fixed;
left: 0;
top: 0;
padding: 0 inherit;
width: 14em;
height: 100%;
cursor: pointer;
width: 14em;
height: 100%;
cursor: pointer;
overflow:auto;
}
#options {
display:none;
position:fixed;
right:0;
top:0;
display:none;
position:fixed;
right:0;
top:0;
background: #40444c;
border-color: #DDD;
z-index:10;
z-index:10;
}
#options > div {
......@@ -70,111 +71,111 @@ a{
#container{
padding: 1em;
padding-left: 15em;
padding: 1em;
padding-left: 15em;
}
@media only screen and (max-device-width: 480px) {
#navbar{
display: inline;
}
#navbar{
display: inline;
}
#container{
padding: 0;
margin: 0;
}
#container{
padding: 0;
margin: 0;
}
.content{
padding: 0;
width: 100%;
margin: 0;
border-radius: 0;
}
.content{
padding: 0;
width: 100%;
margin: 0;
border-radius: 0;
}
}
#logo{
max-width: 90%;
max-height: 100%;
max-width: 90%;
max-height: 100%;
padding: 0;
margin-left: auto;
margin-right: auto;
padding: 0;
margin-left: auto;
margin-right: auto;
}
#menu li a{
font-weight: bold;
color: #000;
font-weight: bold;
color: #000;
-moz-transition: 0.2s color linear;
-webkit-transition: 0.2s color linear;
transition: 0.2s color linear;
-moz-transition: 0.2s color linear;
-webkit-transition: 0.2s color linear;
transition: 0.2s color linear;
}
#menu li a:hover{
color: #04a;
color: #04a;
}
#menu li.pure-menu-disabled a{
color: #888;
color: #888;
}
#navbar, .content{
background-color: #fff;
background-color: #fff;
}
.wrap-center{
text-align: center;
position: relative;
text-align: center;
position: relative;
}
.wrap-center > *{
text-align: left;
margin: 0 auto;
text-align: left;
margin: 0 auto;
}
.content{
width: 80%;
border-radius: 0.5em;
margin: 0.5em auto;
padding: 1em;
width: 80%;
border-radius: 0.5em;
margin: 0.5em auto;
padding: 1em;
}
.content h1{
margin-top: 5px;
margin-top: 5px;
}
.info{
width: 95%;
border: 1px solid black;
border-radius: 0.5em;
background: #eee;
width: 95%;
border: 1px solid black;
border-radius: 0.5em;
background: #eee;
padding: 0.5em;
padding: 0.5em;
}
.info-mobile{
display:none;
width: 95%;
border-radius: 0.5em;
background: #eee;
display:none;
width: 95%;
border-radius: 0.5em;
background: #eee;
}
#title{
text-align: center;
text-align: center;
background: none;
color: #fff;
background: none;
color: #fff;
font-size: x-large;
font-size: x-large;
}
#title img{
border-radius: 0.5em;
width: 100%;
max-width: 610px;
border-radius: 0.5em;
width: 100%;
max-width: 610px;
}
......@@ -182,153 +183,153 @@ a{
h1, h2, h3,
dt {
font-family:Arial, Helvetica, sans-serif;
font-family:Arial, Helvetica, sans-serif;
}
/* definições especiais das divs de conteudo */
#log{
color: #a40000;
color: #a40000;
}
#log ul{
list-style: none;
padding-left: 15px;
list-style: none;
padding-left: 15px;
}
#log li{
margin: 5px 0;
border-left: 3px solid #a40000;
padding-left: 8px;
margin: 5px 0;
border-left: 3px solid #a40000;
padding-left: 8px;
}
#log .sep{
border-left: 3px solid #a40000;
margin-left: 5px;
margin-right: 8px;
border-left: 3px solid #a40000;
margin-left: 5px;
margin-right: 8px;
}
#importante{
background: #ffa;
background: #ffa;
}
#oque ul{
list-style: none;
padding: 0;
font-weight: bold;
list-style: none;
padding: 0;
font-weight: bold;
}
#mapa ul{
list-style: none;
position: relative;
list-style: none;
position: relative;
}
#mapa li{
margin: 10px 0;
margin: 10px 0;
}
#lb-sugestao{
font-size: xx-large;
font-weight: bold;
font-size: xx-large;
font-weight: bold;
}
/* cronograma */
#cronograma-mobile{
display:none;
display:none;
}
table#cronograma{
text-align: center;
text-align: center;
}
table#cronograma th{
border: 1px solid #cbcbcb;
border: 1px solid #cbcbcb;
}
table#cronograma .firstcolumn{
width: 10%;
width: 10%;
}
table#cronograma .othercolumns{
width: 18%;
width: 18%;
}
#crono dt{
font-weight: bold;
font-weight: bold;
}
#crono dt{
margin-top: 14px;
margin-bottom: 3px;
margin-top: 14px;
margin-bottom: 3px;
}
#crono dd > dl{
margin: 0;
margin: 0;
}
#crono dd dt,
#crono dd dd{
display: inline-block;
margin: 3px;
display: inline-block;
margin: 3px;
}
/* Legenda do mapa */
.marker{
display: inline-block;
border-width: 3px;
border-style: solid;
padding: 0;
padding-left: -40px;
margin-left: -40px;
margin-right: 5px;
width: 22px;
height: 22px;
border-radius: 14px;
color: white;
text-align: center;
vertical-align: middle;
display: inline-block;
border-width: 3px;
border-style: solid;
padding: 0;
padding-left: -40px;
margin-left: -40px;
margin-right: 5px;
width: 22px;
height: 22px;
border-radius: 14px;
color: white;
text-align: center;
vertical-align: middle;
}
.marker-gray{
background-color: #6c6c6c;
border-color: #aaa;
background-color: #6c6c6c;
border-color: #aaa;
}
.marker-purple{
background-color: #c091e6;
border-color: #DAABFF;
background-color: #c091e6;
border-color: #DAABFF;
}
.marker-blue{
background-color: #1087bf;
border-color: #60c4d5;
background-color: #1087bf;
border-color: #60c4d5;
}
.marker-gold{
background-color: #ffd700;
border-color: #FFEA70;
background-color: #ffd700;
border-color: #FFEA70;
}
/* footer */
#footer{
width: 100%;
background-color: #fff;
border-top: 4px solid #c6c6c6;
height: 10em;
color: black;
margin: 0 -2em -1em 0;
padding: 1em;
padding-left: 16em;
width: 100%;
background-color: #fff;
border-top: 4px solid #c6c6c6;
height: 10em;
color: black;
margin: 0 -2em -1em 0;
padding: 1em;
padding-left: 16em;
}
#logo-pet{
margin-top: 3%;
width: 180px;
margin-top: 3%;
width: 180px;
}
......@@ -346,8 +347,15 @@ table#cronograma .othercolumns{
}
#navbar {
width: 100%;
height: auto;
display:none;
left:1%;
width: 98%;
height:80%;
margin-top:3px;
border-width:2px;
border-color:black;
border-style:solid;
}
#container {
......@@ -355,14 +363,13 @@ table#cronograma .othercolumns{
}
#menu {
display:none;
width: 100%;
top:0;
overflow: hidden;
overflow:auto;
}
#options {
display:inline;
display:inline;
}
#menu.open{
......@@ -371,28 +378,28 @@ table#cronograma .othercolumns{
}
.info-mobile{
display:inline;
display:inline;
}
.info{
display:none;
display:none;
}
#cronograma{
display:none;
}
#cronograma-mobile{
display:inline;
}
#footer{
width: 100%;
background-color: #fff;
border-top: 4px solid #c6c6c6;
height: 10em;
color: black;
margin: 0;
padding: 0;
padding-left: 0;
}
display:none;
}
#cronograma-mobile{
display:inline;
}
#footer{
width: 100%;
background-color: #fff;
border-top: 4px solid #c6c6c6;
height: 10em;
color: black;
margin: 0;
padding: 0;
padding-left: 0;
}
}
......
......@@ -306,7 +306,7 @@
*/ ?>
</div>
<div class="content" id="mapa">
<div class="content" id="mapa">
<h1>Mapa do Centro Politécnico</h1>
<div class="wrap-center">
......@@ -427,6 +427,7 @@ ______________________________________PATROCINIO AQUI__________________________
menuAberto = false;
//Adiciona os trigger nos botoes do menu
var filhosMenu = document.getElementById("menu").children;
for(filho in filhosMenu){
filhosMenu[filho].onclick=function(){close_menu();};
......@@ -434,7 +435,7 @@ ______________________________________PATROCINIO AQUI__________________________
function close_menu(){
if(menuAberto){
var e = document.getElementById('menu');
var e = document.getElementById('navbar');
e.style.display="none";
document.getElementsByTagName("body")[0].style.overflow="auto";
}
......@@ -442,7 +443,7 @@ ______________________________________PATROCINIO AQUI__________________________
}
function open_menu(){
var e = document.getElementById('menu');
var e = document.getElementById('navbar');
if(e.style.display != "inline"){
e.style.display="inline";
document.getElementsByTagName("body")[0].style.overflow="hidden";
......@@ -527,4 +528,4 @@ ______________________________________PATROCINIO AQUI__________________________
</script>
</body>
</body>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment