Skip to content

GitLab

Commit 3ae764d0 authored by David Haynes's avatar David Haynes
Browse files

Move the test page up a level 

- running 'grunt' will take you to a test bootstrap page
- also masonstrap placed everywhere!
parent 8b373a6c
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 36 deletions
_config.yml
View file @ 3ae764d0
exclude: ["src", "node_modules", "bower.json", "bower_components/font-awesome/src", package.json", "README.md", "Gruntfile.js"]
exclude: ["src", "node_modules", "bower.json", "bower_components/font-awesome/src", "package.json", "README.md", "Gruntfile.js"]
include: ["_bootswatch.scss","_variables.scss"]
bower.json
View file @ 3ae764d0
{
"name": "Masonstrap",
"description": "Mason bootstrap theme",
"description": "Easily provide any web project with Mason branding",
"author": "Mason SRCT",
"homepage": "https://srct.gmu.edu",
"repository": {
......
masonstrap/index.html → index.html
View file @ 3ae764d0
......@@ -2,37 +2,22 @@
<html lang="en">
<head>
<meta charset="utf-8">
<title>Bootswatch: Custom</title>
<title>Masonstrap</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="stylesheet" href="./bootstrap.css" media="screen">
<link rel="stylesheet" href="../assets/css/custom.min.css">
<link rel="stylesheet" href="masonstrap/bootstrap.css" media="screen">
<link rel="stylesheet" href="assets/css/custom.min.css">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="../bower_components/html5shiv/dist/html5shiv.js"></script>
<script src="../bower_components/respond/dest/respond.min.js"></script>
<script src="bower_components/html5shiv/dist/html5shiv.js"></script>
<script src="bower_components/respond/dest/respond.min.js"></script>
<![endif]-->
<script>
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-23019901-1']);
_gaq.push(['_setDomainName', "bootswatch.com"]);
_gaq.push(['_setAllowLinker', true]);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<div class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<a href="../" class="navbar-brand">Bootswatch</a>
<a href="" class="navbar-brand">Masonstrap</a>
<button class="navbar-toggle" type="button" data-toggle="collapse" data-target="#navbar-main">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
......@@ -65,7 +50,7 @@
</ul>
</li>
<li>
<a href="../help/">Help</a>
<a href="">Help</a>
</li>
<li>
<a href="http://news.bootswatch.com">Blog</a>
......@@ -75,14 +60,14 @@
<ul class="dropdown-menu" aria-labelledby="download">
<li><a href="http://jsfiddle.net/bootswatch/rzqpsgho/">Open Sandbox</a></li>
<li class="divider"></li>
<li><a href="./bootstrap.min.css">bootstrap.min.css</a></li>
<li><a href="./bootstrap.css">bootstrap.css</a></li>
<li><a href="masonstrap/bootstrap.min.css">bootstrap.min.css</a></li>
<li><a href="masonstrap/bootstrap.css">bootstrap.css</a></li>
<li class="divider"></li>
<li><a href="./variables.less">variables.less</a></li>
<li><a href="./bootswatch.less">bootswatch.less</a></li>
<li><a href="masonstrap/variables.less">variables.less</a></li>
<li><a href="masonstrap/bootswatch.less">bootswatch.less</a></li>
<li class="divider"></li>
<li><a href="./_variables.scss">_variables.scss</a></li>
<li><a href="./_bootswatch.scss">_bootswatch.scss</a></li>
<li><a href="masonstrap/_variables.scss">_variables.scss</a></li>
<li><a href="masonstrap/_bootswatch.scss">_bootswatch.scss</a></li>
</ul>
</li>
</ul>
......@@ -102,8 +87,8 @@
<div class="page-header" id="banner">
<div class="row">
<div class="col-lg-8 col-md-7 col-sm-6">
<h1>Custom</h1>
<p class="lead">Your tagline here</p>
<h1>Masonstrap</h1>
<p class="lead">Easily provide any web project with Mason branding</p>
</div>
<div class="col-lg-4 col-md-5 col-sm-6">
<div class="sponsor">
......@@ -1276,8 +1261,8 @@
<li><a href="http://feeds.feedburner.com/bootswatch">RSS</a></li>
<li><a href="https://twitter.com/bootswatch">Twitter</a></li>
<li><a href="https://github.com/thomaspark/bootswatch/">GitHub</a></li>
<li><a href="../help/#api">API</a></li>
<li><a href="../help/#support">Support</a></li>
<li><a href="">API</a></li>
<li><a href="">Support</a></li>
</ul>
<p>Made by <a href="http://thomaspark.co" rel="nofollow">Thomas Park</a>. Contact him at <a href="mailto:thomas@bootswatch.com">thomas@bootswatch.com</a>.</p>
<p>Code released under the <a href="https://github.com/thomaspark/bootswatch/blob/gh-pages/LICENSE">MIT License</a>.</p>
......@@ -1293,7 +1278,7 @@
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="../bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="../assets/js/custom.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="assets/js/custom.js"></script>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment