Permalink
Browse files

Merge branch 'gh-pages' of github.com:SUSE/hackweek into gh-pages

  • Loading branch information...
2 parents fbdadc4 + 32c9f61 commit c07033a76d0cf3867763e2ce225fde18e7a6e848 @digitaltom digitaltom committed Mar 14, 2013
Showing with 29 additions and 8 deletions.
  1. +25 −4 css/hackweek.css
  2. +4 −4 index.html
View
@@ -17,10 +17,10 @@ li {
}
span:hover{
-o-transition:.2s;
--ms-transition:.2s;
--moz-transition:.2s;
--webkit-transition:.2s;
-transition:.2s;
+ -ms-transition:.2s;
+ -moz-transition:.2s;
+ -webkit-transition:.2s;
+ transition:.2s;
}
.page-size {
width: 100%;
@@ -627,13 +627,31 @@ transition:.2s;
top: 50%;
margin-top: -274px;
}
+#world-map a{
+ -o-transition:.2s;
+ -ms-transition:.2s;
+ -moz-transition:.2s;
+ -webkit-transition:.2s;
+ transition:.2s;
+ color: #7AC142;
+ font-weight: bold;
+ text-decoration: none;
+}
+#world-map a:hover{
+ color: #7AC142;
+ text-decoration: underline;
+}
+#world-map a:visited{
+ color: #7AC142;
+}
#provo{
background: url('../images/pin.png');
width: 33px;
height: 38px;
position: inherit;
margin-left: 196px;
margin-top: 209px;
+ cursor: pointer;
}
#provo-zoom{
background: url('../images/provo.png');
@@ -652,6 +670,7 @@ transition:.2s;
margin-top: 177px;
position: inherit;
width: 33px;
+ cursor: pointer;
}
#nuremberg-zoom{
background: url('../images/nuremberg.png');
@@ -671,6 +690,7 @@ transition:.2s;
margin-top: 180px;
position: inherit;
width: 33px;
+ cursor: pointer;
}
#prague-zoom{
background: url('../images/prague.png');
@@ -690,6 +710,7 @@ transition:.2s;
position: inherit;
right: 0;
width: 33px;
+ cursor: pointer;
}
#beijing-zoom{
background: url('../images/beijing.png');
View
@@ -317,28 +317,28 @@
<span class="office-location">Provo</span>
<span class="office-address">1800 South Novell Place</span>
<span class="office-phone">+1 (801) 861-4272</span>
- <span class="office-map">Local map</span>
+ <span class="office-map"><a href="http://maps.google.com/maps?f=d&hl=en&geocode=&time=&date=&ttype=&saddr=SLC&daddr=Novell+Pl,+Provo,+UT+84606&sll=40.37592,-111.785095&sspn=0.381859,0.843887&ie=UTF8&z=10&om=0" target="_blank">Local map</a></span>
</div>
<div id="nuremberg-zoom" class="location-zoom">
<span class="office-location">Nuremberg</span>
<span class="office-address">Maxfeldstr. 5</span>
<span class="office-phone">+49 (0)911-740 53-0</span>
- <span class="office-map">Local map</span>
+ <span class="office-map"><a href="https://maps.google.it/maps?q=Maxfeldstra%C3%9Fe+5,+Nuremberg,+Germany&hl=en&ie=UTF8&sll=50.104946,14.486203&sspn=0.012593,0.016265&oq=maxfeldstrasse,+5+&hnear=Maxfeldstra%C3%9Fe+5,+90409+N%C3%BCrnberg,+Mittelfranken,+Bayern,+Germany&t=m&z=17" target="_blank">Local map</a></span>
</div>
<div id="prague-zoom" class="location-zoom">
<span class="office-location">Prague</span>
<span class="office-address">Lihovarska 1060/12</span>
<span class="office-phone">+420 28 40 84000</span>
- <span class="office-map">Local map</span>
+ <span class="office-map"><a href="https://maps.google.it/maps?q=Lihovarsk%C3%A1+1060%2F12,+Prague,+Czech+Republic&hl=en&ie=UTF8&ll=50.104946,14.486203&spn=0.012593,0.016265&sll=41.442726,12.392578&sspn=15.05927,16.655273&oq=Lihovarska+1060%2F12,+c&t=m&hnear=Lihovarsk%C3%A1+1060%2F12,+190+00+Praha,+Czech+Republic&z=16" target="_blank">Local map</a></span>
</div>
<div id="beijing-zoom" class="location-zoom">
<span class="office-location">Beijing</span>
<span class="office-address">Room3603-3606</span>
<span class="office-phone">+86 10 6533 9000</span>
- <span class="office-map">Local map</span>
+ <span class="office-map"><a href="https://maps.google.it/maps?q=%E5%8C%97%E4%BA%AC%E8%B4%A2%E5%AF%8C%E4%B8%AD%E5%BF%83A%E5%BA%A7%E5%86%99%E5%AD%97%E6%A5%BC3603%E5%AE%A4+&hl=en&ie=UTF8&ll=39.916056,116.460528&spn=0.030118,0.03253&sll=41.442726,12.392578&sspn=15.05927,16.655273&hnear=Block+A,+Beijing+Fortune+Plaza+Office+Bldg,+7%E5%8F%B7+Dong+San+Huan+Zhong+Lu,+Chao+Yang+Qu,+Beijing,+China&t=m&z=15" target="_blank">Local map</a></span>
</div>
</div>

0 comments on commit c07033a

Please sign in to comment.