Merge pull request #16 from jessebot/develop

Develop
This commit is contained in:
JesseBot 2016-01-03 23:42:44 -08:00
commit f9fd3acb3f
3 changed files with 6 additions and 5 deletions

1
.gitignore vendored
View file

@ -5,4 +5,5 @@ config.yaml
front_end/images/private/*
front_end/images/defcon23.JPG
front_end/images/swag.gif
front_end/images/newhairlolz.png
front_end/images/favicon_jessebot.ico

View file

@ -6,10 +6,10 @@
padding-top: 50px;
}
.featureTextPad {
padding-top: 50px;
padding-top: 80px;
}
.featureImagePad {
padding-left: 50px;
padding-left: 30px;
}
.imageLower {
padding-top: 12px;
@ -24,7 +24,7 @@
padding: 0px 80px 0px 80px;
}
.featureImagePad {
padding-left: 50px;
padding-left: 30px;
}
.featureTextPad {
padding-top: 50px;

View file

@ -12,8 +12,8 @@
</div>
<div id="collapseOne" class="panel-collapse collapse in">
<div class="panel-body">
<div class="row featurette">
<div class="col-sm-6 col-md-5 featureImagePad">
<div class="row featurette featureImagePad">
<div class="col-sm-6 col-md-5">
<img class="featurette-image img-responsive img-circle" src="/images/{{main_pic}}">
</div>
<div class="col-sm-6 col-md-7 featureTextPad">