Merge branch 'master' of https://github.com/Coderockr/coderockr.github.com

Author: thvieira86

index.html

@@ -168,16 +168,16 @@ <h2>A Coderockr está pronta para dar um<br />show, entre em contato!</h2>
         <div class="wrap">
           <div class="col2">
             <ul>
-              <li class="clearfix"><a href="http://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=Rua+Nove+de+Mar%C3%A7o,+737,+Joinville+-+Santa+Catarina,+Brasil&amp;aq=0&amp;oq=R.+Nove+de+Mar%C3%A7o+737,+joinville&amp;sll=-26.3015,-48.848893&amp;sspn=0.008224,0.016512&amp;g=rua+R.+Nove+de+Mar%C3%A7o+737,+joinville&amp;doflg=ptk&amp;ie=UTF8&amp;hq=&amp;hnear=R.+Nove+de+Mar%C3%A7o,+737+-+Centro,+Joinville+-+Santa+Catarina,+89201-400,+Brazil&amp;ll=-26.3015,-48.848893&amp;spn=0.016447,0.033023&amp;t=m&amp;z=14&amp;output=embed" class="map-link" title="Clique para ver o mapa">
-                  <img src="/public/images/contact-map.jpg" width="39" height="40" alt="" />Rua 9 de março, 737, Sala 502<br />Centro  |  89201-400  |  Joinville  |  SC</a>
+              <li class="clearfix"><a href="https://maps.google.com/maps?f=q&amp;source=s_q&amp;hl=en&amp;geocode=&amp;q=Rua+Ministro+Calógeras,+910,+Joinville+-+Santa+Catarina,+Brasil&amp;aq=0&amp;oq=Rua+Ministro+Calogeras+910&amp;sll=37.0625,-95.677068&amp;sspn=54.665451,96.328125&amp;vpsrc=0&amp;ie=UTF8&amp;hq=&amp;hnear=R.+Min.+Calógeras,+910+-+Centro,+Joinville+-+Santa+Catarina,+89201-485,+Brazil&amp;t=m&amp;z=17&amp;iwloc=A" class="map-link" title="Clique para ver o mapa">
+                  <img src="/public/images/contact-map.jpg" width="39" height="40" alt="" />Rua Ministro Calogeras 910, sobreloja<br />Bairro Atiradores  |  89201-500  |  Joinville  |  SC</a>
                   <div class="map"><iframe width="100%" height="100%" frameborder="0" scrolling="no" name="codemap" marginheight="0" marginwidth="0"></iframe></div>
               </li>
               <li class="clearfix"><img src="/public/images/contact-phone.jpg" width="39" height="40" alt="" /><span>47 3227.6359</span></li>
               <li class="clearfix"><a href="mailto:contato@coderockr.com" title="contato@coderockr.com"><img src="/public/images/contact-mail.jpg" width="39" height="40" alt="" /><span>contato@coderockr.com</span></a></li>
               <li class="clearfix"><a href="http://twitter.com/coderockr"><img src="/public/images/contact-twitter.jpg" width="39" height="40" alt="" /><span>@coderockr</span></a></li>
             </ul>
           </div>
-          <div class="col1">
+          <div class="col1" style="display: none;">
             <form action="#" method="post" id="contact-form">
               <fieldset>
                 <ul>
@@ -216,7 +216,7 @@ <h2>A Coderockr está pronta para dar um<br />show, entre em contato!</h2>
         <div class="col1">
           <p>
             <img src="/public/images/rockrhand.png" width="20" height="52" alt="" />
-            Rua 9 de março, 737, Sala 502<br />Centro | 89201-400<br />Joinville | SC | 47 3227.6359
+            Rua Ministro Calogeras 910, sobreloja<br />Bairro Atiradores | 89201-500<br />Joinville | SC | 47 3227.6359
           </p>
         </div>
         <div class="col2">

public/styles/style.css

@@ -461,13 +461,13 @@ a.anchor{
   margin-bottom:40px;
 }
 #contact div.wrap div.col1, #contact div.wrap div.col2{
-  width:45%;
-  float:left;
+  /*width:45%;
+  float:left;*/
   margin-right:9%;
 }
 #contact div.wrap div.col2{
   margin-right:0;
-  float:right;
+  /*float:right;*/
 }
 #contact div.wrap div.col1 ul, #contact div.wrap div.col2 ul{
   list-style:none;