Merge pull request #18 from jessebot/develop

Develop
This commit is contained in:
JesseBot 2016-01-04 00:39:30 -08:00
commit c3edb4fa45
5 changed files with 14 additions and 12 deletions

View file

@ -1,6 +1,6 @@
@media (min-width: 768px) {
.padMe {
padding: 0px 130px 0px 130px;
padding: 0px 120px 0px 120px;
}
.buttonLower {
padding-top: 50px;

View file

@ -1,14 +1,13 @@
</div>
</div><!-- /.container -->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>-->
<!-- Bootstrap core JavaScript -->
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="js/bootstrap.min.js"></script>
<script src="../assets/js/bootswatch.js"></script>
<script src="/js/bootstrap.min.js"></script>
<script>
$(function () {
$('[data-toggle="tooltip"]').tooltip()
})
</script>
</body>
</html>

View file

@ -20,5 +20,6 @@
</head>
<body>
<a href="https://github.com/jessebot/tiny_personal_website"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
<div class="container">
<div class="starter-template">

View file

@ -47,7 +47,7 @@
</div>
<div class="col-xs-12 col-sm-5 col-md-6 buttonLower">
<div class="btn-group">
<a href="{{gdoc_URL}}" class="col-xs-9 col-sm-9 col-md-9 btn btn-primary btn-lg" role="button">Resume</a>
<a target="_blank" href="{{gdoc_URL}}" class="col-xs-9 col-sm-9 col-md-9 btn btn-primary btn-lg" role="button" data-toggle="tooltip" data-placement="bottom" title="Go to Google doc, or download directly">Resume</a>
<button type="button" class="col-xs-3 col-sm-3 col-md-3 btn btn-primary btn-lg dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
@ -67,7 +67,7 @@
<img src="/images/githubcat.png">
</div>
<div class="col-xs-12 col-sm-6 col-sm-5 col-md-6 buttonLower">
<a href="{{GitHub_URL}}" class="btn btn-primary btn-lg" role="button">GitHub</a>
<a target="_blank" href="{{GitHub_URL}}" class="btn btn-primary btn-lg" role="button" data-toggle="tooltip" data-placement="bottom" title="Check out my GitHub">GitHub</a>
</div>
</div>
</div>

View file

@ -1,5 +1,7 @@
#!/usr/bin/python
# production web routing bottle file
# Code by JesseBot@Linux.com
# 1/3/16
# Production web routing bottle file
import bottle
from bottle import redirect, request, response, route