Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mrhaki/website
base: e633a5a5f1
...
head fork: mrhaki/website
compare: 5853190830
  • 2 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
View
3  www.mrhaki.com/_layouts/default.html
@@ -70,13 +70,14 @@
<li><a href="http://www.pixeldam.net">Pixeldam</a></li>
<li><a href="http://www.x-panded.com/">Xpanded</a></li>
<li><a href="http://www.drbob42.com/">DrBob42</a></li>
- <li><a href="http://www.vxcompany.com/SoftwareOntwikkeling/Java/Applicatie%20Ontwikkeling/Paginas/Groovy--Grails.aspx"><img src="/images/VXCompany.jpg" width="143" height="54" alt="VX Company logo" title="VX Company" /></a></li>
+ <li><a href="http://www.vxcompany.com/"><img src="/images/VXCompany.jpg" width="143" height="54" alt="VX Company logo" title="VX Company" /></a></li>
</ul>
</nav>
<nav id="connect_links">
<h3>Connect</h3>
<ul>
<li><a href="http://www.twitter.com/mrhaki">Twitter</a></li>
+ <li><a href="http://gplus.to/mrhaki">Google+</a></li>
<li><a href="http://nl.linkedin.com/in/mrhaki">LinkedIn</a></li>
<li><a href="http://www.facebook.com/mrhaki">Facebook</a></li>
<li><a href="http://www.delicious.com/mrhaki">Delicious</a></li>
View
21 www.mrhaki.com/about/index.html
@@ -11,27 +11,33 @@
<li>
<p><a href="http://www.twitter.com/mrhaki"><img src="{{ page.social_icons }}/twitter-webtreatsetc.png"
alt="Twitter" title="Twitter" width="48" height="48"/></a></p>
- <p><a href="http://www.twitter.com/mrhaki">Tweet, tweet</a></p>
+ <p class="description"><a href="http://www.twitter.com/mrhaki">Tweet, tweet</a></p>
</li>
<li>
+ <p><a href="http://gplus.to/mrhaki"><img src="{{ page.social_icons}}/google-g-logo-webtreatsetc.png"
+ alt="Google+" title="Google+" width="48" height="48"/></a></p>
+ <p class="description"><a href="http://nl.linkedin.com/in/mrhaki">Plus, add</a></p>
+ </li>
+
+ <li>
<p><a href="http://nl.linkedin.com/in/mrhaki"><img src="{{ page.social_icons}}/linkedin-logo-webtreatsetc.png"
alt="Linkedin" title="Linkedin" width="48" height="48"/></a></p>
- <p><a href="http://nl.linkedin.com/in/mrhaki">Let's connect</a></p>
+ <p class="description"><a href="http://nl.linkedin.com/in/mrhaki">Let's connect</a></p>
</li>
<li>
<p><a href="http://www.facebook.com/mrhaki"><img src="{{ page.social_icons}}/facebook-logo-square-webtreatsetc.png"
alt="Facebook" title="Facebook" width="48" height="48"/></a></p>
- <p><a href="">Be friends</a></p>
+ <p class="description"><a href="">Be friends</a></p>
</li>
<li>
<p><a href="http://www.delicious.com/mrhaki"><img src="{{ page.social_icons}}/delicious-logo-square-webtreatsetc.png"
alt="Delicious" title="Delicious" width="48" height="48"/></a></p>
- <p><a href="http://www.delicious.com/mrhaki">Share bookmarks</a></p>
+ <p class="description"><a href="http://www.delicious.com/mrhaki">Share bookmarks</a></p>
</li>
<li>
<p><a href="mrhaki.vcf"><img src="{{ page.social_icons}}/mail-webtreatsetc.png"
alt="vCard" title="vCard" width="48" height="48"/></a></p>
- <p><a href="mrhaki.vcf">Contact</a></p>
+ <p class="description"><a href="mrhaki.vcf">Contact</a></p>
</li>
</ul>
@@ -67,14 +73,11 @@
Groovy Goodness posts.
<br/>
In november 2010 I presented a Gradle talk at the J-Fall conference of the Dutch Java User Group.
+ And in november 2011 I presented about the new features in Groovy 1.8 at the same conference.
The conference is visited by 1000 Java developers and I got the chance to educate some of them
about the greatness of Gradle.
</p>
- <p>
-
- </p>
-
<h2>VX Company</h2>
<p>
View
1  www.mrhaki.com/css/13col.css
@@ -12,6 +12,7 @@
#footer_links { width: 312px; }
#friend_links { width: 396px; }
#connect_links { width: 312px; }
+ #connect li { width: 130px; height: 95px; }
#blogger #footer_links { width: 144px; }
#blogger #friend_links { width: 228px; }
#blogger #connect_links { width: 144px; margin-right: 24px; }
View
3  www.mrhaki.com/css/3col.css
@@ -16,6 +16,9 @@
#headernav ul { float: none; list-style: none; }
#headernav li { float: none; padding: 4px 0; }
#connect ul, #connect li, #connect h2 { float: none; }
+ #connect ul { margin: 0; }
+ #connect li p.description { display: none; }
+ #connect li { height: 70px; width: 50px;}
footer nav h3 { margin-top: 10px; }
#connect_links, #footer_links, .Followers, .Label { width: 228px; }
.CustomSearch { display: none; }
View
3  www.mrhaki.com/css/5col.css
@@ -15,6 +15,9 @@
#footer_links { width: 60px; }
#connect_links, #friend_links { width: 144px; }
+ #connect ul { margin: 10px 0; }
+ #connect li { height: 60px; }
+ #connect li p.description { display: none; }
.Label { width: 228px; }
.CustomSearch { margin-left: 84px; }
.Followers { margin-top: 0px; }
View
2  www.mrhaki.com/css/default.css
@@ -87,7 +87,7 @@ code, pre { font: 16px/24px Monaco, Consolas, monospace; }
-------------- */
#connect ul { list-style: none; margin: 20px 0 40px 0; }
#connect li, #connect ul p { text-align: center; }
-#connect li { width: 100px; height: 95px; }
+#connect li { width: 80px; height: 95px; }
#connect ul, #connect li { float: left; }
img.photo { margin: 5px 15px 5px 0; }
View
7 www.mrhaki.com/samples/sample.json
@@ -0,0 +1,7 @@
+{
+ "user": {
+ "name": "mrhaki",
+ "age": 38,
+ "interests": ["Groovy", "Grails"]
+ }
+}

No commit comments for this range

Something went wrong with that request. Please try again.