pyc-website
main website for pyc inc.
git clone https://9o.is/git/pyc-website.git
commit 6b3ea6f729f4c88ba7b5ea68631867f2005ad006 parent e1ca6e9cabf4ce2342a734506cafd23ce7a28fc6 Author: Jul <jul@9o.is> Date: Sat, 12 Apr 2014 15:27:04 -0400 fixed issue #6 by moving ui-view to base-wrap. also moved footer to base-wrap only Diffstat:
9 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html @@ -1,5 +1,4 @@ -<div data-lift="NgUIRouter.surround?withAjax=no-base&with=with-footer&at=content"> -<div ui-view="viewA"> +<div data-lift="NgUIRouter.surround?withAjax=no-base&with=base-wrap&at=content"> <div id="content-index" class="row no-gutter"> <div id="applyatm-index" class="col-xs-12 col-sm-6 col-md-4"> @@ -140,5 +139,4 @@ </div> </div> </div> -</div> </div> \ No newline at end of file diff --git a/src/main/webapp/less/overrides.less b/src/main/webapp/less/overrides.less @@ -8,13 +8,13 @@ body { > .container { padding: 0; - > #content { + > #content, > footer { border-left: 1px solid @brand-primary; border-right: 1px solid @brand-primary; background: @white; - padding:10px 14px; + padding:0 14px 10px 14px; @media (max-width: @screen-sm) { - padding:10px 4px; + padding:0 4px 10px 4px; } } } diff --git a/src/main/webapp/templates-hidden/base-default.html b/src/main/webapp/templates-hidden/base-default.html @@ -17,5 +17,4 @@ </div> </div> </div> - <span data-lift="embed?what=/templates-hidden/parts/footer"></span> </div> diff --git a/src/main/webapp/templates-hidden/base-wrap.html b/src/main/webapp/templates-hidden/base-wrap.html @@ -7,6 +7,7 @@ <meta name="author" content="PYD"> <meta name="Copyright" content="Copyright PYD Inc 2014. All Rights Reserved."> <meta name="fragment" content="!" /> +<title data-lift="Menu.title">PYD: %*%</title> <link data-lift="Assets.css" rel="stylesheet"> @@ -59,7 +60,8 @@ </div> </div> <span data-lift="embed?what=/templates-hidden/parts/alert"></span> - <div id="content"></div> + <div ui-view="viewA" id="content"></div> + <span data-lift="embed?what=/templates-hidden/parts/footer"></span> </div> <script type="text/javascript" src="http://code.jquery.com/jquery-2.1.0.min.js"></script> diff --git a/src/main/webapp/templates-hidden/no-base-default.html b/src/main/webapp/templates-hidden/no-base-default.html @@ -13,5 +13,5 @@ <div id="content"></div> </div> </div> - </div> + </div> </div> \ No newline at end of file diff --git a/src/main/webapp/templates-hidden/no-base-settings-wrap.html b/src/main/webapp/templates-hidden/no-base-settings-wrap.html @@ -1,4 +1,4 @@ -<div data-lift="surround?with=empty;at=content"> +<div data-lift="surround?with=no-base;at=content"> <lift:head> <span data-lift="CurrentUser.title"></span> </lift:head> diff --git a/src/main/webapp/templates-hidden/no-base.html b/src/main/webapp/templates-hidden/no-base.html @@ -1 +1,3 @@ -<div id="content"></div> -\ No newline at end of file +<div> +<div id="content"></div> +</div> +\ No newline at end of file diff --git a/src/main/webapp/templates-hidden/settings-wrap.html b/src/main/webapp/templates-hidden/settings-wrap.html @@ -27,5 +27,4 @@ </div> </div> </div> - <span data-lift="embed?what=/templates-hidden/parts/footer"></span> </div> \ No newline at end of file diff --git a/src/main/webapp/templates-hidden/with-footer.html b/src/main/webapp/templates-hidden/with-footer.html @@ -1,9 +0,0 @@ -<div data-lift="surround?with=base-wrap;at=content"> - <lift:head> - <title data-lift="Menu.title">PYD: %*%</title> - </lift:head> - <div class="main-content"> - <div id="content"></div> - </div> - <span data-lift="embed?what=/templates-hidden/parts/footer"></span> -</div>