Skip to content

Commit

Permalink
Added color-themes-for-google-code-prettify (forked repo) to prettify…
Browse files Browse the repository at this point in the history 
…-test folder
  • Loading branch information
Francis Veilleux-Gaboury committed Jan 21, 2015
2 parents 938befd + ca04b95 commit bd26179
Show file tree
Hide file tree
Showing 126 changed files with 21,896 additions and 64 deletions.
22 changes: 18 additions & 4 deletions cardshifter.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ a.csh-top-link {
}

img.twitter-logo {
height: 25px;
width: 30px;
margin-top: 10px;
height: 25px;
width: 30px;
margin-top: 10px;
-left: 5px;
}

Expand All @@ -43,19 +43,25 @@ h5 {
padding-left: 15px;
}

a.csh-nav-link {
a.csh-nav-link {
color: #000000;
}

div.csh-nav-background {
background-color: #EEEEEE;
<<<<<<< HEAD

=======
>>>>>>> develop
}

div.csh-nav-padding {
padding-top: 50px;
}

div.csh-nav-margin {
margin-top: 50px;
}
/* FORMATTING FOR PAGE BODY */

div.csh-body {
Expand Down Expand Up @@ -118,6 +124,9 @@ blockquote {
div.copyright {
padding-top: 20px;
padding-left: 15px;
padding-bottom: 5px;
position: absolute;
bottom: 0px;
}

/* FORMATTING FOR TABLES */
Expand All @@ -142,3 +151,8 @@ th {
font-size: 1.1em;
font-weight: normal;
}

div.contributor {
margin-bottom: 10px;
margin-top: 10px;
}
143 changes: 85 additions & 58 deletions contributors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

<body>

<!-- THIS CODE GENERATES THE NAVIGATION MENUS; DO NOT CHANGE IT -->
<!-- THIS CODE GENERATES THE NAVIGATION MENUS; DO NOT CHANGE IT -->

<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="navbar-header">
<!-- RIGHT SIDE DROP-DOWN MENU NOT NEEDED RIGHT NOW
Expand All @@ -51,10 +51,10 @@
</ul>
</div><!--/.nav-collapse -->
</nav>

<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 sidebar csh-nav-background csh-nav-padding">
<div class="col-sm-3 col-md-2 sidebar csh-nav-background csh-nav-margin">
<ul class="nav nav-sidebar">
<h4><a class="csh-nav-link" href="index.html">Home</a></h4>
<h4><a class="csh-nav-link" href="play-cardshifter.html">Play Cardshifter!</a></h4>
Expand All @@ -79,72 +79,92 @@ <h5><a class="csh-nav-link" href="http://chat.stackexchange.com/rooms/16134/tcg-
<h1 class="page-header">Contributors</h1>

<!-- END OF NAVIGATION MENUS -->
<div>

<div>

<!-- PAGE CONTENT STARTS HERE -->

<div class="row">
<!-- SIMON -->
<a href="http://stackexchange.com/users/1376679">
<img src="http://stackexchange.com/users/flair/1376679.png" width="208" height="58" alt="profile for Simon Andr&#233; Forsberg on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Simon Andr&#233; Forsberg on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Simon Forsberg</li>
<li><strong>In-game name: </strong>Zomis</li>
<li><strong>Contributions:</strong>
<ul>
<li>Lead project developer</li>
<li>Java server &amp; client development</li>
<li>Git repository maintainment</li>
<li>All-around great guy</li>
</ul>
</li>
<li><strong>Website: </strong><a href="http://www.zomis.net/" target="_blank">zomis.net</a></li>
<li><strong>Twitter: </strong>@SimonForsberg
</ul>
<div class="col-md-3 contributor">
<a href="http://stackexchange.com/users/1376679">
<img src="http://stackexchange.com/users/flair/1376679.png" width="208" height="58" alt="profile for Simon Andr&#233; Forsberg on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Simon Andr&#233; Forsberg on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Simon Forsberg</li>
<li><strong>In-game name: </strong>Zomis</li>
<li><strong>Contributions:</strong>
<ul>
<li>Lead project developer</li>
<li>Java server &amp; client development</li>
<li>Git repository maintainment</li>
<li>All-around great guy</li>
</ul>
</li>
<li><strong>Website: </strong><a href="http://www.zomis.net/" target="_blank">zomis.net</a></li>
<li><strong>Twitter: </strong>@SimonForsberg
</ul>
</div>

<!-- PHRANCIS -->
<a href="http://stackexchange.com/users/4456394">
<img src="http://stackexchange.com/users/flair/4456394.png" width="208" height="58" alt="profile for Phrancis on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Phrancis on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Francis Veilleux-Gaboury</li>
<li><strong>In-game name: </strong>Phrancis</li>
<li><strong>Contributions:</strong>
<ul>
<li>Web development</li>
<li>Database development</li>
<li>Modder for Cyborg Chronicles</li>
</ul>
</li>
<li><strong>Website: </strong><a href="http://www.PsychoProductions.net/" target="_blank">www.PsychoProductions.net</a></li>
<li><strong>Twitter: </strong>@PsychoProds
</ul>
<div class="col-md-3 contributor">
<a href="http://stackexchange.com/users/4456394">
<img src="http://stackexchange.com/users/flair/4456394.png" width="208" height="58" alt="profile for Phrancis on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Phrancis on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Francis Veilleux-Gaboury</li>
<li><strong>In-game name: </strong>Phrancis</li>
<li><strong>Contributions:</strong>
<ul>
<li>Web development</li>
<li>Database development</li>
<li>Modder for Cyborg Chronicles</li>
</ul>
</li>
<li><strong>Website: </strong><a href="http://www.PsychoProductions.net/" target="_blank">www.PsychoProductions.net</a></li>
<li><strong>Twitter: </strong>@PsychoProds
</ul>
</div>
</div>

<div class="row">
<!-- MARC-ANDRE -->
<a href="http://stackexchange.com/users/2423151"><img src="http://stackexchange.com/users/flair/2423151.png" width="208" height="58" alt="profile for Marc-Andre on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Marc-Andre on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Marc-Andre Girard</li>
<li><strong>In-game name: </strong>Guildan</li>
<li><strong>Contributions:</strong>
<ul>
<li>Web development</li>
</ul>
</li>
<li><strong>Twitter: </strong>@marcandregirard
</ul>
<div class="col-md-3 contributor">
<a href="http://stackexchange.com/users/2423151"><img src="http://stackexchange.com/users/flair/2423151.png" width="208" height="58" alt="profile for Marc-Andre on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for Marc-Andre on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Marc-Andre Girard</li>
<li><strong>In-game name: </strong>Guildan</li>
<li><strong>Contributions:</strong>
<ul>
<li>Web development</li>
</ul>
</li>
<li><strong>Twitter: </strong>@marcandregirard
</ul>
</div>

<!-- GREYFOX -->
<div class="col-md-3 contributor">
<div style="width:208px;height:58px;"><!-- this is a filler--></div>
<!--<a href="http://stackexchange.com/users/4703105"><img src="http://stackexchange.com/users/flair/4703105.png" width="208" height="58" alt="profile for GreyFox on Stack Exchange, a network of free, community-driven Q&amp;A sites" title="profile for GreyFox on Stack Exchange, a network of free, community-driven Q&amp;A sites"></a>-->
<ul style="font-size: 1.2em; padding-top: 10px;">
<li><strong>Name: </strong>Nicholas Lowe</li>
<li><strong>In-game name: </strong>Grey Fox</li>
<li><strong>Contributions:</strong>
<ul>
<li>Play Tester</li>
<li>Modder for Cyborg Chronicles</i>
</ul>
</li>
<li><strong>Twitter: </strong>@mgs1greyfox
</ul>
</div>

<!-- END PAGE CONTENT -->
</div>

</div>

<!-- FOOTER - DO NOT REMOVE -->
<!-- END PAGE CONTENT -->

<div class="copyright">
&copy; Copyright <script type="text/javascript">var year = new Date();document.write(year.getFullYear());</script>, Cardshifter.
</div>


<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
Expand All @@ -154,6 +174,13 @@ <h1 class="page-header">Contributors</h1>
<script src="index_files/ie10-viewport-bug-workaround.xml"></script>




</div></div></div></body></html>

</div></div></div>
<!-- FOOTER - DO NOT REMOVE -->

<div class="copyright">
&copy; Copyright <script type="text/javascript">var year = new Date();document.write(year.getFullYear());</script>, Cardshifter.
</div>

</body></html>
9 changes: 7 additions & 2 deletions page-template.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,15 +200,20 @@ <h3 class="panel-title">Red panel</h3>

<!-- END PAGE CONTENT -->

</div>

</div></div></div>
<!-- FOOTER - DO NOT REMOVE -->

<<<<<<< HEAD
<footer class="footer">
<div class="container">
<p class="text-muted">&copy; Copyright <script type="text/javascript">var year = new Date();document.write(year.getFullYear());</script>, Cardshifter.</p>
</div>
</footer>
=======
<div class="copyright">
&copy; Copyright 2014 - <script type="text/javascript">var year = new Date();document.write(year.getFullYear());</script>, Cardshifter.
</div>
>>>>>>> develop


<!-- Bootstrap core JavaScript
Expand Down
1 change: 1 addition & 0 deletions prettify-test/color-themes-for-google-code-prettify-gh-pages/channel.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<script src="//connect.facebook.net/en_US/all.js"></script>

0 comments on commit bd26179

Please sign in to comment.