Merge branch 'master' of github.com:gergelypolonkai/gergelypolonkaiweb
Conflicts: src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig
This commit is contained in:
		| @@ -60,6 +60,8 @@ | ||||
|                 :: Copyright © 2012, Gergely Polonkai :: <a href="{{ path('GergelyPolonkaiFrontBundle_disclaimer') }}">Disclaimer</a> :: | ||||
|             </div> | ||||
|         </div> | ||||
|         <a href="https://github.com/gergelypolonkai" id="github-ribbon"><img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_orange_ff7600.png" alt="Fork me on GitHub"></a> | ||||
|         <iframe src="http://githubbadge.appspot.com/badge/gergelypolonkai?s=1&a=0" style="border: 0; height: 142px; width: 200px; overflow: hidden; display: none; position: absolute; top: 100px; left: 100px;" frameBorder="0" id="github-badge"></iframe> | ||||
|         <script type="text/javascript"> | ||||
|             $(document).ready(function() { | ||||
|                 $('.at-obfuscation').html('@'); | ||||
| @@ -67,6 +69,21 @@ | ||||
|                 $('#tagcloud-button').click(function() { | ||||
|                     $('#tag-cloud').toggle('slow'); | ||||
|                 }); | ||||
|  | ||||
|                 $('#github-ribbon').mouseover(function() { | ||||
|                     $('#github-badge').fadeIn(); | ||||
|                 }); | ||||
|  | ||||
|                 $('#github-ribbon').mouseout(function() { | ||||
|                     $('#github-badge').fadeOut(); | ||||
|                 }); | ||||
|  | ||||
|                 $(document).mousemove(function(e) { | ||||
|                     $('#github-badge').css({ | ||||
|                         top: e.pageY + 5, | ||||
|                         left: e.pageX + 5 | ||||
|                     }); | ||||
|                 }); | ||||
|             }); | ||||
|         </script> | ||||
|     </body> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user