arch/gmemstr.github.io
1
0
Fork 0
mirror of https://github.com/gmemstr/gmemstr.github.io.git synced 2024-09-20 04:31:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed merging artifacts

Browse source
This commit is contained in:
gmemstr 2017-04-26 12:47:25 -07:00
parent 6375422239
commit b99e9de6ec
1 changed files with 1 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
index.html
View file

@ -1,6 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<<<<<<< HEAD
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>GabrielSimmer.com</title> <title>GabrielSimmer.com</title>
@ -108,81 +107,4 @@
<link rel="stylesheet" type="text/css" href="css/reset.css" /> <link rel="stylesheet" type="text/css" href="css/reset.css" />
<!-- More like "skeleton-grid-custom-css.css" /s --> <!-- More like "skeleton-grid-custom-css.css" /s -->
<link rel="stylesheet" type="text/css" href="css/skeleton.css" /> <link rel="stylesheet" type="text/css" href="css/skeleton.css" />
</head> </head>
<body>
<header>
<h3>Gabriel Simmer</h3>
<h5>Developing to teach and learn.</h5>
</header>
<div class="container main-content">
<div class="row">
<!-- Main projects
----------------------------------->
<div class="seven columns">
<h3 style="color:#212121 !important;">Projects</h3>
<div class="project">
<div class="project-img">
<img src="images/nodemc.png" class="u-max-full-width project-img">
</div>
<div class="project-content">
<p>Open-source Minecraft server API wrapper written in Node.js.</p>
<a href="https://github.com/NodeMC">GitHub</a>
<a href="https://nodemc.space">Website</a>
</div>
</div>
<div class="project">
<div>
<img src="images/simmertech.png" class="u-max-full-width project-img">
</div>
<div class="project-content">
<p>Computer repair &amp; refurbishing on Mayne Island.</p>
<a href="https://www.facebook.com/simmertechmayne/">Website</a>
</div>
</div>
<div class="project">
<div class="project-img">
<img src="images/spigot.png" class="u-max-full-width project-img">
</div>
<div class="project-content">
<p>Java plugins for Minecraft Spigot servers.</p>
<a href="https://www.spigotmc.org/members/gmemstr.50058/">Forums</a>
</div>
</div>
</div>
<!-- /Main projects
----------------------------------->
<!-- Side projects
----------------------------------->
<div class="five columns">
<h3 style="color:#212121 !important;">Side Projects</h3>
<div class="project project-blue project-side">
<div class="project-content">
<h6>Moat</h6>
<p>HTML5 webapp for Voat.co</p>
<a href="https://github.com/gmemstr/moat-mobile">GitHub</a>
<a href="http://gabrielsimmer.com/mm">Website</a>
</div>
</div>
<div class="project project-red project-side">
<div class="project-content">
<h6>Minecraft Banner Generator</h6>
<p>Generates live server banners.</p>
<a href="https://github.com/ggservers/minecraftbanner">GitHub</a>
</div>
</div>
<div class="project project-gray project-side">
<div class="project-content">
<h6>scripts</h6>
<p>Linux scripts for various things.</p>
<a href="https://github.com/gmemstr/scripts">GitHub</a>
</div>
</div>
</div>
<!-- /Side projects
----------------------------------->
</div>
</body>
</html>
>>>>>>> 2c1897fd06c2650cc559ee49636ae38cef0d10d5