TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'gh-pages'

Browse source 
Conflicts:
	_layouts/default.html
	index.html
This commit is contained in:
Daniel Buckmaster 2014-03-06 16:39:32 +11:00
commit e7cd53fdf4
4 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

46
_layouts/default.html
View file

@ -8,12 +8,12 @@
<title>{{page.title}}</title>
<link rel="icon" type="image/x-icon" href="/favicon.ico">
<link rel="stylesheet" href="/css/main.css">
<link rel="stylesheet" href="/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/font-awesome.min.css">
<link rel="stylesheet" href="{{page.root}}/css/main.css">
<link rel="stylesheet" href="{{page.root}}/css/bootstrap.min.css">
<link rel="stylesheet" href="{{page.root}}/css/font-awesome.min.css">
<script type="text/javascript" src="/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="/js/bootstrap.min.js"></script>
<script type="text/javascript" src="{{page.root}}/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="{{page.root}}/js/bootstrap.min.js"></script>
</head>
<body>
@ -33,45 +33,45 @@
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="dropdown">
<a href="/engine" class="dropdown-toggle" data-toggle="dropdown">Engine<i class="fa fa-angle-down"></i></a>
<a href="{{page.root}}/engine" class="dropdown-toggle" data-toggle="dropdown">Engine<i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
<li><a href="/engine#features">Features</a></li>
<li><a href="/engine#roadmap">Roadmap</a></li>
<li><a href="/engine#made-with-torque">Made with Torque</a></li>
<li><a href="/engine#history">History</a></li>
<li><a href="{{page.root}}/engine#features">Features</a></li>
<li><a href="{{page.root}}/engine#roadmap">Roadmap</a></li>
<li><a href="{{page.root}}/engine#made-with-torque">Made with Torque</a></li>
<li><a href="{{page.root}}/engine#history">History</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/start" class="dropdown-toggle" data-toggle="dropdown">Get started<i class="fa fa-angle-down"></i></a>
<a href="{{page.root}}/start" class="dropdown-toggle" data-toggle="dropdown">Get started<i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
<li><a href="/start#download">Download</a></li>
<li><a href="/start#tutorials">Tutorials</a></li>
<li><a href="{{page.root}}/start#download">Download</a></li>
<li><a href="{{page.root}}/start#tutorials">Tutorials</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/committee" class="dropdown-toggle" data-toggle="dropdown">Committee<i class="fa fa-angle-down"></i></a>
<a href="{{page.root}}/committee" class="dropdown-toggle" data-toggle="dropdown">Committee<i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
<li><a href="/committee#what-is-the-steering-committee">What is the Steering Committee?</a></li>
<li><a href="/committee#current-membership">Current membership</a></li>
<li><a href="/committee#charter">Charter</a></li>
<li><a href="{{page.root}}/committee#what-is-the-steering-committee">What is the Steering Committee?</a></li>
<li><a href="{{page.root}}/committee#current-membership">Current membership</a></li>
<li><a href="{{page.root}}/committee#charter">Charter</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/contribute" class="dropdown-toggle" data-toggle="dropdown">Contribute<i class="fa fa-angle-down"></i></a>
<a href="{{page.root}}/contribute" class="dropdown-toggle" data-toggle="dropdown">Contribute<i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
<li><a href="/contribute#get-the-source-code">Get the source code</a></li>
<li><a href="/contribute#pull-request-guide">Pull-request guide</a></li>
<li><a href="/contribute#version-policy">Version policy</a></li>
<li><a href="{{page.root}}/contribute#get-the-source-code">Get the source code</a></li>
<li><a href="{{page.root}}/contribute#pull-request-guide">Pull-request guide</a></li>
<li><a href="{{page.root}}/contribute#version-policy">Version policy</a></li>
</ul>
</li>
<li class="dropdown">
<a href="/community" class="dropdown-toggle" data-toggle="dropdown">Community<i class="fa fa-angle-down"></i></a>
<a href="{{page.root}}/community" class="dropdown-toggle" data-toggle="dropdown">Community<i class="fa fa-angle-down"></i></a>
<ul class="dropdown-menu">
<li><a href="/community#forum">Forum</a></li>
<li><a href="{{page.root}}/community#forum">Forum</a></li>
</ul>
</li>
</ul>