Merge pull request protalk#77 from michellesanver/master

New github icon and ribbon
jaytaph · Oct 17, 2012 · 28683ab · 28683ab
2 parents 000377b + 75abda7
commit 28683ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 25 deletions.
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -31,6 +31,7 @@
         </script>
     </head>
     <body class="yui3-skin-sam">
+        <a href="https://github.com/protalk/protalk"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
         <div id="panel"></div>
         <div id="headerContainer" class="contentContainer">
             <header>
@@ -67,11 +68,6 @@
         <div class="contentContainer">
             {% block moreContent %}{% endblock %}
         </div>
-
-        <div class="contentContainer">
-           <p id="githubrow"><a href="https://github.com/protalk/protalk"><img id="githubicon" src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/>Fork us on github!</a></p>
-        </div>
-
 
         <div id="footerStrip">
           <div class="contentContainer">
@@ -80,6 +76,7 @@
                   <div id="followUs">
                   <p>FOLLOW US</p>
                   <nav>
+                      <a href="https://github.com/protalk/"><img src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/></a>
                       <a href="http://www.facebook.com/pages/ProTalk/216612481777731"><img src="{{ asset('images/facebookIcon.png') }}" alt="Facebook Icon"/></a>
                       <a href="http://twitter.com/pro_talk"><img src="{{ asset('images/twitterIcon.png') }}" alt="Twitter Icon"/></a>
                       <a href="mailto:info@protalk.me"><img src="{{ asset('images/mailIcon.png') }}" alt="Mail Icon"/></a>
@@ -101,4 +98,4 @@
 
     {% block javascripts %}{% endblock %}
     </body>
-</html>
+</html>
diff --git a/web/css/main.css b/web/css/main.css
@@ -1008,23 +1008,4 @@ form ul {
     width:165px;
     left:0;
     margin-bottom:10px;
-}
-
-#githubrow {
-    padding-left: 20px;
-    float: left;
-}
-
-#githubrow a {
-    font-size: 1.3em;
-    color: #3a668b;
-}
-
-#githubrow a:hover {
-    font-size: 1.3em;
-    color: #0096ff;
-}
-
-img#githubicon {
-    float: left;
 }
diff --git a/web/images/githubIcon.png b/web/images/githubIcon.png