Skip to content
This repository has been archived by the owner on May 22, 2023. It is now read-only.

Commit

Permalink
(#4) Removed duplicate data-ax-widget-area
Browse files Browse the repository at this point in the history
Conflicts:
	application/layouts/application/default.theme/application.html
  • Loading branch information
Dirk Voss committed Oct 10, 2014
1 parent 3e0fb6d commit 37af0d9
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions application/layouts/application/default.theme/application.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<div class="container">
<header class="app-header">
<div class="row">
<div class="col col-lg-4 col-md-4 col-sm-6 col-xs-12"><a href="http://laxarjs.org/" class="app-logo" title="Go back to LaxarJS.org"></a></div>
<div class="col col-lg-4 col-md-4 col-sm-6 col-xs-12">
<a href="http://laxarjs.org/" class="app-logo" title="Go back to LaxarJS.org"></a>
</div>
<div class="col col-lg-4 col-md-4 hidden-sm hidden-xs" data-ax-widget-area="searchBox"></div>
<div class="col col-lg-4 col-md-4 col-sm-6 hidden-xs" data-ax-widget-area="header"></div>
</div>
</header>

<div class="app-content-wrapper">
<div class="app-content">
<div class="row">
<div class="col col-sm-12 visible-sm-block visible-xs-block" data-ax-widget-area="searchBox"></div>
</div>
<div class="row">
<div class="col col-lg-4 col-md-4" data-ax-widget-area="content1a"></div>
<div class="col col-lg-4 col-md-4" data-ax-widget-area="content1b"></div>
Expand All @@ -20,8 +19,7 @@
</div>
<footer class="app-footer row">
<div class="col col-lg-12 col-md-12">
<span class="app-laxarjs"><a href="http://laxarjs.org/" title="Go back to LaxarJS.org"><b>LaxarJS</b></a></span>,
code licensed under the <a href="http://laxarjs.org/license" title="Show the MIT license"><b>MIT License</b></a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/" title="Show the creative commons"><b>CC BY 3.0</b></a>.<span class="app-github"><i class="fa fa-github"></i> View on <a href="https://github.com/LaxarJS/shop_demo" title="Show the source code"><b>GitHub</b></a></span><span class="app-version">ShopDemo <sup>1.2.2</sup></span>
<span class="app-laxarjs"><a href="http://laxarjs.org/" title="Go back to LaxarJS.org"><b>LaxarJS</b></a></span>, code licensed under the <a href="http://laxarjs.org/license" title="Show the MIT license"><b>MIT License</b></a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/" title="Show the creative commons"><b>CC BY 3.0</b></a>.<span class="app-github"><i class="fa fa-github"></i> View on <a href="https://github.com/LaxarJS/shop_demo" title="Show the source code"><b>GitHub</b></a></span><span class="app-version">ShopDemo <sup>1.3.0</sup></span>
</div>
</footer>
</div>
Expand Down

0 comments on commit 37af0d9

Please sign in to comment.