Revert "Merge "Resolve merge conflicts of a5f0068 to nyc-dev" into nyc-dev"

This reverts commit 6edfbfabad, reversing
changes made to e09b2c16e3.
This commit is contained in:
Trevor Johns
2016-04-12 10:35:42 -07:00
parent 6edfbfabad
commit bf234fdfba
260 changed files with 8674 additions and 36802 deletions

View File

@@ -10,7 +10,7 @@ def:fullpage() ?>
<div id="body-content">
<div>
<?cs /def ?>
<?cs
<?cs
def:sdk_nav() ?>
<div class="wrap clearfix" id="body-content"><div class="cols">
<div class="col-4 dac-toggle dac-mobile" id="side-nav" itemscope itemtype="http://schema.org/SiteNavigationElement">
@@ -297,7 +297,7 @@ def:google_nav() ?>
</div>
<script type="text/javascript">
showGoogleRefTree();
</script>
</div> <!-- end side-nav -->
<script>
@@ -528,7 +528,7 @@ def:custom_left_nav() ?><?cs
call:fullpage() ?><?cs
elif:nonavpage ?><?cs
call:no_nav() ?><?cs
elif:guide || reference || samples || downloads ?><?cs
elif:guide || reference || samples || downloads ?><?cs
call:ndk_nav() ?><?cs
else ?><?cs
call:default_left_nav() ?> <?cs