diff options
| author | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-18 23:32:44 +0100 |
|---|---|---|
| committer | Francesco Pontillo <francescopontillo@gmail.com> | 2013-03-18 23:32:44 +0100 |
| commit | 266c8ea28da92dc14fe6cb4207c149f3153141a5 (patch) | |
| tree | 43f22caf29ec3125debe36f0e64739183477a3e2 /amelia/index.html | |
| parent | 13418ac9e709c85cfbaba501efb69c8bdff7ddd4 (diff) | |
| parent | b1f9c0d9eaabf6bd07f34ed17cc1b8d99447a109 (diff) | |
Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages
Conflicts:
shamrock/index.html
Diffstat (limited to 'amelia/index.html')
| -rwxr-xr-x | amelia/index.html | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/amelia/index.html b/amelia/index.html index 689589bf..71708c7f 100755 --- a/amelia/index.html +++ b/amelia/index.html @@ -35,7 +35,7 @@ </head> <body class="preview" id="top" data-spy="scroll" data-target=".subnav" data-offset="80"> - <script src="../js/bsa.js"></script> + <!-- <script src="../js/bsa.js"></script> --> <!-- Navbar @@ -104,9 +104,21 @@ <h1>Amelia</h1> <p class="lead">Sweet and cheery.</p> </div> - <div class="span6"> - <div class="bsa well"> + <div class="span4 offset2"> +<!-- <div class="bsa well"> <div id="bsap_1277971" class="bsarocks bsap_c466df00a3cd5ee8568b5c4983b6bb19"></div> + </div> --> + <div class="well" style="padding: 15px 15px 0 15px;"> + <a href="http://carboncostume.com" target="_blank"> + <span style="float: left; margin: 0 15px 15px 0;"> + <img src="../img/carboncostume.png" width="175" height="135" style="border-radius: 5px;"> + </span> + </a> + <a href="http://carboncostume.com" target="_blank"> + <h4 style="margin-bottom: 0.4em; color: #fff;">Carbon Costume</h4> + <span style="display: block; margin-bottom: 1em; color: #fff;">DIY costumes using everyday gear.</span> + </a> + <div style="clear:both"></div> </div> </div> </div> @@ -891,6 +903,7 @@ ================================================== --> <!-- Placed at the end of the document so the pages load faster --> <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> + <script src="../js/jquery.smooth-scroll.min.js"></script> <script src="../js/bootstrap.min.js"></script> <script src="../js/bootswatch.js"></script> |